fix(build): simplify webpack config using clone()

Author: cwillisf

package-lock.json

@@ -96,7 +96,7 @@
     "scratch-l10n": "3.18.53",
     "scratch-render-fonts": "1.0.20",
     "scratch-semantic-release-config": "1.0.14",
-    "scratch-webpack-configuration": "1.0.0",
+    "scratch-webpack-configuration": "1.1.0",
     "script-loader": "0.7.2",
     "semantic-release": "19.0.5",
     "stats.js": "0.17.0",

package.json

@@ -10,15 +10,14 @@ const common = {
     rootPath: path.resolve(__dirname)
 };
 
-const nodeConfig = new ScratchWebpackConfigBuilder(common)
+const nodeBuilder = new ScratchWebpackConfigBuilder(common)
     .setTarget('node')
     .addModuleRule({
         test: /\.mp3$/,
         type: 'asset'
-    })
-    .get();
+    });
 
-const webConfig = new ScratchWebpackConfigBuilder(common)
+const webBuilder = new ScratchWebpackConfigBuilder(common)
     .setTarget('browserslist')
     .merge({
         resolve: {
@@ -40,11 +39,9 @@ const webConfig = new ScratchWebpackConfigBuilder(common)
     })
     .addPlugin(new webpack.ProvidePlugin({
         Buffer: ['buffer', 'Buffer']
-    }))
-    .get();
+    }));
 
-const playgroundConfig = new ScratchWebpackConfigBuilder(common)
-    .setTarget('browserslist')
+const playgroundBuilder = webBuilder.clone()
     .merge({
         devServer: {
             contentBase: false,
@@ -60,23 +57,11 @@ const playgroundConfig = new ScratchWebpackConfigBuilder(common)
         },
         output: {
             path: path.resolve(__dirname, 'playground')
-        },
-        resolve: {
-            fallback: {
-                Buffer: require.resolve('buffer/')
-            }
         }
     })
     .addModuleRule({
-        test: /\.mp3$/,
-        type: 'asset'
-    })
-    .addModuleRule({
-        test: require.resolve('./src/index.js'),
-        loader: 'expose-loader',
-        options: {
-            exposes: 'VirtualMachine'
-        }
+        test: require.resolve('stats.js/build/stats.min.js'),
+        loader: 'script-loader'
     })
     .addModuleRule({
         test: require.resolve('./src/extensions/scratch3_video_sensing/debug.js'),
@@ -85,10 +70,6 @@ const playgroundConfig = new ScratchWebpackConfigBuilder(common)
             exposes: 'Scratch3VideoSensingDebug'
         }
     })
-    .addModuleRule({
-        test: require.resolve('stats.js/build/stats.min.js'),
-        loader: 'script-loader'
-    })
     .addModuleRule({
         test: require.resolve('scratch-blocks/dist/vertical.js'),
         loader: 'expose-loader',
@@ -117,9 +98,6 @@ const playgroundConfig = new ScratchWebpackConfigBuilder(common)
             exposes: 'ScratchRender'
         }
     })
-    .addPlugin(new webpack.ProvidePlugin({
-        Buffer: ['buffer', 'Buffer']
-    }))
     .addPlugin(new CopyWebpackPlugin([
         {
             from: 'node_modules/scratch-blocks/media',
@@ -137,11 +115,10 @@ const playgroundConfig = new ScratchWebpackConfigBuilder(common)
         {
             from: 'src/playground'
         }
-    ]))
-    .get();
+    ]));
 
 module.exports = [
-    nodeConfig,
-    webConfig,
-    playgroundConfig
+    nodeBuilder.get(),
+    webBuilder.get(),
+    playgroundBuilder.get()
 ];