feat: enable ESM worker chunk loading for Node.js targets (#19640)

lib/config/defaults.js

@@ -1242,7 +1242,7 @@ const applyOutputDefaults = (
 					tp.nodeBuiltins === null ||
 					tp.importScriptsInWorker === null) &&
 				output.module &&
-				environment.dynamicImport
+				environment.dynamicImportInWorker
 			) {
 				return "universal";
 			}

lib/config/target.js

@@ -194,7 +194,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				destructuring: v(6),
 				bigIntLiteral: v(10, 4),
 				dynamicImport: v(12, 17),
-				dynamicImportInWorker: major ? false : undefined,
+				dynamicImportInWorker: v(12, 17),
 				module: v(12, 17)
 			};
 		}
@@ -240,7 +240,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				destructuring: v(1, 1),
 				bigIntLiteral: v(4),
 				dynamicImport: v(11),
-				dynamicImportInWorker: major ? false : undefined,
+				dynamicImportInWorker: v(11),
 				module: v(11)
 			};
 		}
@@ -278,7 +278,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				destructuring: v(0, 15),
 				bigIntLiteral: v(0, 32),
 				dynamicImport: v(0, 43),
-				dynamicImportInWorker: major ? false : undefined,
+				dynamicImportInWorker: v(0, 44),
 				module: v(0, 43)
 			};
 		}

test/Defaults.unittest.js

