webpack 5.89.0 → 5.90.1

package/lib/util/internalSerializables.js

@@ -45,6 +45,10 @@ module.exports = {
 		require("../dependencies/AMDRequireItemDependency"),
 	"dependencies/CachedConstDependency": () =>
 		require("../dependencies/CachedConstDependency"),
+	"dependencies/ExternalModuleDependency": () =>
+		require("../dependencies/ExternalModuleDependency"),
+	"dependencies/ExternalModuleInitFragment": () =>
+		require("../dependencies/ExternalModuleInitFragment"),
 	"dependencies/CreateScriptUrlDependency": () =>
 		require("../dependencies/CreateScriptUrlDependency"),
 	"dependencies/CommonJsRequireContextDependency": () =>
@@ -206,6 +210,8 @@ module.exports = {
 	"util/LazySet": () => require("../util/LazySet"),
 	UnhandledSchemeError: () => require("../UnhandledSchemeError"),
 	NodeStuffInWebError: () => require("../NodeStuffInWebError"),
+	EnvironmentNotSupportAsyncWarning: () =>
+		require("../EnvironmentNotSupportAsyncWarning"),
 	WebpackError: () => require("../WebpackError"),
 
 	"util/registerExternalSerializer": () => {

package/lib/util/numberHash.js

@@ -6,36 +6,80 @@
 "use strict";
 
 /**
- * The maximum safe integer value for 32-bit integers.
+ * Threshold for switching from 32-bit to 64-bit hashing. This is selected to ensure that the bias towards lower modulo results when using 32-bit hashing is <0.5%.
  * @type {number}
  */
-const SAFE_LIMIT = 0x80000000;
+const FNV_64_THRESHOLD = 1 << 24;
 
 /**
- * The maximum safe integer value for 32-bit integers minus one. This is used
- * in the algorithm to ensure that intermediate hash values do not exceed the
- * 32-bit integer limit.
+ * The FNV-1a offset basis for 32-bit hash values.
  * @type {number}
  */
-const SAFE_PART = SAFE_LIMIT - 1;
-
+const FNV_OFFSET_32 = 2166136261;
 /**
- * The number of 32-bit integers used to store intermediate hash values.
+ * The FNV-1a prime for 32-bit hash values.
  * @type {number}
  */
-const COUNT = 4;
+const FNV_PRIME_32 = 16777619;
+/**
+ * The mask for a positive 32-bit signed integer.
+ * @type {number}
+ */
+const MASK_31 = 0x7fffffff;
+
+/**
+ * The FNV-1a offset basis for 64-bit hash values.
+ * @type {bigint}
+ */
+const FNV_OFFSET_64 = BigInt("0xCBF29CE484222325");
+/**
+ * The FNV-1a prime for 64-bit hash values.
+ * @type {bigint}
+ */
+const FNV_PRIME_64 = BigInt("0x100000001B3");
 
 /**
- * An array used to store intermediate hash values during the calculation.
- * @type {number[]}
+ * Computes a 32-bit FNV-1a hash value for the given string.
+ * See https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+ * @param {string} str The input string to hash
+ * @returns {number} - The computed hash value.
  */
-const arr = [0, 0, 0, 0, 0];
+function fnv1a32(str) {
+	let hash = FNV_OFFSET_32;
+	for (let i = 0, len = str.length; i < len; i++) {
+		let code = str.charCodeAt(i);
+		if (code > 0xff) {
+			hash ^= code & 0xff;
+			hash = (hash * FNV_PRIME_32) | 0;
+			code >>= 8;
+		}
+		hash ^= code;
+		hash = (hash * FNV_PRIME_32) | 0;
+	}
+	// Force the result to be positive
+	return hash & MASK_31;
+}
 
 /**
- * An array of prime numbers used in the hash calculation.
- * @type {number[]}
+ * Computes a 64-bit FNV-1a hash value for the given string.
+ * See https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+ * @param {string} str The input string to hash
+ * @returns {bigint} - The computed hash value.
  */
-const primes = [3, 7, 17, 19];
+function fnv1a64(str) {
+	let hash = FNV_OFFSET_64;
+	for (let i = 0, len = str.length; i < len; i++) {
+		let code = str.charCodeAt(i);
+		if (code > 0xff) {
+			hash ^= BigInt(code & 0xff);
+			hash = BigInt.asUintN(64, hash * FNV_PRIME_64);
+			code >>= 8;
+		}
+		hash ^= BigInt(code);
+		hash = BigInt.asUintN(64, hash * FNV_PRIME_64);
+	}
+	return hash;
+}
 
 /**
  * Computes a hash value for the given string and range. This hashing algorithm is a modified
@@ -53,47 +97,15 @@ const primes = [3, 7, 17, 19];
  *
  * ```js
  * const numberHash = require("webpack/lib/util/numberHash");
- * numberHash("hello", 1000); // 57
- * numberHash("hello world"); // 990
+ * numberHash("hello", 1000); // 73
+ * numberHash("hello world"); // 72
  * ```
  *
  */
 module.exports = (str, range) => {
-	/**
-	 * Initialize the array with zeros before it is used
-	 * to store intermediate hash values.
-	 */
-	arr.fill(0);
-	// For each character in the string
-	for (let i = 0; i < str.length; i++) {
-		// Get the character code.
-		const c = str.charCodeAt(i);
-
-		// For each 32-bit integer used to store the hash value
-		// add the character code to the current hash value and multiply by the prime number and
-		// add the previous 32-bit integer.
-		arr[0] = (arr[0] + c * primes[0] + arr[3]) & SAFE_PART;
-		arr[1] = (arr[1] + c * primes[1] + arr[0]) & SAFE_PART;
-		arr[2] = (arr[2] + c * primes[2] + arr[1]) & SAFE_PART;
-		arr[3] = (arr[3] + c * primes[3] + arr[2]) & SAFE_PART;
-
-		// For each 32-bit integer used to store the hash value
-		// XOR the current hash value with the value of the next 32-bit integer.
-		arr[0] = arr[0] ^ (arr[arr[0] % COUNT] >> 1);
-		arr[1] = arr[1] ^ (arr[arr[1] % COUNT] >> 1);
-		arr[2] = arr[2] ^ (arr[arr[2] % COUNT] >> 1);
-		arr[3] = arr[3] ^ (arr[arr[3] % COUNT] >> 1);
-	}
-
-	if (range <= SAFE_PART) {
-		return (arr[0] + arr[1] + arr[2] + arr[3]) % range;
+	if (range < FNV_64_THRESHOLD) {
+		return fnv1a32(str) % range;
 	} else {
-		// Calculate the range extension.
-		const rangeExt = Math.floor(range / SAFE_LIMIT);
-
-		const sum1 = (arr[0] + arr[2]) & SAFE_PART;
-		const sum2 = (arr[0] + arr[2]) % rangeExt;
-
-		return (sum2 * SAFE_LIMIT + sum1) % range;
+		return Number(fnv1a64(str) % BigInt(range));
 	}
 };

package/lib/util/runtime.js

@@ -57,7 +57,7 @@ exports.getEntryRuntime = (compilation, name, options) => {
  * @param {boolean} deterministicOrder enforce a deterministic order
  * @returns {void}
  */
-exports.forEachRuntime = (runtime, fn, deterministicOrder = false) => {
+const forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 	if (runtime === undefined) {
 		fn(undefined);
 	} else if (typeof runtime === "string") {
@@ -69,6 +69,7 @@ exports.forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 		}
 	}
 };
+exports.forEachRuntime = forEachRuntime;
 
 /**
  * @template T
@@ -228,6 +229,22 @@ const mergeRuntime = (a, b) => {
 };
 exports.mergeRuntime = mergeRuntime;
 
+/**
+ * @param {RuntimeSpec[]} runtimes first
+ * @param {RuntimeSpec} runtime second
+ * @returns {RuntimeSpec} merged
+ */
+exports.deepMergeRuntime = (runtimes, runtime) => {
+	if (!Array.isArray(runtimes)) {
+		return runtime;
+	}
+	let merged = runtime;
+	for (const r of runtimes) {
+		merged = mergeRuntime(runtime, r);
+	}
+	return merged;
+};
+
 /**
  * @param {RuntimeCondition} a first
  * @param {RuntimeCondition} b second

package/lib/util/semver.js

@@ -232,16 +232,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];
@@ -249,9 +248,9 @@ 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 {
@@ -264,10 +263,10 @@ const rangeToString = range => {
 				item === 0
 					? "not(" + pop() + ")"
 					: item === 1
-					? "(" + pop() + " || " + pop() + ")"
-					: item === 2
-					? stack.pop() + " " + stack.pop()
-					: rangeToString(item)
+						? "(" + pop() + " || " + pop() + ")"
+						: item === 2
+							? stack.pop() + " " + stack.pop()
+							: rangeToString(item)
 			);
 		}
 		return pop();
@@ -416,10 +415,10 @@ 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();
@@ -452,11 +451,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/smartGrouping.js

@@ -145,7 +145,7 @@ const smartGrouping = (items, groupConfigs) => {
 							(totalSize * 2) / targetGroupCount +
 								itemsWithGroups.size -
 								items.size
-					  );
+						);
 				if (
 					sizeValue > bestGroupSize ||
 					(force && (!bestGroupOptions || !bestGroupOptions.force))

package/lib/wasm-async/AsyncWasmLoadingRuntimeModule.js

@@ -52,38 +52,63 @@ 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/AsyncWebAssemblyJavascriptGenerator.js

@@ -156,7 +156,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 						"{",
 						Template.indent(importObjRequestItems.join(",\n")),
 						"}"
-				  ])
+					])
 				: undefined;
 
 		const instantiateCall =
@@ -194,7 +194,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 								"} catch(e) { __webpack_async_result__(e); }"
 							]
 						)}, 1);`
-				  ])
+					])
 				: `${importsCode}${importsCompatCode}module.exports = ${instantiateCall};`
 		);
 

package/lib/wasm-async/AsyncWebAssemblyParser.js

@@ -7,6 +7,7 @@
 
 const t = require("@webassemblyjs/ast");
 const { decode } = require("@webassemblyjs/wasm-parser");
+const EnvironmentNotSupportAsyncWarning = require("../EnvironmentNotSupportAsyncWarning");
 const Parser = require("../Parser");
 const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
@@ -50,6 +51,11 @@ class WebAssemblyParser extends Parser {
 		const BuildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
 		BuildMeta.exportsType = "namespace";
 		BuildMeta.async = true;
+		EnvironmentNotSupportAsyncWarning.check(
+			state.module,
+			state.compilation.runtimeTemplate,
+			"asyncWebAssembly"
+		);
 
 		// parse it
 		const program = decode(source, decoderOpts);

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -354,7 +354,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 											"importObject"
 										)});`
 									])
-							  ])
+								])
 							: Template.asString([
 									"if(importObject && typeof importObject.then === 'function') {",
 									Template.indent([
@@ -372,7 +372,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 										]),
 										"});"
 									])
-							  ]),
+								]),
 						"} else {",
 						Template.indent([
 							"var bytesPromise = req.then(function(x) { return x.arrayBuffer(); });",

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -200,8 +200,8 @@ class WebAssemblyJavascriptGenerator extends Generator {
 				copyAllExports
 					? `${module.moduleArgument}.exports = wasmExports;`
 					: "for(var name in wasmExports) " +
-					  `if(name) ` +
-					  `${module.exportsArgument}[name] = wasmExports[name];`,
+						`if(name) ` +
+						`${module.exportsArgument}[name] = wasmExports[name];`,
 				"// exec imports from WebAssembly module (for esm order)",
 				importsCode,
 				"",

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -209,16 +209,16 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 											"}"
 										]),
 										"}"
-								  ])
+									])
 								: Template.indent(["installedChunks[chunkId] = 0;"])
 						)};`
-				  ])
+					])
 				: "// no chunk on demand loading",
 			"",
 			withPrefetch && hasJsMatcher !== false
 				? `${
 						RuntimeGlobals.prefetchChunkHandlers
-				  }.j = ${runtimeTemplate.basicFunction("chunkId", [
+					}.j = ${runtimeTemplate.basicFunction("chunkId", [
 						`if((!${
 							RuntimeGlobals.hasOwnProperty
 						}(installedChunks, chunkId) || installedChunks[chunkId] === undefined) && ${
@@ -232,7 +232,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 									crossOriginLoading
 										? `link.crossOrigin = ${JSON.stringify(
 												crossOriginLoading
-										  )};`
+											)};`
 										: "",
 									`if (${RuntimeGlobals.scriptNonce}) {`,
 									Template.indent(
@@ -248,13 +248,13 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							"document.head.appendChild(link);"
 						]),
 						"}"
-				  ])};`
+					])};`
 				: "// no prefetching",
 			"",
 			withPreload && hasJsMatcher !== false
 				? `${
 						RuntimeGlobals.preloadChunkHandlers
-				  }.j = ${runtimeTemplate.basicFunction("chunkId", [
+					}.j = ${runtimeTemplate.basicFunction("chunkId", [
 						`if((!${
 							RuntimeGlobals.hasOwnProperty
 						}(installedChunks, chunkId) || installedChunks[chunkId] === undefined) && ${
@@ -290,7 +290,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 														)};`
 													),
 													"}"
-											  ])
+												])
 										: ""
 								]),
 								chunk
@@ -298,7 +298,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							"document.head.appendChild(link);"
 						]),
 						"}"
-				  ])};`
+					])};`
 				: "// no preloaded",
 			"",
 			withHmr
@@ -383,7 +383,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 								/\$hmrInvalidateModuleHandlers\$/g,
 								RuntimeGlobals.hmrInvalidateModuleHandlers
 							)
-				  ])
+					])
 				: "// no HMR",
 			"",
 			withHmrManifest
@@ -400,16 +400,16 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 								"return response.json();"
 							])});`
 						])};`
-				  ])
+					])
 				: "// no HMR manifest",
 			"",
 			withOnChunkLoad
 				? `${
 						RuntimeGlobals.onChunksLoaded
-				  }.j = ${runtimeTemplate.returningFunction(
+					}.j = ${runtimeTemplate.returningFunction(
 						"installedChunks[chunkId] === 0",
 						"chunkId"
-				  )};`
+					)};`
 				: "// no on chunks loaded",
 			"",
 			withCallback || withLoading
@@ -461,7 +461,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 						`var chunkLoadingGlobal = ${chunkLoadingGlobalExpr} = ${chunkLoadingGlobalExpr} || [];`,
 						"chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));",
 						"chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal));"
-				  ])
+					])
 				: "// no jsonp function"
 		]);
 	}

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -128,7 +128,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 							Template.indent("installedChunks[chunkIds.pop()] = 1;"),
 							"parentChunkLoadingFunction(data);"
 						])};`
-				  ])
+					])
 				: "// no chunk install function needed",
 			withLoading
 				? Template.asString([
@@ -152,14 +152,14 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 											"}"
 										]),
 										"}"
-								  ]
+									]
 								: "installedChunks[chunkId] = 1;"
 						)};`,
 						"",
 						`var chunkLoadingGlobal = ${chunkLoadingGlobalExpr} = ${chunkLoadingGlobalExpr} || [];`,
 						"var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);",
 						"chunkLoadingGlobal.push = installChunk;"
-				  ])
+					])
 				: "// no chunk loading",
 			"",
 			withHmr
@@ -196,7 +196,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 						Template.getFunctionContent(
 							require("../hmr/JavascriptHotModuleReplacement.runtime.js")
 						)
-							.replace(/\$key\$/g, "importScrips")
+							.replace(/\$key\$/g, "importScripts")
 							.replace(/\$installedChunks\$/g, "installedChunks")
 							.replace(/\$loadUpdateChunk\$/g, "loadUpdateChunk")
 							.replace(/\$moduleCache\$/g, RuntimeGlobals.moduleCache)
@@ -215,7 +215,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 								/\$hmrInvalidateModuleHandlers\$/g,
 								RuntimeGlobals.hmrInvalidateModuleHandlers
 							)
-				  ])
+					])
 				: "// no HMR",
 			"",
 			withHmrManifest
@@ -232,7 +232,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 								"return response.json();"
 							])});`
 						])};`
-				  ])
+					])
 				: "// no HMR manifest"
 		]);
 	}