webpack 5.59.0 → 5.94.0

package/lib/util/semver.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {(string|number|undefined|[])[]} SemVerRange */
 
 /**
@@ -31,7 +32,7 @@ const parseVersion = str => {
 	}
 	return ver;
 };
-exports.parseVersion = parseVersion;
+module.exports.parseVersion = parseVersion;
 
 /* eslint-disable eqeqeq */
 /**
@@ -81,15 +82,17 @@ 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(".").map(item => (`${+item}` === item ? +item : item));
+		return str
+			.split(".")
+			.map(item => (item !== "NaN" && `${+item}` === item ? +item : item));
 	};
 	// see https://docs.npmjs.com/misc/semver#range-grammar for grammar
 	const parsePartial = str => {
@@ -123,21 +126,23 @@ 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)];
 	};
 	const parseSimple = str => {
-		// simple     ::= primitive | partial | tilde | caret
-		// primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' ) partial
-		// tilde      ::= '~' partial
-		// caret      ::= '^' partial
+		// simple       ::= primitive | partial | tilde | caret
+		// primitive    ::= ( '<' | '>' | '>=' | '<=' | '=' | '!' ) ( ' ' ) * partial
+		// tilde        ::= '~' ( ' ' ) * partial
+		// caret        ::= '^' ( ' ' ) * partial
 		const match = /^(\^|~|<=|<|>=|>|=|v|!)/.exec(str);
 		const start = match ? match[0] : "";
-		const remainder = parsePartial(str.slice(start.length));
+		const remainder = parsePartial(
+			start.length ? str.slice(start.length).trim() : str.trim()
+		);
 		switch (start) {
 			case "^":
 				if (remainder.length > 1 && remainder[1] === 0) {
@@ -148,6 +153,9 @@ exports.parseRange = str => {
 				}
 				return [1, ...remainder.slice(1)];
 			case "~":
+				if (remainder.length === 2 && remainder[0] === 0) {
+					return [1, ...remainder.slice(1)];
+				}
 				return [2, ...remainder.slice(1)];
 			case ">=":
 				return remainder;
@@ -191,11 +199,14 @@ exports.parseRange = str => {
 		return [, ...arr, ...items.slice(1).map(() => fn)];
 	};
 	const parseRange = str => {
-		// range      ::= hyphen | simple ( ' ' simple ) * | ''
-		// hyphen     ::= partial ' - ' partial
-		const items = str.split(" - ");
+		// range      ::= hyphen | simple ( ' ' ( ' ' ) * simple ) * | ''
+		// hyphen     ::= partial ( ' ' ) * ' - ' ( ' ' ) * partial
+		const items = str.split(/\s+-\s+/);
 		if (items.length === 1) {
-			const items = str.trim().split(/\s+/g).map(parseSimple);
+			const items = str
+				.trim()
+				.split(/(?<=[-0-9A-Za-z])\s+/g)
+				.map(parseSimple);
 			return combine(items, 2);
 		}
 		const a = parsePartial(items[0]);
@@ -224,16 +235,15 @@ const rangeToString = range => {
 			fixCount == 0
 				? ">="
 				: fixCount == -1
-				? "<"
-				: fixCount == 1
-				? "^"
-				: fixCount == 2
-				? "~"
-				: fixCount > 0
-				? "="
-				: "!=";
+					? "<"
+					: fixCount == 1
+						? "^"
+						: fixCount == 2
+							? "~"
+							: fixCount > 0
+								? "="
+								: "!=";
 		var needDot = 1;
-		// eslint-disable-next-line no-redeclare
 		for (var i = 1; i < range.length; i++) {
 			var item = range[i];
 			var t = (typeof item)[0];
@@ -241,35 +251,36 @@ const rangeToString = range => {
 			str +=
 				t == "u"
 					? // undefined: prerelease marker, add an "-"
-					  "-"
+						"-"
 					: // number or string: add the item, set flag to add an "." between two of them
-					  (needDot > 0 ? "." : "") + ((needDot = 2), item);
+						(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
+		var item = range[i];
+		stack.push(
+			item === 0
+				? "not(" + pop() + ")"
+				: item === 1
 					? "(" + pop() + " || " + pop() + ")"
 					: item === 2
-					? stack.pop() + " " + stack.pop()
-					: rangeToString(item)
-			);
-		}
-		return pop();
+						? 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 */
 /**
@@ -281,7 +292,7 @@ const satisfy = (range, version) => {
 	if (0 in range) {
 		// @ts-expect-error
 		version = parseVersion(version);
-		var fixCount = range[0];
+		var fixCount = /** @type {number} */ (range[0]);
 		// when negated is set it swill set for < instead of >=
 		var negated = fixCount < 0;
 		if (negated) fixCount = -fixCount - 1;
