Merge pull request #3261 from scratchfoundation/renovate/webpack-5.x

cwillisf · web-flow · commit bc6f4199020c · 2024-03-04T11:42:23.000-08:00
chore(deps): update dependency webpack to v5
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "scratch-translate-extension-languages": "^1.0.0",
     "text-encoding": "^0.7.0",
     "uuid": "^8.3.2",
-    "worker-loader": "^1.1.1"
+    "web-worker": "^1.3.0"
   },
   "devDependencies": {
     "@babel/core": "7.24.0",
@@ -96,8 +96,7 @@
     "stats.js": "0.17.0",
     "tap": "16.3.10",
     "terser-webpack-plugin": "4.2.3",
-    "tiny-worker": "2.3.0",
-    "webpack": "4.47.0",
+    "webpack": "5.90.3",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "3.11.3"
   }
diff --git a/src/extension-support/extension-manager.js b/src/extension-support/extension-manager.js
@@ -157,10 +157,10 @@ class ExtensionManager {
 
         return new Promise((resolve, reject) => {
             // If we `require` this at the global level it breaks non-webpack targets, including tests
-            const ExtensionWorker = require('worker-loader?name=extension-worker.js!./extension-worker');
+            const worker = new Worker('./extension-worker.js');
 
             this.pendingExtensions.push({extensionURL, resolve, reject});
-            dispatch.addWorker(new ExtensionWorker());
+            dispatch.addWorker(worker);
         });
     }
 
diff --git a/src/extensions/scratch3_gdx_for/index.js b/src/extensions/scratch3_gdx_for/index.js
@@ -4,7 +4,7 @@ const log = require('../../util/log');
 const formatMessage = require('format-message');
 const MathUtil = require('../../util/math-util');
 const BLE = require('../../io/ble');
-const godirect = require('@vernier/godirect/dist/godirect.min.umd.js');
+const godirect = require('@vernier/godirect');
 const ScratchLinkDeviceAdapter = require('./scratch-link-device-adapter');
 
 /**
diff --git a/test/integration/internal-extension.js b/test/integration/internal-extension.js
@@ -1,5 +1,5 @@
 const test = require('tap').test;
-const Worker = require('tiny-worker');
+const Worker = require('web-worker');
 
 const BlockType = require('../../src/extension-support/block-type');
 
diff --git a/test/integration/pen.js b/test/integration/pen.js
@@ -1,4 +1,4 @@
-const Worker = require('tiny-worker');
+const Worker = require('web-worker');
 const path = require('path');
 const test = require('tap').test;
 
diff --git a/test/integration/runId.js b/test/integration/runId.js
@@ -1,4 +1,4 @@
-const Worker = require('tiny-worker');
+const Worker = require('web-worker');
 const path = require('path');
 const test = require('tap').test;
 
diff --git a/test/integration/saythink-and-wait.js b/test/integration/saythink-and-wait.js
@@ -1,4 +1,4 @@
-const Worker = require('tiny-worker');
+const Worker = require('web-worker');
 const path = require('path');
 const test = require('tap').test;
 const makeTestStorage = require('../fixtures/make-test-storage');
diff --git a/test/integration/sound.js b/test/integration/sound.js
@@ -1,4 +1,4 @@
-const Worker = require('tiny-worker');
+const Worker = require('web-worker');
 const path = require('path');
 const test = require('tap').test;
 const makeTestStorage = require('../fixtures/make-test-storage');
diff --git a/test/unit/dispatch.js b/test/unit/dispatch.js
@@ -1,5 +1,5 @@
 const DispatchTestService = require('../fixtures/dispatch-test-service');
-const Worker = require('tiny-worker');
+const Worker = require('web-worker');
 
 const dispatch = require('../../src/dispatch/central-dispatch');
 const path = require('path');
diff --git a/webpack.config.js b/webpack.config.js
@@ -8,14 +8,15 @@ const base = {
     devtool: 'cheap-module-source-map',
     output: {
         library: 'VirtualMachine',
+        libraryTarget: 'umd',
         filename: '[name].js'
     },
     module: {
         rules: [{
             test: /\.js$/,
             loader: 'babel-loader',
             include: path.resolve(__dirname, 'src'),
-            query: {
+            options: {
                 presets: [['@babel/preset-env', {targets: {browsers: ['last 3 versions', 'Safari >= 8', 'iOS >= 8']}}]]
             }
         },
@@ -43,14 +44,16 @@ module.exports = [
             'scratch-vm.min': './src/index.js'
         },
         output: {
-            libraryTarget: 'umd',
             path: path.resolve('dist', 'web')
         },
         module: {
             rules: base.module.rules.concat([
                 {
                     test: require.resolve('./src/index.js'),
-                    loader: 'expose-loader?exposes=VirtualMachine'
+                    loader: 'expose-loader',
+                    options: {
+                        exposes: 'VirtualMachine'
+                    }
                 }
             ])
         }
@@ -62,7 +65,6 @@ module.exports = [
             'scratch-vm': './src/index.js'
         },
         output: {
-            libraryTarget: 'commonjs2',
             path: path.resolve('dist', 'node')
         },
         externals: {
@@ -97,31 +99,49 @@ module.exports = [
             rules: base.module.rules.concat([
                 {
                     test: require.resolve('./src/index.js'),
-                    loader: 'expose-loader?exposes=VirtualMachine'
+                    loader: 'expose-loader',
+                    options: {
+                        exposes: 'VirtualMachine'
+                    }
                 },
                 {
                     test: require.resolve('./src/extensions/scratch3_video_sensing/debug.js'),
-                    loader: 'expose-loader?exposes=Scratch3VideoSensingDebug'
+                    loader: 'expose-loader',
+                    options: {
+                        exposes: 'Scratch3VideoSensingDebug'
+                    }
                 },
                 {
                     test: require.resolve('stats.js/build/stats.min.js'),
                     loader: 'script-loader'
                 },
                 {
                     test: require.resolve('scratch-blocks/dist/vertical.js'),
-                    loader: 'expose-loader?exposes=Blockly'
+                    loader: 'expose-loader',
+                    options: {
+                        exposes: 'Blockly'
+                    }
                 },
                 {
                     test: require.resolve('scratch-audio/src/index.js'),
-                    loader: 'expose-loader?exposes=AudioEngine'
+                    loader: 'expose-loader',
+                    options: {
+                        exposes: 'AudioEngine'
+                    }
                 },
                 {
                     test: require.resolve('scratch-storage/src/index.js'),
-                    loader: 'expose-loader?exposes=ScratchStorage'
+                    loader: 'expose-loader',
+                    options: {
+                        exposes: 'ScratchStorage'
+                    }
                 },
                 {
                     test: require.resolve('scratch-render/src/index.js'),
-                    loader: 'expose-loader?exposes=ScratchRender'
+                    loader: 'expose-loader',
+                    options: {
+                        exposes: 'ScratchRender'
+                    }
                 }
             ])
         },

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const Worker = require('tiny-worker');`
	`1`	`+const Worker = require('web-worker');`
`2`	`2`	`const path = require('path');`
`3`	`3`	`const test = require('tap').test;`
`4`	`4`