webpack 5.97.1 → 5.104.1

package/bin/webpack.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+"use strict";
+
 /**
  * @param {string} command process to run
  * @param {string[]} args command line arguments
@@ -7,17 +9,18 @@
  */
 const runCommand = (command, args) => {
 	const cp = require("child_process");
+
 	return new Promise((resolve, reject) => {
 		const executedCommand = cp.spawn(command, args, {
 			stdio: "inherit",
 			shell: true
 		});
 
-		executedCommand.on("error", error => {
+		executedCommand.on("error", (error) => {
 			reject(error);
 		});
 
-		executedCommand.on("exit", code => {
+		executedCommand.on("exit", (code) => {
 			if (code === 0) {
 				resolve();
 			} else {
@@ -31,7 +34,7 @@ const runCommand = (command, args) => {
  * @param {string} packageName name of the package
  * @returns {boolean} is the package installed?
  */
-const isInstalled = packageName => {
+const isInstalled = (packageName) => {
 	if (process.versions.pnp) {
 		return true;
 	}
@@ -73,14 +76,16 @@ const isInstalled = packageName => {
  * @param {CliOption} cli options
  * @returns {void}
  */
-const runCli = cli => {
+const runCli = (cli) => {
 	const path = require("path");
+
 	const pkgPath = require.resolve(`${cli.package}/package.json`);
+
 	const pkg = require(pkgPath);
 
 	if (pkg.type === "module" || /\.mjs/i.test(pkg.bin[cli.binName])) {
 		import(path.resolve(path.dirname(pkgPath), pkg.bin[cli.binName])).catch(
-			err => {
+			(err) => {
 				console.error(err);
 				process.exitCode = 1;
 			}
@@ -147,7 +152,7 @@ if (!cli.installed) {
 	// executed. Setting the exit code here to ensure the script exits correctly in those cases. The callback
 	// function is responsible for clearing the exit code if the user wishes to install webpack-cli.
 	process.exitCode = 1;
-	questionInterface.question(question, answer => {
+	questionInterface.question(question, (answer) => {
 		questionInterface.close();
 
 		const normalizedAnswer = answer.toLowerCase().startsWith("y");
@@ -171,13 +176,14 @@ if (!cli.installed) {
 		);
 
 		runCommand(
-			/** @type {string} */ (packageManager),
-			installOptions.concat(cli.package)
+			/** @type {string} */
+			(packageManager),
+			[...installOptions, cli.package]
 		)
 			.then(() => {
 				runCli(cli);
 			})
-			.catch(err => {
+			.catch((err) => {
 				console.error(err);
 				process.exitCode = 1;
 			});

package/hot/dev-server.js

@@ -61,14 +61,29 @@ if (module.hot) {
 				}
 			});
 	};
+	/** @type {EventTarget | NodeJS.EventEmitter} */
 	var hotEmitter = require("./emitter");
-	hotEmitter.on("webpackHotUpdate", function (currentHash) {
-		lastHash = currentHash;
+	/**
+	 * @param {CustomEvent<{ currentHash: string }>} event event or hash
+	 */
+	var handler = function (event) {
+		lastHash = typeof event === "string" ? event : event.detail.currentHash;
 		if (!upToDate() && module.hot.status() === "idle") {
 			log("info", "[HMR] Checking for updates on the server...");
 			check();
 		}
-	});
+	};
+
+	if (typeof EventTarget !== "undefined" && hotEmitter instanceof EventTarget) {
+		hotEmitter.addEventListener(
+			"webpackHotUpdate",
+			/** @type {EventListener} */
+			(handler)
+		);
+	} else {
+		hotEmitter.on("webpackHotUpdate", handler);
+	}
+
 	log("info", "[HMR] Waiting for update signal from WDS...");
 } else {
 	throw new Error("[HMR] Hot Module Replacement is disabled.");

package/hot/emitter-event-target.js

@@ -0,0 +1,7 @@
+if (typeof EventTarget !== "function") {
+	throw new Error(
+		"Environment doesn't support lazy compilation (requires EventTarget)"
+	);
+}
+
+module.exports = new EventTarget();

package/hot/lazy-compilation-node.js

@@ -1,7 +1,7 @@
-/* global __resourceQuery */
-
 "use strict";
 
+/* global __resourceQuery */
+
 var urlBase = decodeURIComponent(__resourceQuery.slice(1));
 
 /**
@@ -10,29 +10,6 @@ var urlBase = decodeURIComponent(__resourceQuery.slice(1));
  */
 exports.keepAlive = function (options) {
 	var data = options.data;
-	var onError = options.onError;
-	var active = options.active;
-	var module = options.module;
-	/** @type {import("http").IncomingMessage} */
-	var response;
-	var request = (
-		urlBase.startsWith("https") ? require("https") : require("http")
-	).request(
-		urlBase + data,
-		{
-			agent: false,
-			headers: { accept: "text/event-stream" }
-		},
-		function (res) {
-			response = res;
-			response.on("error", errorHandler);
-			if (!active && !module.hot) {
-				console.log(
-					"Hot Module Replacement is not enabled. Waiting for process restart..."
-				);
-			}
-		}
-	);
 
 	/**
 	 * @param {Error} err error
@@ -40,11 +17,50 @@ exports.keepAlive = function (options) {
 	function errorHandler(err) {
 		err.message =
 			"Problem communicating active modules to the server: " + err.message;
-		onError(err);
+		options.onError(err);
 	}
-	request.on("error", errorHandler);
-	request.end();
+
+	/** @type {Promise<import("http") | import("https")>} */
+	var mod = require("./load-http")(urlBase.startsWith("https"));
+
+	/** @type {import("http").ClientRequest} */
+	var request;
+	/** @type {import("http").IncomingMessage} */
+	var response;
+
+	mod.then(function (client) {
+		request = client.request(
+			urlBase + data,
+			{
+				agent: false,
+				headers: { accept: "text/event-stream" }
+			},
+			function (res) {
+				response = res;
+				response.on("error", errorHandler);
+
+				if (!options.active && !options.module.hot) {
+					console.log(
+						"Hot Module Replacement is not enabled. Waiting for process restart..."
+					);
+				}
+			}
+		);
+
+		request.on("error", errorHandler);
+		request.end();
+	});
+
 	return function () {
-		response.destroy();
+		if (response) {
+			response.destroy();
+		}
 	};
 };
+
+/**
+ * @param {string} value new url value
+ */
+exports.setUrl = function (value) {
+	urlBase = value;
+};

package/hot/lazy-compilation-universal.js

@@ -0,0 +1,18 @@
+"use strict";
+
+/* global __resourceQuery */
+
+var isNodeLikeEnv =
+	typeof global !== "undefined" && typeof global.process !== "undefined";
+
+var handler = isNodeLikeEnv
+	? require("./lazy-compilation-node")
+	: require("./lazy-compilation-web");
+
+handler.setUrl(decodeURIComponent(__resourceQuery.slice(1)));
+
+/**
+ * @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options
+ * @returns {() => void} function to destroy response
+ */
+module.exports = handler;

package/hot/lazy-compilation-web.js

@@ -1,7 +1,7 @@
-/* global __resourceQuery */
-
 "use strict";
 
+/* global __resourceQuery */
+
 if (typeof EventSource !== "function") {
 	throw new Error(
 		"Environment doesn't support lazy compilation (requires EventSource)"
@@ -54,15 +54,18 @@ var updateEventSource = function updateEventSource() {
 exports.keepAlive = function (options) {
 	var data = options.data;
 	var onError = options.onError;
-	var active = options.active;
-	var module = options.module;
+
 	errorHandlers.add(onError);
+
 	var value = activeKeys.get(data) || 0;
+
 	activeKeys.set(data, value + 1);
+
 	if (value === 0) {
 		updateEventSource();
 	}
-	if (!active && !module.hot) {
+
+	if (!options.active && !options.module.hot) {
 		console.log(
 			"Hot Module Replacement is not enabled. Waiting for process restart..."
 		);
@@ -81,3 +84,10 @@ exports.keepAlive = function (options) {
 		}, 1000);
 	};
 };
+
+/**
+ * @param {string} value new url value
+ */
+exports.setUrl = function (value) {
+	urlBase = value;
+};

package/hot/load-http.js

@@ -0,0 +1,7 @@
+/**
+ * @param {boolean} isHTTPS true when need https module, otherwise false
+ * @returns {Promise<import("http") | import("https")>}
+ */
+module.exports = function (isHTTPS) {
+	return isHTTPS ? import("https") : import("http");
+};

package/hot/log.js

@@ -45,6 +45,21 @@ module.exports = function (level, msg) {
 	}
 };
 
+/**
+ * @param {Error} err error
+ * @returns {string} formatted error
+ */
+module.exports.formatError = function (err) {
+	var message = err.message;
+	var stack = err.stack;
+	if (!stack) {
+		return message;
+	} else if (stack.indexOf(message) < 0) {
+		return message + "\n" + stack;
+	}
+	return stack;
+};
+
 var group = console.group || dummy;
 var groupCollapsed = console.groupCollapsed || dummy;
 var groupEnd = console.groupEnd || dummy;
@@ -61,18 +76,3 @@ module.exports.groupEnd = logGroup(groupEnd);
 module.exports.setLogLevel = function (level) {
 	logLevel = level;
 };
-
-/**
- * @param {Error} err error
- * @returns {string} formatted error
- */
-module.exports.formatError = function (err) {
-	var message = err.message;
-	var stack = err.stack;
-	if (!stack) {
-		return message;
-	} else if (stack.indexOf(message) < 0) {
-		return message + "\n" + stack;
-	}
-	return stack;
-};

package/hot/only-dev-server.js

@@ -4,7 +4,7 @@
 */
 /* globals __webpack_hash__ */
 if (module.hot) {
-	/** @type {undefined|string} */
+	/** @type {undefined | string} */
 	var lastHash;
 	var upToDate = function upToDate() {
 		return /** @type {string} */ (lastHash).indexOf(__webpack_hash__) >= 0;
@@ -79,9 +79,13 @@ if (module.hot) {
 				}
 			});
 	};
+	/** @type {EventTarget | NodeJS.EventEmitter} */
 	var hotEmitter = require("./emitter");
-	hotEmitter.on("webpackHotUpdate", function (currentHash) {
-		lastHash = currentHash;
+	/**
+	 * @param {CustomEvent<{ currentHash: string }>} event event or hash
+	 */
+	var handler = function (event) {
+		lastHash = typeof event === "string" ? event : event.detail.currentHash;
 		if (!upToDate()) {
 			var status = module.hot.status();
 			if (status === "idle") {
@@ -96,7 +100,18 @@ if (module.hot) {
 				);
 			}
 		}
-	});
+	};
+
+	if (typeof EventTarget !== "undefined" && hotEmitter instanceof EventTarget) {
+		hotEmitter.addEventListener(
+			"webpackHotUpdate",
+			/** @type {EventListener} */
+			(handler)
+		);
+	} else {
+		hotEmitter.on("webpackHotUpdate", handler);
+	}
+
 	log("info", "[HMR] Waiting for update signal from WDS...");
 } else {
 	throw new Error("[HMR] Hot Module Replacement is disabled.");

package/hot/poll.js

@@ -4,6 +4,7 @@
 */
 /* globals __resourceQuery */
 if (module.hot) {
+	// eslint-disable-next-line no-implicit-coercion
 	var hotPollInterval = +__resourceQuery.slice(1) || 10 * 60 * 1000;
 	var log = require("./log");
 

package/lib/APIPlugin.js

@@ -5,7 +5,9 @@
 
 "use strict";
 
-const InitFragment = require("./InitFragment");
+const {
+	getExternalModuleNodeCommonjsInitFragment
+} = require("./ExternalModule");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
@@ -17,8 +19,8 @@ const ConstDependency = require("./dependencies/ConstDependency");
 const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const {
-	toConstantDependency,
-	evaluateToString
+	evaluateToString,
+	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 const ChunkNameRuntimeModule = require("./runtime/ChunkNameRuntimeModule");
 const GetFullHashRuntimeModule = require("./runtime/GetFullHashRuntimeModule");
@@ -30,11 +32,9 @@ const GetFullHashRuntimeModule = require("./runtime/GetFullHashRuntimeModule");
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
 /**
- * @param {boolean | undefined} module true if ES module
- * @param {string} importMetaName `import.meta` name
  * @returns {Record<string, {expr: string, req: string[] | null, type?: string, assign: boolean}>} replacements
  */
-function getReplacements(module, importMetaName) {
+function getReplacements() {
 	return {
 		__webpack_require__: {
 			expr: RuntimeGlobals.require,
@@ -42,6 +42,12 @@ function getReplacements(module, importMetaName) {
 			type: "function",
 			assign: false
 		},
+		__webpack_global__: {
+			expr: RuntimeGlobals.require,
+			req: [RuntimeGlobals.require],
+			type: "function",
+			assign: false
+		},
 		__webpack_public_path__: {
 			expr: RuntimeGlobals.publicPath,
 			req: [RuntimeGlobals.publicPath],
@@ -67,9 +73,7 @@ function getReplacements(module, importMetaName) {
 			assign: true
 		},
 		__non_webpack_require__: {
-			expr: module
-				? `__WEBPACK_EXTERNAL_createRequire(${importMetaName}.url)`
-				: "require",
+			expr: "require",
 			req: null,
 			type: undefined, // type is not known, depends on environment
 			assign: true
@@ -132,19 +136,7 @@ function getReplacements(module, importMetaName) {
 
 const PLUGIN_NAME = "APIPlugin";
 
-/**
- * @typedef {object} APIPluginOptions
- * @property {boolean} [module] the output filename
- */
-
 class APIPlugin {
-	/**
-	 * @param {APIPluginOptions} [options] options
-	 */
-	constructor(options = {}) {
-		this.options = options;
-	}
-
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
@@ -154,13 +146,15 @@ class APIPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
-				const importMetaName = /** @type {string} */ (
-					compilation.outputOptions.importMetaName
-				);
-				const REPLACEMENTS = getReplacements(
-					this.options.module,
-					importMetaName
-				);
+				const moduleOutput = compilation.options.output.module;
+				const nodeTarget = compiler.platform.node;
+				const nodeEsm = moduleOutput && nodeTarget;
+
+				const REPLACEMENTS = getReplacements();
+				if (nodeEsm) {
+					REPLACEMENTS.__non_webpack_require__.expr =
+						"__WEBPACK_EXTERNAL_createRequire_require";
+				}
 
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -169,7 +163,7 @@ class APIPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.chunkName)
-					.tap(PLUGIN_NAME, chunk => {
+					.tap(PLUGIN_NAME, (chunk) => {
 						compilation.addRuntimeModule(
 							chunk,
 							new ChunkNameRuntimeModule(/** @type {string} */ (chunk.name))
@@ -179,7 +173,7 @@ class APIPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.getFullHash)
-					.tap(PLUGIN_NAME, (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(chunk, new GetFullHashRuntimeModule());
 						return true;
 					});
@@ -190,16 +184,9 @@ class APIPlugin {
 					PLUGIN_NAME,
 					(source, module, renderContext) => {
 						if (/** @type {BuildInfo} */ (module.buildInfo).needCreateRequire) {
-							const needPrefix =
-								renderContext.runtimeTemplate.supportNodePrefixForCoreModules();
 							const chunkInitFragments = [
-								new InitFragment(
-									`import { createRequire as __WEBPACK_EXTERNAL_createRequire } from "${
-										needPrefix ? "node:" : ""
-									}module";\n`,
-									InitFragment.STAGE_HARMONY_IMPORTS,
-									0,
-									"external module node-commonjs"
+								getExternalModuleNodeCommonjsInitFragment(
+									renderContext.runtimeTemplate
 								)
 							];
 
@@ -213,21 +200,32 @@ class APIPlugin {
 				/**
 				 * @param {JavascriptParser} parser the parser
 				 */
-				const handler = parser => {
+				const handler = (parser) => {
 					for (const key of Object.keys(REPLACEMENTS)) {
 						const info = REPLACEMENTS[key];
-						parser.hooks.expression.for(key).tap(PLUGIN_NAME, expression => {
+						parser.hooks.expression.for(key).tap(PLUGIN_NAME, (expression) => {
 							const dep = toConstantDependency(parser, info.expr, info.req);
 
-							if (key === "__non_webpack_require__" && this.options.module) {
-								/** @type {BuildInfo} */
-								(parser.state.module.buildInfo).needCreateRequire = true;
+							if (key === "__non_webpack_require__" && moduleOutput) {
+								if (nodeTarget) {
+									/** @type {BuildInfo} */
+									(parser.state.module.buildInfo).needCreateRequire = true;
+								} else {
+									const warning = new WebpackError(
+										`${PLUGIN_NAME}\n__non_webpack_require__ is only allowed in target node`
+									);
+									warning.loc = /** @type {DependencyLocation} */ (
+										expression.loc
+									);
+									warning.module = parser.state.module;
+									compilation.warnings.push(warning);
+								}
 							}
 
 							return dep(expression);
 						});
 						if (info.assign === false) {
-							parser.hooks.assign.for(key).tap(PLUGIN_NAME, expr => {
+							parser.hooks.assign.for(key).tap(PLUGIN_NAME, (expr) => {
 								const err = new WebpackError(`${key} must not be assigned`);
 								err.loc = /** @type {DependencyLocation} */ (expr.loc);
 								throw err;
@@ -242,7 +240,7 @@ class APIPlugin {
 
 					parser.hooks.expression
 						.for("__webpack_layer__")
-						.tap(PLUGIN_NAME, expr => {
+						.tap(PLUGIN_NAME, (expr) => {
 							const dep = new ConstDependency(
 								JSON.stringify(parser.state.module.layer),
 								/** @type {Range} */ (expr.range)
@@ -253,7 +251,7 @@ class APIPlugin {
 						});
 					parser.hooks.evaluateIdentifier
 						.for("__webpack_layer__")
-						.tap(PLUGIN_NAME, expr =>
+						.tap(PLUGIN_NAME, (expr) =>
 							(parser.state.module.layer === null
 								? new BasicEvaluatedExpression().setNull()
 								: new BasicEvaluatedExpression().setString(
@@ -263,7 +261,7 @@ class APIPlugin {
 						);
 					parser.hooks.evaluateTypeof
 						.for("__webpack_layer__")
-						.tap(PLUGIN_NAME, expr =>
+						.tap(PLUGIN_NAME, (expr) =>
 							new BasicEvaluatedExpression()
 								.setString(
 									parser.state.module.layer === null ? "object" : "string"
@@ -273,7 +271,7 @@ class APIPlugin {
 
 					parser.hooks.expression
 						.for("__webpack_module__.id")
-						.tap(PLUGIN_NAME, expr => {
+						.tap(PLUGIN_NAME, (expr) => {
 							/** @type {BuildInfo} */
 							(parser.state.module.buildInfo).moduleConcatenationBailout =
 								"__webpack_module__.id";
@@ -289,7 +287,7 @@ class APIPlugin {
 
 					parser.hooks.expression
 						.for("__webpack_module__")
-						.tap(PLUGIN_NAME, expr => {
+						.tap(PLUGIN_NAME, (expr) => {
 							/** @type {BuildInfo} */
 							(parser.state.module.buildInfo).moduleConcatenationBailout =
 								"__webpack_module__";

package/lib/AbstractMethodError.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const WebpackError = require("./WebpackError");
+
 const CURRENT_METHOD_REGEXP = /at ([a-zA-Z0-9_.]*)/;
 
 /**

package/lib/AsyncDependenciesBlock.js

@@ -8,20 +8,19 @@
 const DependenciesBlock = require("./DependenciesBlock");
 const makeSerializable = require("./util/makeSerializable");
 
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
-/** @typedef {import("./ChunkGroup")} ChunkGroup */
 /** @typedef {import("./ChunkGroup").ChunkGroupOptions} ChunkGroupOptions */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./Entrypoint").EntryOptions} EntryOptions */
-/** @typedef {import("./Module")} Module */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./util/Hash")} Hash */
 
+/** @typedef {(ChunkGroupOptions & { entryOptions?: EntryOptions }) | string} GroupOptions */
+
 class AsyncDependenciesBlock extends DependenciesBlock {
 	/**
-	 * @param {(ChunkGroupOptions & { entryOptions?: EntryOptions }) | null} groupOptions options for the group
+	 * @param {GroupOptions | null} groupOptions options for the group
 	 * @param {(DependencyLocation | null)=} loc the line of code
 	 * @param {(string | null)=} request the request
 	 */
@@ -39,7 +38,7 @@ class AsyncDependenciesBlock extends DependenciesBlock {
 	}
 
 	/**
-	 * @returns {string | null | undefined} The name of the chunk
+	 * @returns {ChunkGroupOptions["name"]} The name of the chunk
 	 */
 	get chunkName() {
 		return this.groupOptions.name;