@@ -389,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--;
@@ -408,18 +420,18 @@ const satisfy = (range, version) => {
 			item == 1
 				? p() | p()
 				: item == 2
-				? p() & p()
-				: item
-				? satisfy(item, version)
-				: !p()
+					? p() & p()
+					: item
+						? satisfy(item, version)
+						: !p()
 		);
 	}
 	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 "";
@@ -432,9 +444,9 @@ exports.stringifyHoley = json => {
 				}
 				str += "]";
 				return str;
-			} else {
-				return JSON.stringify(json);
 			}
+
+			return JSON.stringify(json);
 		default:
 			return JSON.stringify(json);
 	}
@@ -444,11 +456,7 @@ exports.stringifyHoley = json => {
 exports.parseVersionRuntimeCode = runtimeTemplate =>
 	`var parseVersion = ${runtimeTemplate.basicFunction("str", [
 		"// see webpack/lib/util/semver.js for original code",
-		`var p=${
-			runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"
-		}{return p.split(".").map((${
-			runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"
-		}{return+p==p?+p:p}))},n=/^([^-+]+)?(?:-([^+]+))?(?:\\+(.+))?$/.exec(str),r=n[1]?p(n[1]):[];return n[2]&&(r.length++,r.push.apply(r,p(n[2]))),n[3]&&(r.push([]),r.push.apply(r,p(n[3]))),r;`
+		`var p=${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return p.split(".").map((${runtimeTemplate.supportsArrowFunction() ? "p=>" : "function(p)"}{return+p==p?+p:p}))},n=/^([^-+]+)?(?:-([^+]+))?(?:\\+(.+))?$/.exec(str),r=n[1]?p(n[1]):[];return n[2]&&(r.length++,r.push.apply(r,p(n[2]))),n[3]&&(r.push([]),r.push.apply(r,p(n[3]))),r;`
 	])}`;
 //#endregion
 

package/lib/util/serialization.js

@@ -11,6 +11,8 @@ const memoize = require("./memoize");
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../serialization/Serializer")} Serializer */
+/** @typedef {typeof import("../util/Hash")} Hash */
+/** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 const getBinaryMiddleware = memoize(() =>
 	require("../serialization/BinaryMiddleware")
@@ -37,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 {
@@ -72,6 +78,9 @@ module.exports = {
 	get MEASURE_END_OPERATION() {
 		return getBinaryMiddleware().MEASURE_END_OPERATION;
 	},
+	/**
+	 * @returns {Serializer} buffer serializer
+	 */
 	get buffersSerializer() {
 		if (buffersSerializer !== undefined) return buffersSerializer;
 		registerSerializers();
@@ -83,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)
@@ -93,6 +105,11 @@ module.exports = {
 			binaryMiddleware
 		]));
 	},
