webpack 5.93.0 → 5.95.0

package/lib/util/runtime.js

@@ -19,7 +19,7 @@ const SortableSet = require("./SortableSet");
  * @param {EntryOptions=} options optionally already received entry options
  * @returns {RuntimeSpec} runtime
  */
-exports.getEntryRuntime = (compilation, name, options) => {
+module.exports.getEntryRuntime = (compilation, name, options) => {
 	let dependOn;
 	let runtime;
 	if (options) {
@@ -31,7 +31,7 @@ exports.getEntryRuntime = (compilation, name, options) => {
 	}
 	if (dependOn) {
 		/** @type {RuntimeSpec} */
-		let result = undefined;
+		let result;
 		const queue = new Set(dependOn);
 		for (const name of queue) {
 			const dep = compilation.entries.get(name);
@@ -46,9 +46,8 @@ exports.getEntryRuntime = (compilation, name, options) => {
 			}
 		}
 		return result || name;
-	} else {
-		return runtime || name;
 	}
+	return runtime || name;
 };
 
 /**
@@ -69,7 +68,7 @@ const forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 		}
 	}
 };
-exports.forEachRuntime = forEachRuntime;
+module.exports.forEachRuntime = forEachRuntime;
 
 /**
  * @template T
@@ -90,19 +89,19 @@ const getRuntimeKey = runtime => {
 	if (typeof runtime === "string") return runtime;
 	return runtime.getFromUnorderedCache(getRuntimesKey);
 };
-exports.getRuntimeKey = getRuntimeKey;
+module.exports.getRuntimeKey = getRuntimeKey;
 
 /**
  * @param {string} key key of runtimes
  * @returns {RuntimeSpec} runtime(s)
  */
 const keyToRuntime = key => {
-	if (key === "*") return undefined;
+	if (key === "*") return;
 	const items = key.split("\n");
 	if (items.length === 1) return items[0];
 	return new SortableSet(items);
 };
-exports.keyToRuntime = keyToRuntime;
+module.exports.keyToRuntime = keyToRuntime;
 
 /**
  * @template T
@@ -123,13 +122,13 @@ const runtimeToString = runtime => {
 	if (typeof runtime === "string") return runtime;
 	return runtime.getFromUnorderedCache(getRuntimesString);
 };
-exports.runtimeToString = runtimeToString;
+module.exports.runtimeToString = runtimeToString;
 
 /**
  * @param {RuntimeCondition} runtimeCondition runtime condition
  * @returns {string} readable version
  */
-exports.runtimeConditionToString = runtimeCondition => {
+module.exports.runtimeConditionToString = runtimeCondition => {
 	if (runtimeCondition === true) return "true";
 	if (runtimeCondition === false) return "false";
 	return runtimeToString(runtimeCondition);
@@ -152,40 +151,38 @@ const runtimeEqual = (a, b) => {
 		return false;
 	} else if (a.size !== b.size) {
 		return false;
-	} else {
-		a.sort();
-		b.sort();
-		const aIt = a[Symbol.iterator]();
-		const bIt = b[Symbol.iterator]();
-		for (;;) {
-			const aV = aIt.next();
-			if (aV.done) return true;
-			const bV = bIt.next();
-			if (aV.value !== bV.value) return false;
-		}
+	}
+	a.sort();
+	b.sort();
+	const aIt = a[Symbol.iterator]();
+	const bIt = b[Symbol.iterator]();
+	for (;;) {
+		const aV = aIt.next();
+		if (aV.done) return true;
+		const bV = bIt.next();
+		if (aV.value !== bV.value) return false;
 	}
 };
-exports.runtimeEqual = runtimeEqual;
+module.exports.runtimeEqual = runtimeEqual;
 
 /**
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {-1|0|1} compare
  */
-exports.compareRuntime = (a, b) => {
+module.exports.compareRuntime = (a, b) => {
 	if (a === b) {
 		return 0;
 	} else if (a === undefined) {
 		return -1;
 	} else if (b === undefined) {
 		return 1;
-	} else {
-		const aKey = getRuntimeKey(a);
-		const bKey = getRuntimeKey(b);
-		if (aKey < bKey) return -1;
-		if (aKey > bKey) return 1;
-		return 0;
 	}
+	const aKey = getRuntimeKey(a);
+	const bKey = getRuntimeKey(b);
+	if (aKey < bKey) return -1;
+	if (aKey > bKey) return 1;
+	return 0;
 };
 
 /**
@@ -208,26 +205,23 @@ const mergeRuntime = (a, b) => {
 			return set;
 		} else if (b.has(a)) {
 			return b;
-		} else {
-			const set = new SortableSet(b);
-			set.add(a);
-			return set;
-		}
-	} else {
-		if (typeof b === "string") {
-			if (a.has(b)) return a;
-			const set = new SortableSet(a);
-			set.add(b);
-			return set;
-		} else {
-			const set = new SortableSet(a);
-			for (const item of b) set.add(item);
-			if (set.size === a.size) return a;
-			return set;
 		}
+		const set = new SortableSet(b);
+		set.add(a);
+		return set;
+	}
+	if (typeof b === "string") {
+		if (a.has(b)) return a;
+		const set = new SortableSet(a);
+		set.add(b);
+		return set;
 	}
+	const set = new SortableSet(a);
+	for (const item of b) set.add(item);
+	if (set.size === a.size) return a;
+	return set;
 };
-exports.mergeRuntime = mergeRuntime;
+module.exports.mergeRuntime = mergeRuntime;
 
 /**
  * @param {RuntimeCondition} a first
@@ -235,12 +229,12 @@ exports.mergeRuntime = mergeRuntime;
  * @param {RuntimeSpec} runtime full runtime
  * @returns {RuntimeCondition} result
  */
-exports.mergeRuntimeCondition = (a, b, runtime) => {
+module.exports.mergeRuntimeCondition = (a, b, runtime) => {
 	if (a === false) return b;
 	if (b === false) return a;
 	if (a === true || b === true) return true;
 	const merged = mergeRuntime(a, b);
-	if (merged === undefined) return undefined;
+	if (merged === undefined) return;
 	if (typeof merged === "string") {
 		if (typeof runtime === "string" && merged === runtime) return true;
 		return merged;
@@ -256,10 +250,10 @@ exports.mergeRuntimeCondition = (a, b, runtime) => {
  * @param {RuntimeSpec} runtime full runtime
  * @returns {RuntimeSpec | true} result
  */
-exports.mergeRuntimeConditionNonFalse = (a, b, runtime) => {
+module.exports.mergeRuntimeConditionNonFalse = (a, b, runtime) => {
 	if (a === true || b === true) return true;
 	const merged = mergeRuntime(a, b);
-	if (merged === undefined) return undefined;
+	if (merged === undefined) return;
 	if (typeof merged === "string") {
 		if (typeof runtime === "string" && merged === runtime) return true;
 		return merged;
@@ -282,38 +276,34 @@ const mergeRuntimeOwned = (a, b) => {
 	} else if (a === undefined) {
 		if (typeof b === "string") {
 			return b;
-		} else {
-			return new SortableSet(b);
 		}
+		return new SortableSet(b);
 	} else if (typeof a === "string") {
 		if (typeof b === "string") {
 			const set = new SortableSet();
 			set.add(a);
 			set.add(b);
 			return set;
-		} else {
-			const set = new SortableSet(b);
-			set.add(a);
-			return set;
-		}
-	} else {
-		if (typeof b === "string") {
-			a.add(b);
-			return a;
-		} else {
-			for (const item of b) a.add(item);
-			return a;
 		}
+		const set = new SortableSet(b);
+		set.add(a);
+		return set;
 	}
+	if (typeof b === "string") {
+		a.add(b);
+		return a;
+	}
+	for (const item of b) a.add(item);
+	return a;
 };
-exports.mergeRuntimeOwned = mergeRuntimeOwned;
+module.exports.mergeRuntimeOwned = mergeRuntimeOwned;
 
 /**
  * @param {RuntimeSpec} a first
  * @param {RuntimeSpec} b second
  * @returns {RuntimeSpec} merged
  */
-exports.intersectRuntime = (a, b) => {
+module.exports.intersectRuntime = (a, b) => {
 	if (a === undefined) {
 		return b;
 	} else if (b === undefined) {
@@ -322,26 +312,26 @@ exports.intersectRuntime = (a, b) => {
 		return a;
 	} else if (typeof a === "string") {
 		if (typeof b === "string") {
-			return undefined;
+			return;
 		} else if (b.has(a)) {
 			return a;
-		} else {
-			return undefined;
-		}
-	} else {
-		if (typeof b === "string") {
-			if (a.has(b)) return b;
-			return undefined;
-		} else {
-			const set = new SortableSet();
-			for (const item of b) {
-				if (a.has(item)) set.add(item);
-			}
-			if (set.size === 0) return undefined;
-			if (set.size === 1) for (const item of set) return item;
-			return set;
 		}
+		return;
+	}
+	if (typeof b === "string") {
+		if (a.has(b)) return b;
+		return;
 	}
+	const set = new SortableSet();
+	for (const item of b) {
+		if (a.has(item)) set.add(item);
+	}
+	if (set.size === 0) return;
+	if (set.size === 1) {
+		const [item] = set;
+		return item;
+	}
+	return set;
 };
 
 /**
@@ -351,42 +341,42 @@ exports.intersectRuntime = (a, b) => {
  */
 const subtractRuntime = (a, b) => {
 	if (a === undefined) {
-		return undefined;
+		return;
 	} else if (b === undefined) {
 		return a;
 	} else if (a === b) {
-		return undefined;
+		return;
 	} else if (typeof a === "string") {
 		if (typeof b === "string") {
 			return a;
 		} else if (b.has(a)) {
-			return undefined;
-		} else {
-			return a;
+			return;
 		}
-	} else {
-		if (typeof b === "string") {
-			if (!a.has(b)) return a;
-			if (a.size === 2) {
-				for (const item of a) {
-					if (item !== b) return item;
-				}
-			}
-			const set = new SortableSet(a);
-			set.delete(b);
-			return set;
-		} else {
-			const set = new SortableSet();
+		return a;
+	}
+	if (typeof b === "string") {
+		if (!a.has(b)) return a;
+		if (a.size === 2) {
 			for (const item of a) {
-				if (!b.has(item)) set.add(item);
+				if (item !== b) return item;
 			}
-			if (set.size === 0) return undefined;
-			if (set.size === 1) for (const item of set) return item;
-			return set;
 		}
+		const set = new SortableSet(a);
+		set.delete(b);
+		return set;
 	}
+	const set = new SortableSet();
+	for (const item of a) {
+		if (!b.has(item)) set.add(item);
+	}
+	if (set.size === 0) return;
+	if (set.size === 1) {
+		const [item] = set;
+		return item;
+	}
+	return set;
 };
-exports.subtractRuntime = subtractRuntime;
+module.exports.subtractRuntime = subtractRuntime;
 
 /**
  * @param {RuntimeCondition} a first
@@ -394,7 +384,7 @@ exports.subtractRuntime = subtractRuntime;
  * @param {RuntimeSpec} runtime runtime
  * @returns {RuntimeCondition} result
  */
-exports.subtractRuntimeCondition = (a, b, runtime) => {
+module.exports.subtractRuntimeCondition = (a, b, runtime) => {
 	if (b === true) return false;
 	if (b === false) return a;
 	if (a === false) return false;
@@ -404,15 +394,15 @@ exports.subtractRuntimeCondition = (a, b, runtime) => {
 
 /**
  * @param {RuntimeSpec} runtime runtime
- * @param {function(RuntimeSpec): boolean} filter filter function
+ * @param {function(RuntimeSpec=): boolean} filter filter function
  * @returns {boolean | RuntimeSpec} true/false if filter is constant for all runtimes, otherwise runtimes that are active
  */
-exports.filterRuntime = (runtime, filter) => {
-	if (runtime === undefined) return filter(undefined);
+module.exports.filterRuntime = (runtime, filter) => {
+	if (runtime === undefined) return filter();
 	if (typeof runtime === "string") return filter(runtime);
 	let some = false;
 	let every = true;
-	let result = undefined;
+	let result;
 	for (const r of runtime) {
 		const v = filter(r);
 		if (v) {
@@ -456,7 +446,7 @@ class RuntimeSpecMap {
 	get(runtime) {
 		switch (this._mode) {
 			case 0:
-				return undefined;
+				return;
 			case 1:
 				return runtimeEqual(this._singleRuntime, runtime)
 					? this._singleValue
@@ -628,6 +618,9 @@ class RuntimeSpecMap {
 		}
 	}
 
+	/**
+	 * @returns {IterableIterator<T>} values
+	 */
 	values() {
 		switch (this._mode) {
 			case 0:
@@ -645,7 +638,7 @@ class RuntimeSpecMap {
 	}
 }
 
-exports.RuntimeSpecMap = RuntimeSpecMap;
+module.exports.RuntimeSpecMap = RuntimeSpecMap;
 
 class RuntimeSpecSet {
 	/**
@@ -676,6 +669,9 @@ class RuntimeSpecSet {
 		return this._map.has(getRuntimeKey(runtime));
 	}
 
+	/**
+	 * @returns {IterableIterator<RuntimeSpec>} iterable iterator
+	 */
 	[Symbol.iterator]() {
 		return this._map.values();
 	}
@@ -685,4 +681,4 @@ class RuntimeSpecSet {
 	}
 }
 
-exports.RuntimeSpecSet = RuntimeSpecSet;
+module.exports.RuntimeSpecSet = RuntimeSpecSet;

package/lib/util/semver.js

@@ -32,7 +32,7 @@ const parseVersion = str => {
 	}
 	return ver;
 };
-exports.parseVersion = parseVersion;
+module.exports.parseVersion = parseVersion;
 
 /* eslint-disable eqeqeq */
 /**
@@ -82,13 +82,13 @@ const versionLt = (a, b) => {
 	}
 };
 /* eslint-enable eqeqeq */
-exports.versionLt = versionLt;
+module.exports.versionLt = versionLt;
 
 /**
  * @param {string} str range string
  * @returns {SemVerRange} parsed range
  */
-exports.parseRange = str => {
+module.exports.parseRange = str => {
 	const splitAndConvert = str => {
 		return str
 			.split(".")
@@ -126,9 +126,9 @@ exports.parseRange = str => {
 		} else if (range.length === 3) {
 			// Special case for "1.2" is "1.2.x" instead of "=1.2"
 			return [2, ...range.slice(1)];
-		} else {
-			return [range.length, ...range.slice(1)];
 		}
+
+		return [range.length, ...range.slice(1)];
 	};
 	const negate = range => {
 		return [-range[0] - 1, ...range.slice(1)];
@@ -256,30 +256,31 @@ const rangeToString = range => {
 						(needDot > 0 ? "." : "") + ((needDot = 2), item);
 		}
 		return str;
-	} else {
-		var stack = [];
+	}
+	/** @type {string[]} */
+	var stack = [];
+	// eslint-disable-next-line no-redeclare
+	for (var i = 1; i < range.length; i++) {
 		// eslint-disable-next-line no-redeclare
-		for (var i = 1; i < range.length; i++) {
-			// eslint-disable-next-line no-redeclare
-			var item = range[i];
-			stack.push(
-				item === 0
-					? "not(" + pop() + ")"
-					: item === 1
-						? "(" + pop() + " || " + pop() + ")"
-						: item === 2
-							? stack.pop() + " " + stack.pop()
-							: rangeToString(item)
-			);
-		}
-		return pop();
+		var item = range[i];
+		stack.push(
+			item === 0
+				? "not(" + pop() + ")"
+				: item === 1
+					? "(" + pop() + " || " + pop() + ")"
+					: item === 2
+						? stack.pop() + " " + stack.pop()
+						: rangeToString(item)
+		);
 	}
+	return pop();
+
 	function pop() {
-		return stack.pop().replace(/^\((.+)\)$/, "$1");
+		return /** @type {string} */ (stack.pop()).replace(/^\((.+)\)$/, "$1");
 	}
 };
 /* eslint-enable eqeqeq */
-exports.rangeToString = rangeToString;
+module.exports.rangeToString = rangeToString;
 
 /* eslint-disable eqeqeq */
 /**
@@ -399,6 +400,7 @@ const satisfy = (range, version) => {
 				}
 			} else {
 				// Handles all "next-ver" cases in the second table
+				// eslint-disable-next-line no-lonely-if
 				if (rangeType != "s" && rangeType != "n") {
 					isEqual = false;
 					j--;
@@ -427,9 +429,9 @@ const satisfy = (range, version) => {
 	return !!p();
 };
 /* eslint-enable eqeqeq */
-exports.satisfy = satisfy;
+module.exports.satisfy = satisfy;
 
-exports.stringifyHoley = json => {
+module.exports.stringifyHoley = json => {
 	switch (typeof json) {
 		case "undefined":
 			return "";
@@ -442,9 +444,9 @@ exports.stringifyHoley = json => {
 				}
 				str += "]";
 				return str;
-			} else {
-				return JSON.stringify(json);
 			}
+
+			return JSON.stringify(json);
 		default:
 			return JSON.stringify(json);
 	}

package/lib/util/serialization.js

@@ -39,7 +39,11 @@ const registerSerializers = memoize(() => {
 	// This allows bundling all internal serializers
 	const internalSerializables = require("./internalSerializables");
 	getObjectMiddleware().registerLoader(/^webpack\/lib\//, req => {
-		const loader = internalSerializables[req.slice("webpack/lib/".length)];
+		const loader =
+			internalSerializables[
+				/** @type {keyof import("./internalSerializables")} */
+				(req.slice("webpack/lib/".length))
+			];
 		if (loader) {
 			loader();
 		} else {
@@ -88,6 +92,9 @@ module.exports = {
 			new SingleItemMiddleware(),
 			new (getObjectMiddleware())(context => {
 				if (context.write) {
+					/**
+					 * @param {any} value value
+					 */
 					context.writeLazy = value => {
 						context.write(
 							SerializerMiddleware.createLazy(value, binaryMiddleware)
@@ -115,11 +122,19 @@ module.exports = {
 			new SingleItemMiddleware(),
 			new (getObjectMiddleware())(context => {
 				if (context.write) {
+					/**
+					 * @param {any} value value
+					 */
 					context.writeLazy = value => {
 						context.write(
 							SerializerMiddleware.createLazy(value, binaryMiddleware)
 						);
 					};
+					/**
+					 * @param {any} value value
+					 * @param {object=} options lazy options
+					 * @returns {function(): Promise<any> | any} lazy function
+					 */
 					context.writeSeparate = (value, options) => {
 						const lazy = SerializerMiddleware.createLazy(
 							value,

package/lib/util/smartGrouping.js

@@ -16,7 +16,7 @@
  * @template T
  * @template R
  * @typedef {object} GroupConfig
- * @property {function(T): string[]} getKeys
+ * @property {function(T): string[] | undefined} getKeys
  * @property {function(string, (R | T)[], T[]): R} createGroup
  * @property {function(string, T[]): GroupOptions=} getOptions
  */
@@ -111,10 +111,10 @@ const smartGrouping = (items, groupConfigs) => {
 		const results = [];
 		for (;;) {
 			/** @type {Group<T, R> | undefined} */
-			let bestGroup = undefined;
+			let bestGroup;
 			let bestGroupSize = -1;
-			let bestGroupItems = undefined;
-			let bestGroupOptions = undefined;
+			let bestGroupItems;
+			let bestGroupOptions;
 			for (const [group, state] of groupMap) {
 				const { items, used } = state;
 				let options = state.options;
@@ -138,7 +138,7 @@ const smartGrouping = (items, groupConfigs) => {
 					}
 				}
 				const targetGroupCount = (options && options.targetGroupCount) || 4;
-				let sizeValue = force
+				const sizeValue = force
 					? items.size
 					: Math.min(
 							items.size,

package/lib/util/source.js

@@ -58,4 +58,4 @@ const isSourceEqual = (a, b) => {
 	}
 	return result;
 };
-exports.isSourceEqual = isSourceEqual;
+module.exports.isSourceEqual = isSourceEqual;

package/lib/wasm/EnableWasmLoadingPlugin.js

@@ -52,10 +52,11 @@ class EnableWasmLoadingPlugin {
 			throw new Error(
 				`Library type "${type}" is not enabled. ` +
 					"EnableWasmLoadingPlugin need to be used to enable this type of wasm loading. " +
-					'This usually happens through the "output.enabledWasmLoadingTypes" option. ' +
-					'If you are using a function as entry which sets "wasmLoading", you need to add all potential library types to "output.enabledWasmLoadingTypes". ' +
-					"These types are enabled: " +
-					Array.from(getEnabledTypes(compiler)).join(", ")
+					`This usually happens through the "output.enabledWasmLoadingTypes" option. ` +
+					`If you are using a function as entry which sets "wasmLoading", you need to add all potential library types to "output.enabledWasmLoadingTypes". ` +
+					`These types are enabled: ${Array.from(
+						getEnabledTypes(compiler)
+					).join(", ")}`
 			);
 		}
 	}

package/lib/wasm-async/AsyncWasmLoadingRuntimeModule.js

@@ -81,10 +81,10 @@ class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
 							Template.indent([
 								".then(",
 								Template.indent([
-									runtimeTemplate.returningFunction(
+									`${runtimeTemplate.returningFunction(
 										"Object.assign(exports, res.instance.exports)",
 										"res"
-									) + ",",
+									)},`,
 									runtimeTemplate.basicFunction("e", [
 										`if(res.headers.get("Content-Type") !== "application/wasm") {`,
 										Template.indent([
@@ -110,7 +110,7 @@ class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
 			"exports, wasmModuleId, wasmModuleHash, importsObj",
 			this.supportsStreaming
 				? getStreaming()
-				: [`return ${loader}`, Template.indent(fallback) + ";"]
+				: [`return ${loader}`, `${Template.indent(fallback)};`]
 		)};`;
 	}
 }

package/lib/wasm-async/AsyncWebAssemblyJavascriptGenerator.js

@@ -161,12 +161,11 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 					])
 				: undefined;
 
-		const instantiateCall =
-			`${RuntimeGlobals.instantiateWasm}(${module.exportsArgument}, ${
-				module.moduleArgument
-			}.id, ${JSON.stringify(
-				chunkGraph.getRenderedModuleHash(module, runtime)
-			)}` + (importsObj ? `, ${importsObj})` : `)`);
+		const instantiateCall = `${RuntimeGlobals.instantiateWasm}(${module.exportsArgument}, ${
+			module.moduleArgument
+		}.id, ${JSON.stringify(
+			chunkGraph.getRenderedModuleHash(module, runtime)
+		)}${importsObj ? `, ${importsObj})` : ")"}`;
 
 		if (promises.length > 0)
 			runtimeRequirements.add(RuntimeGlobals.asyncModule);