Skip to content

Commit

Permalink
fix: use web-worker to replace tiny-worker and worker-loader
Browse files Browse the repository at this point in the history
for webpack 5 compatibility
  • Loading branch information
cwillisf committed Mar 4, 2024
1 parent 64d1709 commit 058685f
Show file tree
Hide file tree
Showing 9 changed files with 5,116 additions and 4,579 deletions.
9,676 changes: 5,107 additions & 4,569 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -96,7 +96,6 @@
"stats.js": "0.17.0",
"tap": "16.3.10",
"terser-webpack-plugin": "4.2.3",
"tiny-worker": "2.3.0",
"webpack": "5.90.3",
"webpack-cli": "4.10.0",
"webpack-dev-server": "3.11.3"
Expand Down
4 changes: 2 additions & 2 deletions src/extension-support/extension-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}

Expand Down
2 changes: 1 addition & 1 deletion test/integration/internal-extension.js
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion test/integration/pen.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Worker = require('tiny-worker');
const Worker = require('web-worker');
const path = require('path');
const test = require('tap').test;

Expand Down
2 changes: 1 addition & 1 deletion test/integration/runId.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Worker = require('tiny-worker');
const Worker = require('web-worker');
const path = require('path');
const test = require('tap').test;

Expand Down
2 changes: 1 addition & 1 deletion test/integration/saythink-and-wait.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/integration/sound.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/unit/dispatch.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down

0 comments on commit 058685f

Please sign in to comment.