diff --git a/package-lock.json b/package-lock.json index 152ce155..4418888c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -158,8 +158,7 @@ "webpack": "^5.105.4", "webpack-bundle-analyzer": "^4.10.2", "webpack-dev-server": "5.0.4", - "webpack-node-externals": "^3.0.0", - "worker-loader": "^3.0.8" + "webpack-node-externals": "^3.0.0" }, "engines": { "node": ">=24 <25" @@ -4700,16 +4699,6 @@ "dev": true, "license": "MIT" }, - "node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, "node_modules/ansi-align": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", @@ -12631,21 +12620,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/loader-utils-webpack-v4": { "name": "loader-utils", "version": "2.0.4", @@ -18423,46 +18397,6 @@ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", "license": "MIT" }, - "node_modules/worker-loader": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz", - "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==", - "dev": true, - "license": "MIT", - "dependencies": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^4.0.0 || ^5.0.0" - } - }, - "node_modules/worker-loader/node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/workerpool": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", diff --git a/package.json b/package.json index 8012e7f1..ebeaa5e2 100644 --- a/package.json +++ b/package.json @@ -89,8 +89,7 @@ "webpack": "^5.105.4", "webpack-bundle-analyzer": "^4.10.2", "webpack-dev-server": "5.0.4", - "webpack-node-externals": "^3.0.0", - "worker-loader": "^3.0.8" + "webpack-node-externals": "^3.0.0" }, "dependencies": { "@alexaltea/capstone-js": "^3.0.5", diff --git a/src/web/waiters/BackgroundWorkerWaiter.mjs b/src/web/waiters/BackgroundWorkerWaiter.mjs index 409c2bbb..7565090d 100644 --- a/src/web/waiters/BackgroundWorkerWaiter.mjs +++ b/src/web/waiters/BackgroundWorkerWaiter.mjs @@ -4,8 +4,6 @@ * @license Apache-2.0 */ -import ChefWorker from "worker-loader?inline=no-fallback!../../core/ChefWorker.js"; - /** * Waiter to handle conversations with a ChefWorker in the background. */ @@ -33,7 +31,7 @@ class BackgroundWorkerWaiter { */ registerChefWorker() { log.debug("Registering new background ChefWorker"); - this.chefWorker = new ChefWorker(); + this.chefWorker = new Worker(new URL("../../core/ChefWorker.js", import.meta.url)); this.chefWorker.addEventListener("message", this.handleChefMessage.bind(this)); this.chefWorker.postMessage({ action: "setLogPrefix", diff --git a/src/web/waiters/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs index 94663a0b..4e964e17 100644 --- a/src/web/waiters/InputWaiter.mjs +++ b/src/web/waiters/InputWaiter.mjs @@ -5,8 +5,6 @@ * @license Apache-2.0 */ -import LoaderWorker from "worker-loader?inline=no-fallback!../workers/LoaderWorker.js"; -import InputWorker from "worker-loader?inline=no-fallback!../workers/InputWorker.mjs"; import Utils, {debounce} from "../../core/Utils.mjs"; import {toBase64} from "../../core/lib/Base64.mjs"; import cptable from "codepage"; @@ -359,7 +357,7 @@ class InputWaiter { } log.debug("Adding new InputWorker"); - this.inputWorker = new InputWorker(); + this.inputWorker = new Worker(new URL("../workers/InputWorker.mjs", import.meta.url)); this.inputWorker.postMessage({ action: "setLogLevel", data: log.getLevel() @@ -405,7 +403,7 @@ class InputWaiter { return -1; } log.debug(`Adding new LoaderWorker (${this.loaderWorkers.length + 1}/${this.maxWorkers}).`); - const newWorker = new LoaderWorker(); + const newWorker = new Worker(new URL("../workers/LoaderWorker.js", import.meta.url)); const workerId = this.workerId++; newWorker.addEventListener("message", this.handleLoaderMessage.bind(this)); newWorker.postMessage({ diff --git a/src/web/waiters/OutputWaiter.mjs b/src/web/waiters/OutputWaiter.mjs index 2b2cb096..881acaf0 100755 --- a/src/web/waiters/OutputWaiter.mjs +++ b/src/web/waiters/OutputWaiter.mjs @@ -10,7 +10,6 @@ import Dish from "../../core/Dish.mjs"; import {isUTF8, CHR_ENC_SIMPLE_REVERSE_LOOKUP} from "../../core/lib/ChrEnc.mjs"; import {detectFileType} from "../../core/lib/FileType.mjs"; import FileSaver from "file-saver"; -import ZipWorker from "worker-loader?inline=no-fallback!../workers/ZipWorker.mjs"; import { EditorView, @@ -987,7 +986,7 @@ class OutputWaiter { downloadButton.firstElementChild.innerHTML = "autorenew"; log.debug("Creating ZipWorker"); - this.zipWorker = new ZipWorker(); + this.zipWorker = new Worker(new URL("../workers/ZipWorker.mjs", import.meta.url)); this.zipWorker.postMessage({ action: "setLogLevel", data: log.getLevel() diff --git a/src/web/waiters/WorkerWaiter.mjs b/src/web/waiters/WorkerWaiter.mjs index 296aa956..f270323e 100644 --- a/src/web/waiters/WorkerWaiter.mjs +++ b/src/web/waiters/WorkerWaiter.mjs @@ -5,8 +5,6 @@ * @license Apache-2.0 */ -import ChefWorker from "worker-loader?inline=no-fallback!../../core/ChefWorker.js"; -import DishWorker from "worker-loader?inline=no-fallback!../workers/DishWorker.mjs"; import { debounce } from "../../core/Utils.mjs"; /** @@ -70,7 +68,7 @@ class WorkerWaiter { } log.debug("Adding new DishWorker"); - this.dishWorker.worker = new DishWorker(); + this.dishWorker.worker = new Worker(new URL("../workers/DishWorker.mjs", import.meta.url)); this.dishWorker.worker.addEventListener("message", this.handleDishMessage.bind(this)); this.dishWorker.worker.postMessage({ action: "setLogLevel", @@ -96,7 +94,7 @@ class WorkerWaiter { log.debug(`Adding new ChefWorker (${this.chefWorkers.length + 1}/${this.maxWorkers})`); // Create a new ChefWorker and send it the docURL - const newWorker = new ChefWorker(); + const newWorker = new Worker(new URL("../../core/ChefWorker.js", import.meta.url)); newWorker.addEventListener("message", this.handleChefMessage.bind(this)); newWorker.postMessage({ action: "setLogPrefix",