webpack 5.107.2 → 5.108.0

package/lib/runtime/MakeDeferredNamespaceObjectRuntime.js

@@ -40,7 +40,9 @@ function getOptimizedDeferredModule(
 ) {
 	runtimeRequirements.add(RuntimeGlobals.makeOptimizedDeferredNamespaceObject);
 	const mode = getMakeDeferredNamespaceModeFromExportsType(exportsType);
-	return `${RuntimeGlobals.makeOptimizedDeferredNamespaceObject}(${moduleId}, ${mode}${
+	return `${
+		RuntimeGlobals.makeOptimizedDeferredNamespaceObject
+	}(${moduleId}, ${mode}${
 		asyncDepsIds.length > 0
 			? `, ${JSON.stringify(asyncDepsIds.filter((x) => x !== null))}`
 			: ""
@@ -63,19 +65,22 @@ class MakeOptimizedDeferredNamespaceObjectRuntimeModule extends HelperRuntimeMod
 	 */
 	generate() {
 		if (!this.compilation) return null;
+		const { runtimeTemplate } = this.compilation;
+		const cst = runtimeTemplate.renderConst();
+		const lt = runtimeTemplate.renderLet();
 		const fn = RuntimeGlobals.makeOptimizedDeferredNamespaceObject;
 		const hasAsync = this.hasAsyncRuntime;
 		return Template.asString([
 			// Note: must be a function (not arrow), because this is used in body!
 			`${fn} = function(moduleId, mode${hasAsync ? ", asyncDeps" : ""}) {`,
 			Template.indent([
-				"var r = this;",
-				hasAsync ? "var isAsync = asyncDeps && asyncDeps.length;" : "",
-				"var obj = {",
+				`${cst} r = this;`,
+				hasAsync ? `${cst} isAsync = asyncDeps && asyncDeps.length;` : "",
+				`${cst} obj = {`,
 				Template.indent([
 					"get a() {",
 					Template.indent([
-						"var exports = r(moduleId);",
+						`${lt} exports = r(moduleId);`,
 						hasAsync
 							? `if(isAsync) exports = exports[${RuntimeGlobals.asyncModuleExportSymbol}];`
 							: "",
@@ -115,11 +120,11 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 	generate() {
 		if (!this.compilation) return null;
 		const { runtimeTemplate } = this.compilation;
+		const cst = runtimeTemplate.renderConst();
+		const lt = runtimeTemplate.renderLet();
 		const fn = RuntimeGlobals.makeDeferredNamespaceObject;
 		const hasAsync = this.hasAsyncRuntime;
-		const init = runtimeTemplate.supportsOptionalChaining()
-			? "init?.();"
-			: "if (init) init();";
+		const init = `${runtimeTemplate.optionalChaining("init", "()")};`;
 		return `${fn} = ${runtimeTemplate.basicFunction("moduleId, mode", [
 			// Per the TC39 import-defer spec, deferred namespaces are
 			// distinct from their eager counterparts and the same module
@@ -144,13 +149,13 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 			// "default-with-named", another as "namespace") get
 			// distinct cache entries.
 			"mode &= ~16;",
-			"var byMode = __webpack_module_deferred_namespace_cache__[moduleId];",
+			`${lt} byMode = __webpack_module_deferred_namespace_cache__[moduleId];`,
 			"if (byMode && byMode[mode] !== undefined) return byMode[mode];",
 			"if (!byMode) byMode = __webpack_module_deferred_namespace_cache__[moduleId] = {};",
-			"var cachedModule = __webpack_module_cache__[moduleId];",
+			`${cst} cachedModule = __webpack_module_cache__[moduleId];`,
 			"if (cachedModule && cachedModule.error === undefined && !(mode & 8)) {",
 			Template.indent([
-				"var exports = cachedModule.exports;",
+				`${lt} exports = cachedModule.exports;`,
 				hasAsync
 					? `if (${RuntimeGlobals.asyncModuleExportSymbol} in exports) exports = exports[${RuntimeGlobals.asyncModuleExportSymbol}];`
 					: "",
@@ -158,7 +163,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 			]),
 			"}",
 			"",
-			`var init = ${runtimeTemplate.basicFunction("", [
+			`${lt} init = ${runtimeTemplate.basicFunction("", [
 				`ns = ${RuntimeGlobals.require}(moduleId);`,
 				hasAsync
 					? `if (${RuntimeGlobals.asyncModuleExportSymbol} in ns) ns = ns[${RuntimeGlobals.asyncModuleExportSymbol}];`
@@ -206,12 +211,12 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				// proposal, the [[StringTag]] of a Deferred Module Namespace
 				// Exotic Object is "Deferred Module"), and the target was already
 				// pre-populated with those values below.
-				"var keys = Reflect.ownKeys(ns);",
+				`${cst} keys = Reflect.ownKeys(ns);`,
 				"for (var i = 0; i < keys.length; i++) {",
 				Template.indent([
-					"var k = keys[i];",
+					`${cst} k = keys[i];`,
 					'if (k === "__esModule" || k === Symbol.toStringTag) continue;',
-					"if (!Object.prototype.hasOwnProperty.call(ns_target, k)) {",
+					`if (!${runtimeTemplate.objectHasOwn("ns_target", "k")}) {`,
 					Template.indent([
 						"try { Object.defineProperty(ns_target, k, Reflect.getOwnPropertyDescriptor(ns, k)); } catch (_) {}"
 					]),
@@ -227,15 +232,15 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 			// `__esModule` / `Symbol.toStringTag` non-configurable properties).
 			// Using a dedicated target keeps the proxy invariant-compliant
 			// without interfering with the module's own exports object.
-			"var ns_target = { __proto__: null };",
+			`${cst} ns_target = { __proto__: null };`,
 			// Pre-populate the synthetic deferred-namespace properties with
 			// fully non-configurable, non-writable, non-enumerable descriptors
 			// (matching the TC39 import-defer spec for Module Namespace
 			// Exotic Objects). The trap returns the same descriptors below.
 			'Object.defineProperty(ns_target, "__esModule", { value: true });',
 			'Object.defineProperty(ns_target, Symbol.toStringTag, { value: "Deferred Module" });',
-			"var ns = ns_target;",
-			"var handler = {",
+			`${lt} ns = ns_target;`,
+			`${cst} handler = {`,
 			Template.indent([
 				"__proto__: null,",
 				// Per the TC39 import-defer proposal, `IsSymbolLikeNamespaceKey`
@@ -244,7 +249,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				// trigger evaluation of the deferred module. The Symbol checks
 				// below short-circuit to the pre-populated target without
 				// running `init()`.
-				`get: ${runtimeTemplate.basicFunction("_, name", [
+				`${runtimeTemplate.method("get", "_, name", [
 					"switch (name) {",
 					Template.indent([
 						'case "__esModule": return true;',
@@ -256,7 +261,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 					init,
 					"return ns[name];"
 				])},`,
-				`has: ${runtimeTemplate.basicFunction("_, name", [
+				`${runtimeTemplate.method("has", "_, name", [
 					"switch (name) {",
 					Template.indent(
 						[
@@ -275,12 +280,20 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 					init,
 					"return name in ns;"
 				])},`,
-				`ownKeys: ${runtimeTemplate.basicFunction("", [
+				`${runtimeTemplate.method("ownKeys", "", [
 					init,
-					`var keys = Reflect.ownKeys(ns).filter(${runtimeTemplate.expressionFunction('x !== "then" && x !== Symbol.toStringTag', "x")}).concat([Symbol.toStringTag]);`,
+					`${cst} filtered = Reflect.ownKeys(ns).filter(${runtimeTemplate.expressionFunction(
+						'x !== "then" && x !== Symbol.toStringTag',
+						"x"
+					)});`,
+					`${cst} keys = ${
+						runtimeTemplate.supportsSpread()
+							? "[...filtered, Symbol.toStringTag]"
+							: "filtered.concat([Symbol.toStringTag])"
+					};`,
 					"return keys;"
 				])},`,
-				`getOwnPropertyDescriptor: ${runtimeTemplate.basicFunction("_, name", [
+				`${runtimeTemplate.method("getOwnPropertyDescriptor", "_, name", [
 					"switch (name) {",
 					Template.indent([
 						// Match the descriptors actually defined on `ns_target`
@@ -294,7 +307,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 					"}",
 					'if (typeof name === "symbol") return Reflect.getOwnPropertyDescriptor(ns_target, name);',
 					init,
-					"var desc = Reflect.getOwnPropertyDescriptor(ns, name);",
+					`${lt} desc = Reflect.getOwnPropertyDescriptor(ns, name);`,
 					'if (mode & 2 && name == "default" && !desc) {',
 					Template.indent("desc = { value: ns, configurable: true };"),
 					"}",
@@ -305,7 +318,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				// algorithm calls `[[GetOwnProperty]]` first, which forces
 				// evaluation on a deferred namespace). Symbol keys go through
 				// OrdinaryDefineOwnProperty and do not trigger eval.
-				`defineProperty: ${runtimeTemplate.basicFunction("_, name", [
+				`${runtimeTemplate.method("defineProperty", "_, name", [
 					'if (typeof name === "symbol" || name === "then") return false;',
 					init,
 					"return false;"
@@ -314,7 +327,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				// still trigger evaluation for string keys (the spec
 				// algorithm calls `GetModuleExportsList` for non-symbol-like
 				// keys, forcing evaluation on a deferred namespace).
-				`deleteProperty: ${runtimeTemplate.basicFunction("_, name", [
+				`${runtimeTemplate.method("deleteProperty", "_, name", [
 					'if (typeof name === "symbol" || name === "then") return false;',
 					init,
 					"return false;"

package/lib/runtime/MakeNamespaceObjectRuntimeModule.js

@@ -26,7 +26,7 @@ class MakeNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 		return Template.asString([
 			"// define __esModule on exports",
 			`${fn} = ${runtimeTemplate.basicFunction("exports", [
-				"if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {",
+				`if(${runtimeTemplate.supportsSymbol() ? "" : "typeof Symbol !== 'undefined' && "}Symbol.toStringTag) {`,
 				Template.indent([
 					"Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });"
 				]),

package/lib/runtime/OnChunksLoadedRuntimeModule.js

@@ -23,7 +23,7 @@ class OnChunksLoadedRuntimeModule extends RuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
 		return Template.asString([
-			"var deferred = [];",
+			`${runtimeTemplate.renderConst()} deferred = [];`,
 			`${RuntimeGlobals.onChunksLoaded} = ${runtimeTemplate.basicFunction(
 				"result, chunkIds, fn, priority",
 				[
@@ -35,14 +35,14 @@ class OnChunksLoadedRuntimeModule extends RuntimeModule {
 						"return;"
 					]),
 					"}",
-					"var notFulfilled = Infinity;",
+					`${runtimeTemplate.renderLet()} notFulfilled = Infinity;`,
 					"for (var i = 0; i < deferred.length; i++) {",
 					Template.indent([
 						runtimeTemplate.destructureArray(
 							["chunkIds", "fn", "priority"],
 							"deferred[i]"
 						),
-						"var fulfilled = true;",
+						`${runtimeTemplate.renderLet()} fulfilled = true;`,
 						"for (var j = 0; j < chunkIds.length; j++) {",
 						Template.indent([
 							`if ((priority & 1 === 0 || notFulfilled >= priority) && Object.keys(${
@@ -63,7 +63,7 @@ class OnChunksLoadedRuntimeModule extends RuntimeModule {
 						"if(fulfilled) {",
 						Template.indent([
 							"deferred.splice(i--, 1)",
-							"var r = fn();",
+							`${runtimeTemplate.renderConst()} r = fn();`,
 							"if (r !== undefined) result = r;"
 						]),
 						"}"

package/lib/runtime/RelativeUrlRuntimeModule.js

@@ -22,11 +22,12 @@ class RelativeUrlRuntimeModule extends HelperRuntimeModule {
 	generate() {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
+		const cst = runtimeTemplate.renderConst();
 		return Template.asString([
 			`${RuntimeGlobals.relativeUrl} = function RelativeURL(url) {`,
 			Template.indent([
-				'var realUrl = new URL(url, "x:/");',
-				"var values = {};",
+				`${cst} realUrl = new URL(url, "x:/");`,
+				`${cst} values = {};`,
 				"for (var key in realUrl) values[key] = realUrl[key];",
 				"values.href = url;",
 				'values.pathname = url.replace(/[?#].*/, "");',

package/lib/runtime/StartupChunkDependenciesRuntimeModule.js

@@ -36,7 +36,7 @@ class StartupChunkDependenciesRuntimeModule extends RuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
 		return Template.asString([
-			`var next = ${RuntimeGlobals.startup};`,
+			`${runtimeTemplate.renderConst()} next = ${RuntimeGlobals.startup};`,
 			`${RuntimeGlobals.startup} = ${runtimeTemplate.basicFunction(
 				"",
 				!this.asyncChunkLoading

package/lib/runtime/StartupEntrypointRuntimeModule.js

@@ -26,11 +26,12 @@ class StartupEntrypointRuntimeModule extends RuntimeModule {
 	generate() {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
+		const cst = runtimeTemplate.renderConst();
 		return `${
 			RuntimeGlobals.startupEntrypoint
 		} = ${runtimeTemplate.basicFunction("result, chunkIds, fn", [
 			"// arguments: chunkIds, moduleId are deprecated",
-			"var moduleId = chunkIds;",
+			`${cst} moduleId = chunkIds;`,
 			`if(!fn) chunkIds = result, fn = ${runtimeTemplate.returningFunction(
 				`${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)`
 			)};`,
@@ -39,13 +40,13 @@ class StartupEntrypointRuntimeModule extends RuntimeModule {
 						`return Promise.all(chunkIds.map(${RuntimeGlobals.ensureChunk}, ${
 							RuntimeGlobals.require
 						})).then(${runtimeTemplate.basicFunction("", [
-							"var r = fn();",
+							`${cst} r = fn();`,
 							"return r === undefined ? result : r;"
 						])})`
 					]
 				: [
 						`chunkIds.map(${RuntimeGlobals.ensureChunk}, ${RuntimeGlobals.require})`,
-						"var r = fn();",
+						`${cst} r = fn();`,
 						"return r === undefined ? result : r;"
 					])
 		])}`;

package/lib/runtime/WorkerRuntimeModule.js

@@ -0,0 +1,33 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const HelperRuntimeModule = require("./HelperRuntimeModule");
+
+/** @typedef {import("../Compilation")} Compilation */
+
+class WorkerRuntimeModule extends HelperRuntimeModule {
+	constructor() {
+		super("worker");
+	}
+
+	/**
+	 * Generates runtime code for this runtime module.
+	 * @returns {string | null} runtime code
+	 */
+	generate() {
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
+		// prefer a global `Worker` when present (web, Bun, polyfills), else `worker_threads.Worker`
+		const nodeWorker = runtimeTemplate.getBuiltinModule(
+			runtimeTemplate.renderNodePrefixForCoreModule("worker_threads"),
+			".Worker"
+		);
+		return `${RuntimeGlobals.worker} = typeof Worker !== "undefined" ? Worker : ${nodeWorker};`;
+	}
+}
+
+module.exports = WorkerRuntimeModule;

package/lib/schemes/HttpUriPlugin.js

@@ -29,6 +29,7 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../NormalModuleFactory").ResourceDataWithData} ResourceDataWithData */
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
+/** @typedef {import("../NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
 
 const getHttp = memoize(() => require("http"));
 const getHttps = memoize(() => require("https"));
@@ -1357,7 +1358,7 @@ Run build with un-frozen lockfile to automatically fix lockfile.`
 								if (err) return callback(err);
 								const result = /** @type {Info} */ (_result);
 								if (module) {
-									/** @type {BuildInfo} */
+									/** @type {NormalModuleBuildInfo} */
 									(module.buildInfo).resourceIntegrity = result.entry.integrity;
 								}
 								callback(null, result.content);
@@ -1370,7 +1371,7 @@ Run build with un-frozen lockfile to automatically fix lockfile.`
 								const result = /** @type {Info} */ (_result);
 								if (
 									result.entry.integrity !==
-									/** @type {BuildInfo} */
+									/** @type {NormalModuleBuildInfo} */
 									(module.buildInfo).resourceIntegrity
 								) {
 									return callback(null, true);

package/lib/serialization/AggregateErrorSerializer.js

@@ -4,8 +4,9 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./types").ComplexSerializableType} ComplexSerializableType */
+/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext<ComplexSerializableType[]>} ObjectDeserializerContext */
+/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext<ComplexSerializableType[]>} ObjectSerializerContext */
 
 /** @typedef {Error & { cause?: unknown, errors: EXPECTED_ANY[] }} AggregateError */
 
@@ -19,7 +20,7 @@ class AggregateErrorSerializer {
 		context.write(obj.errors);
 		context.write(obj.message);
 		context.write(obj.stack);
-		context.write(obj.cause);
+		context.write(/** @type {ComplexSerializableType} */ (obj.cause));
 	}
 
 	/**
@@ -28,12 +29,12 @@ class AggregateErrorSerializer {
 	 * @returns {AggregateError} error
 	 */
 	deserialize(context) {
-		const errors = context.read();
+		const errors = /** @type {EXPECTED_ANY[]} */ (context.read());
 		// eslint-disable-next-line n/no-unsupported-features/es-builtins, n/no-unsupported-features/es-syntax, unicorn/error-message
 		const err = new AggregateError(errors);
 
-		err.message = context.read();
-		err.stack = context.read();
+		err.message = /** @type {string} */ (context.read());
+		err.stack = /** @type {string | undefined} */ (context.read());
 		err.cause = context.read();
 
 		return err;

package/lib/serialization/ArraySerializer.js

@@ -4,15 +4,12 @@
 
 "use strict";
 
-/** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
 class ArraySerializer {
 	/**
 	 * Serializes this instance into the provided serializer context.
 	 * @template T
 	 * @param {T[]} array array
-	 * @param {ObjectSerializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectSerializerContext<(number | T)[]>} context context
 	 */
 	serialize(array, context) {
 		context.write(array.length);
@@ -22,16 +19,15 @@ class ArraySerializer {
 	/**
 	 * Restores this instance from the provided deserializer context.
 	 * @template T
-	 * @param {ObjectDeserializerContext} context context
+	 * @param {import("./ObjectMiddleware").ObjectDeserializerContext<(number | T)[]>} context context
 	 * @returns {T[]} array
 	 */
 	deserialize(context) {
-		/** @type {number} */
-		const length = context.read();
+		const length = /** @type {number} */ (context.read());
 		/** @type {T[]} */
 		const array = [];
 		for (let i = 0; i < length; i++) {
-			array.push(context.read());
+			array.push(/** @type {T} */ (context.read()));
 		}
 		return array;
 	}