+	/**
+	 * @param {IntermediateFileSystem} fs filesystem
+	 * @param {string | Hash} hashFunction hash function to use
+	 * @returns {Serializer} file serializer
+	 */
 	createFileSerializer: (fs, hashFunction) => {
 		registerSerializers();
 		const Serializer = getSerializer();
@@ -105,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

@@ -6,7 +6,7 @@
 "use strict";
 
 /**
- * @typedef {Object} GroupOptions
+ * @typedef {object} GroupOptions
  * @property {boolean=} groupChildren
  * @property {boolean=} force
  * @property {number=} targetGroupCount
@@ -15,8 +15,8 @@
 /**
  * @template T
  * @template R
- * @typedef {Object} GroupConfig
- * @property {function(T): string[]} getKeys
+ * @typedef {object} GroupConfig
+ * @property {function(T): string[] | undefined} getKeys
  * @property {function(string, (R | T)[], T[]): R} createGroup
  * @property {function(string, T[]): GroupOptions=} getOptions
  */
@@ -24,7 +24,7 @@
 /**
  * @template T
  * @template R
- * @typedef {Object} ItemWithGroups
+ * @typedef {object} ItemWithGroups
  * @property {T} item
  * @property {Set<Group<T, R>>} groups
  */
@@ -110,11 +110,11 @@ const smartGrouping = (items, groupConfigs) => {
 		/** @type {(T | R)[]} */
 		const results = [];
 		for (;;) {
-			/** @type {Group<T, R>} */
-			let bestGroup = undefined;
+			/** @type {Group<T, R> | 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,14 +138,14 @@ const smartGrouping = (items, groupConfigs) => {
 					}
 				}
 				const targetGroupCount = (options && options.targetGroupCount) || 4;
-				let sizeValue = force
+				const sizeValue = force
 					? items.size
 					: Math.min(
 							items.size,
 							(totalSize * 2) / targetGroupCount +
 								itemsWithGroups.size -
 								items.size
-					  );
+						);
 				if (
 					sizeValue > bestGroupSize ||
 					(force && (!bestGroupOptions || !bestGroupOptions.force))

package/lib/util/source.js

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

package/lib/validateSchema.js

@@ -119,7 +119,9 @@ const validateSchema = (schema, options, validationConfiguration) => {
 						)
 					) {
 						return `${formattedError}\nDid you mean ${
-							DID_YOU_MEAN[params.additionalProperty]
+							DID_YOU_MEAN[
+								/** @type {keyof DID_YOU_MEAN} */ (params.additionalProperty)
+							]
 						}?`;
 					}
 
@@ -129,7 +131,9 @@ const validateSchema = (schema, options, validationConfiguration) => {
 							params.additionalProperty
 						)
 					) {
-						return `${formattedError}\n${REMOVED[params.additionalProperty]}?`;
+						return `${formattedError}\n${
+							REMOVED[/** @type {keyof REMOVED} */ (params.additionalProperty)]
+						}?`;
 					}
 
 					if (!error.dataPath) {

package/lib/wasm/EnableWasmLoadingPlugin.js

@@ -12,6 +12,10 @@
 /** @type {WeakMap<Compiler, Set<WasmLoadingType>>} */
 const enabledTypes = new WeakMap();
 
+/**
+ * @param {Compiler} compiler compiler instance
+ * @returns {Set<WasmLoadingType>} enabled types
+ */
 const getEnabledTypes = compiler => {
 	let set = enabledTypes.get(compiler);
 	if (set === undefined) {
@@ -48,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

@@ -9,7 +9,19 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Compilation")} Compilation */
+
+/**
+ * @typedef {object} AsyncWasmLoadingRuntimeModuleOptions
+ * @property {function(string): string} generateLoadBinaryCode
+ * @property {boolean} supportsStreaming
+ */
+
 class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
+	/**
+	 * @param {AsyncWasmLoadingRuntimeModuleOptions} options options
+	 */
 	constructor({ generateLoadBinaryCode, supportsStreaming }) {
 		super("wasm loading", RuntimeModule.STAGE_NORMAL);
 		this.generateLoadBinaryCode = generateLoadBinaryCode;
@@ -17,10 +29,11 @@ class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { compilation, chunk } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const { outputOptions, runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.instantiateWasm;
 		const wasmModuleSrcPath = compilation.getPath(
@@ -39,38 +52,65 @@ class AsyncWasmLoadingRuntimeModule extends RuntimeModule {
 				runtime: chunk.runtime
 			}
 		);
-		return `${fn} = ${runtimeTemplate.basicFunction(
-			"exports, wasmModuleId, wasmModuleHash, importsObj",
-			[
-				`var req = ${this.generateLoadBinaryCode(wasmModuleSrcPath)};`,
-				this.supportsStreaming
-					? Template.asString([
-							"if (typeof WebAssembly.instantiateStreaming === 'function') {",
+
+		const loader = this.generateLoadBinaryCode(wasmModuleSrcPath);
+		const fallback = [
+			`.then(${runtimeTemplate.returningFunction("x.arrayBuffer()", "x")})`,
+			`.then(${runtimeTemplate.returningFunction(
+				"WebAssembly.instantiate(bytes, importsObj)",
+				"bytes"
+			)})`,
+			`.then(${runtimeTemplate.returningFunction(
+				"Object.assign(exports, res.instance.exports)",
+				"res"
+			)})`
+		];
+		const getStreaming = () => {
+			const concat = (/** @type {string[]} */ ...text) => text.join("");
+			return [
+				`var req = ${loader};`,
+				`var fallback = ${runtimeTemplate.returningFunction(
+					Template.asString(["req", Template.indent(fallback)])
+				)};`,
+				concat(
+					"return req.then(",
+					runtimeTemplate.basicFunction("res", [
+						`if (typeof WebAssembly.instantiateStreaming === "function") {`,
+						Template.indent([
+							"return WebAssembly.instantiateStreaming(res, importsObj)",
 							Template.indent([
-								"return WebAssembly.instantiateStreaming(req, importsObj)",
+								".then(",
 								Template.indent([
-									`.then(${runtimeTemplate.returningFunction(
+									`${runtimeTemplate.returningFunction(
 										"Object.assign(exports, res.instance.exports)",
 										"res"
-									)});`
-								])
-							]),
-							"}"
-					  ])
-					: "// no support for streaming compilation",
-				"return req",
-				Template.indent([
-					`.then(${runtimeTemplate.returningFunction("x.arrayBuffer()", "x")})`,
-					`.then(${runtimeTemplate.returningFunction(
-						"WebAssembly.instantiate(bytes, importsObj)",
-						"bytes"
-					)})`,
-					`.then(${runtimeTemplate.returningFunction(
-						"Object.assign(exports, res.instance.exports)",
-						"res"
-					)});`
-				])
-			]
+									)},`,
+									runtimeTemplate.basicFunction("e", [
+										`if(res.headers.get("Content-Type") !== "application/wasm") {`,
+										Template.indent([
+											'console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\\n", e);',
+											"return fallback();"
+										]),
+										"}",
+										"throw e;"
+									])
+								]),
+								");"
+							])
+						]),
+						"}",
+						"return fallback();"
+					]),
+					");"
+				)
+			];
+		};
+
+		return `${fn} = ${runtimeTemplate.basicFunction(
+			"exports, wasmModuleId, wasmModuleHash, importsObj",
+			this.supportsStreaming
+				? getStreaming()
+				: [`return ${loader}`, `${Template.indent(fallback)};`]
 		)};`;
 	}
 }

package/lib/wasm-async/AsyncWebAssemblyGenerator.js

@@ -13,7 +13,15 @@ const Generator = require("../Generator");
 
 const TYPES = new Set(["webassembly"]);
 
+/**
+ * @typedef {object} AsyncWebAssemblyGeneratorOptions
+ * @property {boolean} [mangleImports] mangle imports
+ */
+
 class AsyncWebAssemblyGenerator extends Generator {
+	/**
+	 * @param {AsyncWebAssemblyGeneratorOptions} options options
+	 */
 	constructor(options) {
 		super();
 		this.options = options;
@@ -46,7 +54,7 @@ class AsyncWebAssemblyGenerator extends Generator {
 	 * @returns {Source} generated code
 	 */
 	generate(module, generateContext) {
-		return module.originalSource();
+		return /** @type {Source} */ (module.originalSource());
 	}
 }