@@ -2688,6 +2688,183 @@ describe("snapshots", () => {
 			+       /^(.+?[\\\\/]node_modules[\\\\/])/,
 		`)
 	);
+
+	test(
+		"target node with ESM output",
+		{ target: "node14", experiments: { outputModule: true } },
+		e =>
+			e.toMatchInlineSnapshot(`
+			- Expected
+			+ Received
+
+			@@ ... @@
+			-     "outputModule": false,
+			+     "outputModule": true,
+			@@ ... @@
+			-     "node": false,
+			+     "node": true,
+			@@ ... @@
+			-     "web": true,
+			+     "web": false,
+			@@ ... @@
+			-   "externalsType": "var",
+			+   "externalsType": "module-import",
+			@@ ... @@
+			-       "document": true,
+			-       "dynamicImport": undefined,
+			-       "dynamicImportInWorker": undefined,
+			+       "document": false,
+			+       "dynamicImport": true,
+			+       "dynamicImportInWorker": true,
+			@@ ... @@
+			-       "globalThis": undefined,
+			-       "module": undefined,
+			-       "nodePrefixForCoreModules": true,
+			+       "globalThis": true,
+			+       "module": true,
+			+       "nodePrefixForCoreModules": false,
+			@@ ... @@
+			-     "target": "web",
+			+     "target": "node",
+			@@ ... @@
+			-         "createRequire": false,
+			+         "createRequire": true,
+			@@ ... @@
+			-     "__dirname": "mock",
+			-     "__filename": "mock",
+			-     "global": true,
+			+     "__dirname": "node-module",
+			+     "__filename": "node-module",
+			+     "global": false,
+			@@ ... @@
+			-     "chunkFilename": "[name].js",
+			-     "chunkFormat": "array-push",
+			+     "chunkFilename": "[name].mjs",
+			+     "chunkFormat": "module",
+			@@ ... @@
+			-     "chunkLoading": "jsonp",
+			+     "chunkLoading": "import",
+			@@ ... @@
+			-       "jsonp",
+			-       "import-scripts",
+			+       "import",
+			@@ ... @@
+			-       "fetch",
+			+       "async-node",
+			@@ ... @@
+			-       "document": true,
+			-       "dynamicImport": undefined,
+			-       "dynamicImportInWorker": undefined,
+			+       "document": false,
+			+       "dynamicImport": true,
+			+       "dynamicImportInWorker": true,
+			@@ ... @@
+			-       "globalThis": undefined,
+			-       "module": undefined,
+			-       "nodePrefixForCoreModules": true,
+			+       "globalThis": true,
+			+       "module": true,
+			+       "nodePrefixForCoreModules": false,
+			@@ ... @@
+			-     "filename": "[name].js",
+			-     "globalObject": "self",
+			+     "filename": "[name].mjs",
+			+     "globalObject": "global",
+			@@ ... @@
+			-     "hotUpdateChunkFilename": "[id].[fullhash].hot-update.js",
+			+     "hotUpdateChunkFilename": "[id].[fullhash].hot-update.mjs",
+			@@ ... @@
+			-     "hotUpdateMainFilename": "[runtime].[fullhash].hot-update.json",
+			+     "hotUpdateMainFilename": "[runtime].[fullhash].hot-update.json.mjs",
+			@@ ... @@
+			-     "iife": true,
+			+     "iife": false,
+			@@ ... @@
+			-     "module": false,
+			+     "module": true,
+			@@ ... @@
+			-     "scriptType": false,
+			+     "scriptType": "module",
+			@@ ... @@
+			-     "wasmLoading": "fetch",
+			+     "wasmLoading": "async-node",
+			@@ ... @@
+			-     "workerChunkLoading": "import-scripts",
+			+     "workerChunkLoading": "import",
+			@@ ... @@
+			-     "workerWasmLoading": "fetch",
+			+     "workerWasmLoading": "async-node",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-         "aliasFields": Array [
+			-           "browser",
+			-         ],
+			+         "aliasFields": Array [],
+			@@ ... @@
+			-           "browser",
+			@@ ... @@
+			-       "browser",
+			+       "node",
+			@@ ... @@
+			-   "target": "web",
+			+   "target": "node14",
+		`)
+	);
 });
 
 describe("Targets", () => {
@@ -2709,6 +2886,12 @@ describe("Targets", () => {
 		- Expected
 		+ Received
 
+		@@ ... @@
+		-       "dynamicImportInWorker": true,
+		+       "dynamicImportInWorker": false,
+		@@ ... @@
+		-       "dynamicImportInWorker": true,
+		+       "dynamicImportInWorker": false,
 		@@ ... @@
 		-   "target": "node12.17",
 		+   "target": "browserslist: node 12.17",

test/configCases/worker/node-worker-async-node/chunk.js

@@ -0,0 +1,3 @@
+export function getMessage(msg) {
+	return msg + " from worker with ESM import";
+}

test/configCases/worker/node-worker-async-node/index.js

@@ -0,0 +1,22 @@
+import { Worker } from "worker_threads";
+
+it("should support ESM worker chunks in Node.js", async () => {
+	const worker = new Worker(
+		new URL("./worker.js" + __resourceQuery, import.meta.url),
+		{
+			type: "module"
+		}
+	);
+
+	const promise = new Promise((resolve, reject) => {
+		worker.on("message", resolve);
+		worker.on("error", reject);
+	});
+
+	worker.postMessage("hello");
+
+	const result = await promise;
+	expect(result).toBe("hello from worker with ESM import");
+
+	await worker.terminate();
+});

test/configCases/worker/node-worker-async-node/test.config.js

@@ -0,0 +1,20 @@
+const fs = require("fs");
+const path = require("path");
+
+module.exports = {
+	findBundle() {
+		return "./bundle.js";
+	},
+	afterExecute(options) {
+		const workerCode = fs.readFileSync(
+			path.resolve(options.output.path, "./worker_js.bundle.js"),
+			"utf8"
+		);
+
+		if (!/ReadFile \+ VM\.run chunk loading for javascript/.test(workerCode)) {
+			throw new Error(
+				"require('fs').readFile(...) and require('vm').runInThisContext were not found in the worker code for loading async chunks"
+			);
+		}
+	}
+};

test/configCases/worker/node-worker-async-node/test.filter.js

@@ -0,0 +1,3 @@
+const supportsWorker = require("../../../helpers/supportsWorker");
+
+module.exports = () => supportsWorker();

test/configCases/worker/node-worker-async-node/webpack.config.js

@@ -0,0 +1,11 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	target: "async-node14",
+	entry: "./index.js",
+	optimization: {
+		chunkIds: "named"
+	},
+	output: {
+		filename: "bundle.js"
+	}
+};

test/configCases/worker/node-worker-async-node/worker.js

@@ -0,0 +1,8 @@
+import { parentPort } from "worker_threads";
+
+const { getMessage } = await import("./chunk.js");
+
+parentPort.on("message", (msg) => {
+	// Worker with ESM import
+	parentPort.postMessage(getMessage(msg));
+});

test/configCases/worker/node-worker-esm/chunk.js

@@ -0,0 +1,3 @@
+export function getMessage(msg) {
+	return msg + " from worker with ESM import";
+}

test/configCases/worker/node-worker-esm/index.js

@@ -0,0 +1,22 @@
+import { Worker } from "worker_threads";
+
+it("should support ESM worker chunks in Node.js", async () => {
+	const worker = new Worker(
+		new URL("./worker.js" + __resourceQuery, import.meta.url),
+		{
+			type: "module"
+		}
+	);
+
+	const promise = new Promise((resolve, reject) => {
+		worker.on("message", resolve);
+		worker.on("error", reject);
+	});
+
+	worker.postMessage("hello");
+
+	const result = await promise;
+	expect(result).toBe("hello from worker with ESM import");
+
+	await worker.terminate();
+});

test/configCases/worker/node-worker-esm/test.config.js

@@ -0,0 +1,24 @@
+const fs = require("fs");
+const path = require("path");
+const { URL } = require("url");
+
+module.exports = {
+	findBundle() {
+		return "./bundle.mjs";
+	},
+	moduleScope(scope) {
+		scope.URL = URL;
+	},
+	afterExecute(options) {
+		const workerCode = fs.readFileSync(
+			path.resolve(options.output.path, "./worker_js.bundle.mjs"),
+			"utf8"
+		);
+
+		if (!/import\(\) chunk loading for javascript/.test(workerCode)) {
+			throw new Error(
+				"import() was not found in the worker code for loading async chunks"
+			);
+		}
+	}
+};

test/configCases/worker/node-worker-esm/test.filter.js

@@ -0,0 +1,3 @@
+const supportsWorker = require("../../../helpers/supportsWorker");
+
+module.exports = () => supportsWorker();

test/configCases/worker/node-worker-esm/webpack.config.js

@@ -0,0 +1,15 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	target: "node14",
+	entry: "./index.js",
+	optimization: {
+		chunkIds: "named"
+	},
+	output: {
+		module: true,
+		filename: "bundle.mjs"
+	},
+	experiments: {
+		outputModule: true
+	}
+};

test/configCases/worker/node-worker-esm/worker.js

@@ -0,0 +1,8 @@
+import { parentPort } from "worker_threads";
+
+const { getMessage } = await import("./chunk.js");
+
+parentPort.on("message", (msg) => {
+	// Worker with ESM import
+	parentPort.postMessage(getMessage(msg));
+});