webpack 5.108.4 → 5.109.1

package/lib/util/identifier.js

@@ -363,9 +363,10 @@ const _parseResource = (str) => {
 
 	// Handle `\0`
 	if (firstEscape !== -1) {
-		const match =
-			/** @type {[string, string, string | undefined, string | undefined]} */
-			(/** @type {unknown} */ (PATH_QUERY_FRAGMENT_REGEXP.exec(str)));
+		const match = PATH_QUERY_FRAGMENT_REGEXP.exec(str);
+
+		// malformed escaping (e.g. a trailing lone \0) never matches; treat as path
+		if (!match) return { resource: str, path: str, query: "", fragment: "" };
 
 		return {
 			resource: str,
@@ -421,9 +422,10 @@ const _parseResourceWithoutFragment = (str) => {
 
 	// Handle `\0`
 	if (firstEscape !== -1) {
-		const match =
-			/** @type {[string, string, string | undefined]} */
-			(/** @type {unknown} */ (PATH_QUERY_REGEXP.exec(str)));
+		const match = PATH_QUERY_REGEXP.exec(str);
+
+		// malformed escaping (e.g. a trailing lone \0) never matches; treat as path
+		if (!match) return { resource: str, path: str, query: "" };
 
 		return {
 			resource: str,
@@ -530,6 +532,20 @@ const escapeHashInPathRequest = (request) => {
 	return pathPart.replace(HASH_REGEXP, "\0#") + request.slice(lastSep);
 };
 
+const LINE_SEPARATOR_REGEXP = /[\u2028\u2029]/g;
+
+/**
+ * Quotes a string as a JS string literal safe to inline in generated code.
+ * `JSON.stringify` leaves U+2028/U+2029 raw, but both terminate a JS string
+ * literal (valid in JSON, not in JS), so escape them (matches JsonGenerator).
+ * @param {string} str raw string
+ * @returns {string} a quoted, inline-safe JS string literal
+ */
+const toJsStringLiteral = (str) =>
+	JSON.stringify(str).replace(LINE_SEPARATOR_REGEXP, (c) =>
+		c === "\u2029" ? "\\u2029" : "\\u2028"
+	);
+
 module.exports.ABSOLUTE_PATH_REGEXP = ABSOLUTE_PATH_REGEXP;
 module.exports.WINDOWS_ABS_PATH_REGEXP = WINDOWS_ABS_PATH_REGEXP;
 module.exports.absolutify = absolutify;
@@ -543,3 +559,4 @@ module.exports.parseResource = makeCacheable(_parseResource);
 module.exports.parseResourceWithoutFragment = makeCacheable(
 	_parseResourceWithoutFragment
 );
+module.exports.toJsStringLiteral = toJsStringLiteral;

package/lib/util/implicitTypeLoaderFallback.js

@@ -0,0 +1,62 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const { JAVASCRIPT_MODULE_TYPE_AUTO } = require("../ModuleTypeConstants");
+const { parseResource } = require("./identifier");
+
+/** @typedef {import("../NormalModuleFactory")} NormalModuleFactory */
+
+/**
+ * When a built-in module type is only enabled implicitly (`experiments.css` /
+ * `experiments.html` resolved from their `"auto"` default), modules that reach
+ * the factory with loaders applied — an inline request or loaders injected via
+ * hooks (e.g. html-webpack-plugin's template loader) — keep the pre-existing
+ * behavior: the loader result is parsed as JavaScript, not as the built-in type.
+ * A `!=!` matchResource is an explicit re-type of the loader result and wins.
+ *
+ * TODO webpack 6: css/html are enabled unconditionally (`experiments.*: true`),
+ * so this implicit-only workaround can be removed together with the `"auto"`
+ * marker in `applyExperimentsDefaults`.
+ * @param {NormalModuleFactory} normalModuleFactory the normal module factory
+ * @param {string} pluginName name of the calling plugin, used for the tap
+ * @param {RegExp} test resource path test of the built-in default rule
+ * @param {string} type built-in module type assigned by that default rule
+ * @returns {void}
+ */
+module.exports = (normalModuleFactory, pluginName, test, type) => {
+	normalModuleFactory.hooks.createModule.tap(
+		pluginName,
+		(createData, _resolveData) => {
+			if (
+				createData.settings.type !== type ||
+				createData.loaders.length === 0 ||
+				createData.matchResource !== undefined ||
+				!test.test(parseResource(createData.resource).path)
+			) {
+				return;
+			}
+			// Drop the default rule's type-specific effects along with the type
+			createData.settings = {
+				...createData.settings,
+				type: JAVASCRIPT_MODULE_TYPE_AUTO,
+				parser: undefined,
+				generator: undefined,
+				resolve: undefined
+			};
+			createData.type = JAVASCRIPT_MODULE_TYPE_AUTO;
+			createData.parser = normalModuleFactory.getParser(
+				JAVASCRIPT_MODULE_TYPE_AUTO
+			);
+			createData.parserOptions = undefined;
+			createData.generator = normalModuleFactory.getGenerator(
+				JAVASCRIPT_MODULE_TYPE_AUTO
+			);
+			createData.generatorOptions = undefined;
+			createData.resolveOptions = undefined;
+		}
+	);
+};

package/lib/util/internalSerializables.js

@@ -5,15 +5,15 @@
 
 "use strict";
 
+// AUTO-GENERATED by tooling/generate-internal-serializables.js
 // We need to include a list of requires here
 // to allow webpack to be bundled with only static requires
 // We could use a dynamic require(`../${request}`) but this
 // would include too many modules and not every tool is able
 // to process this
 module.exports = {
-	AsyncDependenciesBlock: () => require("../AsyncDependenciesBlock"),
-	ContextModule: () => require("../ContextModule"),
 	"asset/AssetModule": () => require("../asset/AssetModule"),
+	"asset/RawDataUrlModule": () => require("../asset/RawDataUrlModule"),
 	"cache/PackFileCacheStrategy": () =>
 		require("../cache/PackFileCacheStrategy"),
 	"cache/ResolverCachePlugin": () => require("../cache/ResolverCachePlugin"),
@@ -45,20 +45,14 @@ 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": () =>
-		require("../dependencies/CommonJsRequireContextDependency"),
 	"dependencies/CommonJsExportRequireDependency": () =>
 		require("../dependencies/CommonJsExportRequireDependency"),
 	"dependencies/CommonJsExportsDependency": () =>
 		require("../dependencies/CommonJsExportsDependency"),
 	"dependencies/CommonJsFullRequireDependency": () =>
 		require("../dependencies/CommonJsFullRequireDependency"),
+	"dependencies/CommonJsRequireContextDependency": () =>
+		require("../dependencies/CommonJsRequireContextDependency"),
 	"dependencies/CommonJsRequireDependency": () =>
 		require("../dependencies/CommonJsRequireDependency"),
 	"dependencies/CommonJsSelfReferenceDependency": () =>
@@ -69,18 +63,20 @@ module.exports = {
 		require("../dependencies/ContextDependency"),
 	"dependencies/ContextElementDependency": () =>
 		require("../dependencies/ContextElementDependency"),
+	"dependencies/CreateScriptUrlDependency": () =>
+		require("../dependencies/CreateScriptUrlDependency"),
 	"dependencies/CriticalDependencyWarning": () =>
 		require("../dependencies/CriticalDependencyWarning"),
-	"dependencies/CssImportDependency": () =>
-		require("../dependencies/CssImportDependency"),
-	"dependencies/CssUrlDependency": () =>
-		require("../dependencies/CssUrlDependency"),
-	"dependencies/CssIcssImportDependency": () =>
-		require("../dependencies/CssIcssImportDependency"),
 	"dependencies/CssIcssExportDependency": () =>
 		require("../dependencies/CssIcssExportDependency"),
+	"dependencies/CssIcssImportDependency": () =>
+		require("../dependencies/CssIcssImportDependency"),
 	"dependencies/CssIcssSymbolDependency": () =>
 		require("../dependencies/CssIcssSymbolDependency"),
+	"dependencies/CssImportDependency": () =>
+		require("../dependencies/CssImportDependency"),
+	"dependencies/CssUrlDependency": () =>
+		require("../dependencies/CssUrlDependency"),
 	"dependencies/DelegatedSourceDependency": () =>
 		require("../dependencies/DelegatedSourceDependency"),
 	"dependencies/DllEntryDependency": () =>
@@ -89,12 +85,22 @@ module.exports = {
 		require("../dependencies/EntryDependency"),
 	"dependencies/ExportsInfoDependency": () =>
 		require("../dependencies/ExportsInfoDependency"),
+	"dependencies/ExternalModuleConstDependency": () =>
+		require("../dependencies/ExternalModuleInitFragmentDependency"),
+	"dependencies/ExternalModuleDependency": () =>
+		require("../dependencies/ExternalModuleDependency"),
+	"dependencies/ExternalModuleInitFragment": () =>
+		require("../dependencies/ExternalModuleInitFragment"),
+	"dependencies/ExternalModuleInitFragmentDependency": () =>
+		require("../dependencies/ExternalModuleInitFragmentDependency"),
 	"dependencies/HarmonyAcceptDependency": () =>
 		require("../dependencies/HarmonyAcceptDependency"),
 	"dependencies/HarmonyAcceptImportDependency": () =>
 		require("../dependencies/HarmonyAcceptImportDependency"),
 	"dependencies/HarmonyCompatibilityDependency": () =>
 		require("../dependencies/HarmonyCompatibilityDependency"),
+	"dependencies/HarmonyEvaluatedImportSpecifierDependency": () =>
+		require("../dependencies/HarmonyEvaluatedImportSpecifierDependency"),
 	"dependencies/HarmonyExportExpressionDependency": () =>
 		require("../dependencies/HarmonyExportExpressionDependency"),
 	"dependencies/HarmonyExportHeaderDependency": () =>
@@ -107,16 +113,14 @@ module.exports = {
 		require("../dependencies/HarmonyImportSideEffectDependency"),
 	"dependencies/HarmonyImportSpecifierDependency": () =>
 		require("../dependencies/HarmonyImportSpecifierDependency"),
-	"dependencies/HarmonyEvaluatedImportSpecifierDependency": () =>
-		require("../dependencies/HarmonyEvaluatedImportSpecifierDependency"),
+	"dependencies/HtmlEntryDependency": () =>
+		require("../dependencies/HtmlEntryDependency"),
 	"dependencies/HtmlInlineHtmlDependency": () =>
 		require("../dependencies/HtmlInlineHtmlDependency"),
 	"dependencies/HtmlInlineScriptDependency": () =>
 		require("../dependencies/HtmlInlineScriptDependency"),
 	"dependencies/HtmlInlineStyleDependency": () =>
 		require("../dependencies/HtmlInlineStyleDependency"),
-	"dependencies/HtmlEntryDependency": () =>
-		require("../dependencies/HtmlEntryDependency"),
 	"dependencies/HtmlSourceDependency": () =>
 		require("../dependencies/HtmlSourceDependency"),
 	"dependencies/ImportContextDependency": () =>
@@ -125,6 +129,16 @@ module.exports = {
 		require("../dependencies/ImportDependency"),
 	"dependencies/ImportEagerDependency": () =>
 		require("../dependencies/ImportEagerDependency"),
+	"dependencies/ImportMetaContextDependency": () =>
+		require("../dependencies/ImportMetaContextDependency"),
+	"dependencies/ImportMetaGlobDependency": () =>
+		require("../dependencies/ImportMetaGlobDependency"),
+	"dependencies/ImportMetaHotAcceptDependency": () =>
+		require("../dependencies/ImportMetaHotAcceptDependency"),
+	"dependencies/ImportMetaHotDeclineDependency": () =>
+		require("../dependencies/ImportMetaHotDeclineDependency"),
+	"dependencies/ImportMetaResolveDependency": () =>
+		require("../dependencies/ImportMetaResolveDependency"),
 	"dependencies/ImportWeakDependency": () =>
 		require("../dependencies/ImportWeakDependency"),
 	"dependencies/JsonExportsDependency": () =>
@@ -138,12 +152,8 @@ module.exports = {
 		require("../dependencies/ModuleHotAcceptDependency"),
 	"dependencies/ModuleHotDeclineDependency": () =>
 		require("../dependencies/ModuleHotDeclineDependency"),
-	"dependencies/ImportMetaHotAcceptDependency": () =>
-		require("../dependencies/ImportMetaHotAcceptDependency"),
-	"dependencies/ImportMetaHotDeclineDependency": () =>
-		require("../dependencies/ImportMetaHotDeclineDependency"),
-	"dependencies/ImportMetaContextDependency": () =>
-		require("../dependencies/ImportMetaContextDependency"),
+	"dependencies/ModuleInitFragmentDependency": () =>
+		require("../dependencies/ModuleInitFragmentDependency"),
 	"dependencies/ProvidedDependency": () =>
 		require("../dependencies/ProvidedDependency"),
 	"dependencies/PureExpressionDependency": () =>
@@ -173,11 +183,13 @@ module.exports = {
 	"dependencies/StaticExportsDependency": () =>
 		require("../dependencies/StaticExportsDependency"),
 	"dependencies/SystemPlugin": () => require("../dependencies/SystemPlugin"),
-	"dependencies/UnsupportedDependency": () =>
-		require("../dependencies/UnsupportedDependency"),
-	"dependencies/URLDependency": () => require("../dependencies/URLDependency"),
+	"dependencies/TopLevelAwaitDependency": () =>
+		require("../dependencies/TopLevelAwaitDependency"),
 	"dependencies/URLContextDependency": () =>
 		require("../dependencies/URLContextDependency"),
+	"dependencies/URLDependency": () => require("../dependencies/URLDependency"),
+	"dependencies/UnsupportedDependency": () =>
+		require("../dependencies/UnsupportedDependency"),
 	"dependencies/WebAssemblyExportImportedDependency": () =>
 		require("../dependencies/WebAssemblyExportImportedDependency"),
 	"dependencies/WebAssemblyImportDependency": () =>
@@ -186,6 +198,32 @@ module.exports = {
 		require("../dependencies/WebpackIsIncludedDependency"),
 	"dependencies/WorkerDependency": () =>
 		require("../dependencies/WorkerDependency"),
+	"dependencies/WorkletDependency": () =>
+		require("../dependencies/WorkletDependency"),
+	"dll/DelegatedModule": () => require("../dll/DelegatedModule"),
+	"dll/DllModule": () => require("../dll/DllModule"),
+	"errors/CommentCompilationWarning": () =>
+		require("../errors/CommentCompilationWarning"),
+	"errors/EnvironmentNotSupportAsyncWarning": () =>
+		require("../errors/EnvironmentNotSupportAsyncWarning"),
+	"errors/HookWebpackError": () => require("../errors/HookWebpackError"),
+	"errors/InvalidDependenciesModuleWarning": () =>
+		require("../errors/InvalidDependenciesModuleWarning"),
+	"errors/JSONParseError": () => require("../errors/JSONParseError"),
+	"errors/ModuleBuildError": () => require("../errors/ModuleBuildError"),
+	"errors/ModuleDependencyWarning": () =>
+		require("../errors/ModuleDependencyWarning"),
+	"errors/ModuleError": () => require("../errors/ModuleError"),
+	"errors/ModuleParseError": () => require("../errors/ModuleParseError"),
+	"errors/ModuleWarning": () => require("../errors/ModuleWarning"),
+	"errors/NodeStuffInWebError": () => require("../errors/NodeStuffInWebError"),
+	"errors/NonErrorEmittedError": () =>
+		require("../errors/NonErrorEmittedError"),
+	"errors/UnhandledSchemeError": () =>
+		require("../errors/UnhandledSchemeError"),
+	"errors/UnsupportedFeatureWarning": () =>
+		require("../errors/UnsupportedFeatureWarning"),
+	"errors/WebpackError": () => require("../errors/WebpackError"),
 	"html/HtmlModule": () => require("../html/HtmlModule"),
 	"javascript/JavascriptModule": () =>
 		require("../javascript/JavascriptModule"),
@@ -193,55 +231,34 @@ module.exports = {
 	"json/JsonModule": () => require("../json/JsonModule"),
 	"optimize/ConcatenatedModule": () =>
 		require("../optimize/ConcatenatedModule"),
+	"optimize/InlineExports": () => require("../optimize/InlineExports"),
+	"sharing/ConsumeSharedFallbackDependency": () =>
+		require("../sharing/ConsumeSharedFallbackDependency"),
+	"sharing/ConsumeSharedModule": () =>
+		require("../sharing/ConsumeSharedModule"),
+	"sharing/ProvideForSharedDependency": () =>
+		require("../sharing/ProvideForSharedDependency"),
+	"sharing/ProvideSharedDependency": () =>
+		require("../sharing/ProvideSharedDependency"),
+	"sharing/ProvideSharedModule": () =>
+		require("../sharing/ProvideSharedModule"),
+	"util/LazySet": () => require("../util/LazySet"),
+	"util/registerExternalSerializer": () => {
+		// already registered
+	},
 	"wasm-async/AsyncWasmModule": () => require("../wasm-async/AsyncWasmModule"),
 	"wasm-sync/SyncWasmModule": () => require("../wasm-sync/SyncWasmModule"),
-
+	AsyncDependenciesBlock: () => require("../AsyncDependenciesBlock"),
+	ContextModule: () => require("../ContextModule"),
+	CssModule: () => require("../css/CssModule"),
 	DependenciesBlock: () => require("../DependenciesBlock"),
 	ExternalModule: () => require("../ExternalModule"),
 	FileSystemInfo: () => require("../FileSystemInfo"),
 	InitFragment: () => require("../InitFragment"),
+	Module: () => require("../Module"),
 	ModuleGraph: () => require("../ModuleGraph"),
+	NodeStuffInWebError: () => require("../errors/NodeStuffInWebError"),
 	NormalModule: () => require("../NormalModule"),
-	CssModule: () => require("../css/CssModule"),
 	RawDataUrlModule: () => require("../asset/RawDataUrlModule"),
-	RawModule: () => require("../RawModule"),
-	"sharing/ConsumeSharedModule": () =>
-		require("../sharing/ConsumeSharedModule"),
-	"sharing/ConsumeSharedFallbackDependency": () =>
-		require("../sharing/ConsumeSharedFallbackDependency"),
-	"sharing/ProvideSharedModule": () =>
-		require("../sharing/ProvideSharedModule"),
-	"sharing/ProvideSharedDependency": () =>
-		require("../sharing/ProvideSharedDependency"),
-	"sharing/ProvideForSharedDependency": () =>
-		require("../sharing/ProvideForSharedDependency"),
-
-	"errors/WebpackError": () => require("../errors/WebpackError"),
-	"errors/InvalidDependenciesModuleWarning": () =>
-		require("../errors/InvalidDependenciesModuleWarning"),
-	"errors/Module": () => require("../Module"),
-	"errors/ModuleParseError": () => require("../errors/ModuleParseError"),
-	"errors/ModuleWarning": () => require("../errors/ModuleWarning"),
-	"errors/ModuleBuildError": () => require("../errors/ModuleBuildError"),
-	"errors/ModuleDependencyWarning": () =>
-		require("../errors/ModuleDependencyWarning"),
-	"errors/ModuleError": () => require("../errors/ModuleError"),
-	"errors/UnhandledSchemeError": () =>
-		require("../errors/UnhandledSchemeError"),
-	"errors/UnsupportedFeatureWarning": () =>
-		require("../errors/UnsupportedFeatureWarning"),
-	"errors/EnvironmentNotSupportAsyncWarning": () =>
-		require("../errors/EnvironmentNotSupportAsyncWarning"),
-	"errors/CommentCompilationWarning": () =>
-		require("../errors/CommentCompilationWarning"),
-	"errors/NodeStuffInWebError": () => require("../errors/NodeStuffInWebError"),
-	"errors/JSONParseError": () => require("../errors/JSONParseError"),
-
-	"dll/DelegatedModule": () => require("../dll/DelegatedModule"),
-	"dll/DllModule": () => require("../dll/DllModule"),
-
-	"util/LazySet": () => require("../util/LazySet"),
-	"util/registerExternalSerializer": () => {
-		// already registered
-	}
+	RawModule: () => require("../RawModule")
 };

package/lib/util/magicComment.js

@@ -5,54 +5,60 @@
 
 "use strict";
 
+const binarySearchBounds = require("./binarySearchBounds");
 const memoize = require("./memoize");
 
 const getVm = memoize(() => require("vm"));
 
-module.exports.CompilerHintNotationRegExp = Object.freeze({
+const CompilerHintNotationRegExp = Object.freeze({
 	Pure: /^\s*(?:#|@)__PURE__\s*$/,
 	NoSideEffects: /^\s*[#@]__NO_SIDE_EFFECTS__\s*$/
 });
 
+// Whole-comment `webpackXxx: <bool|number|null>` pair — parsed without `vm`.
+const MAGIC_COMMENT_FAST_PATH =
+	/^\s*(webpack[A-Z][A-Za-z]+)\s*:\s*(true|false|null|-?\d+(?:\.\d+)?)\s*$/;
+
+const webpackCommentRegExp = new RegExp(/(^|\W)webpack[A-Z][A-Za-z]+:/);
+
+/** @type {Readonly<{ options: null, errors: null }>} */
+const EMPTY_COMMENT_OPTIONS = Object.freeze({
+	options: null,
+	errors: null
+});
+
 /**
- * regexp to match at least one "magic comment"
  * @returns {import("vm").Context} magic comment context
  */
-module.exports.createMagicCommentContext = () =>
+const createMagicCommentContext = () =>
 	getVm().createContext(undefined, {
 		name: "Webpack Magic Comment Parser",
 		codeGeneration: { strings: false, wasm: false }
 	});
 
-// Whole-comment `webpackXxx: <bool|number|null>` pair — parsed without `vm`.
-const MAGIC_COMMENT_FAST_PATH =
-	/^\s*(webpack[A-Z][A-Za-z]+)\s*:\s*(true|false|null|-?\d+(?:\.\d+)?)\s*$/;
-
 /**
- * Parse one magic comment's text into its options object. Values are detached
+ * Parse one magic comment's text and merge into `options`. Values are detached
  * from the vm context (RegExps recreated, other objects JSON-cloned). Throws
  * when the comment body fails to evaluate.
+ * @param {Record<string, EXPECTED_ANY>} options target to merge into
  * @param {string} value comment text (should already match `webpackCommentRegExp`)
  * @param {import("vm").Context} context context from `createMagicCommentContext`
- * @returns {Record<string, EXPECTED_ANY>} parsed options
+ * @returns {void}
  */
-module.exports.parseMagicComment = (value, context) => {
+const assignMagicCommentOptions = (options, value, context) => {
 	const fast = MAGIC_COMMENT_FAST_PATH.exec(value);
 	if (fast !== null) {
 		const raw = fast[2];
-		return {
-			[fast[1]]:
-				raw === "true"
-					? true
-					: raw === "false"
-						? false
-						: raw === "null"
-							? null
-							: Number(raw)
-		};
+		options[fast[1]] =
+			raw === "true"
+				? true
+				: raw === "false"
+					? false
+					: raw === "null"
+						? null
+						: Number(raw);
+		return;
 	}
-	/** @type {Record<string, EXPECTED_ANY>} */
-	const options = {};
 	for (let [key, val] of Object.entries(
 		getVm().runInContext(`(function(){return {${value}};})()`, context)
 	)) {
@@ -64,8 +70,98 @@ module.exports.parseMagicComment = (value, context) => {
 		}
 		options[key] = val;
 	}
+};
+
+/**
+ * Parse one magic comment's text into its options object.
+ * @param {string} value comment text (should already match `webpackCommentRegExp`)
+ * @param {import("vm").Context} context context from `createMagicCommentContext`
+ * @returns {Record<string, EXPECTED_ANY>} parsed options
+ */
+const parseMagicComment = (value, context) => {
+	/** @type {Record<string, EXPECTED_ANY>} */
+	const options = {};
+	assignMagicCommentOptions(options, value, context);
 	return options;
 };
-module.exports.webpackCommentRegExp = new RegExp(
-	/(^|\W)webpack[A-Z][A-Za-z]+:/
-);
+
+/**
+ * `binarySearchBounds` comparator for `getCommentsInRange`.
+ * @param {{ range: [number, number] }} comment comment
+ * @param {number} needle needle (byte offset)
+ * @returns {number} comparison
+ */
+const compareCommentStart = (comment, needle) => comment.range[0] - needle;
+
+/**
+ * Comments fully inside `range`, via binary search over source-ordered `comments`.
+ * @template {object} TComment
+ * @param {(TComment & { range: [number, number] })[]} comments source-ordered comments
+ * @param {[number, number]} range range
+ * @returns {TComment[]} comments in the range
+ */
+const getCommentsInRange = (comments, range) => {
+	if (comments.length === 0) return [];
+	const [start, end] = range;
+	let idx = binarySearchBounds.ge(comments, start, compareCommentStart);
+	/** @type {TComment[]} */
+	const commentsInRange = [];
+	while (comments[idx] && comments[idx].range[1] <= end) {
+		commentsInRange.push(comments[idx]);
+		idx++;
+	}
+	return commentsInRange;
+};
+
+/**
+ * Merge webpack magic-comment options from `comments` in source order.
+ * @template {object} TComment
+ * @param {(TComment & { value: string })[]} comments comments fully inside the range
+ * @param {import("vm").Context} context context from `createMagicCommentContext`
+ * @returns {{ options: Record<string, EXPECTED_ANY> | null, errors: (Error & { comment: TComment })[] | null }} result
+ */
+const parseMagicCommentOptions = (comments, context) => {
+	if (comments.length === 0) {
+		return /** @type {{ options: Record<string, EXPECTED_ANY> | null, errors: (Error & { comment: TComment })[] | null }} */ (
+			EMPTY_COMMENT_OPTIONS
+		);
+	}
+	/** @type {Record<string, EXPECTED_ANY>} */
+	const options = {};
+	/** @type {(Error & { comment: TComment })[]} */
+	const errors = [];
+	for (const comment of comments) {
+		const { value } = comment;
+		if (value && webpackCommentRegExp.test(value)) {
+			try {
+				assignMagicCommentOptions(options, value, context);
+			} catch (err) {
+				const newErr = new Error(String(/** @type {Error} */ (err).message));
+				newErr.stack = String(/** @type {Error} */ (err).stack);
+				Object.assign(newErr, { comment });
+				errors.push(/** @type {Error & { comment: TComment }} */ (newErr));
+			}
+		}
+	}
+	return { options, errors };
+};
+
+/**
+ * Merge webpack magic-comment options from comments inside `range`.
+ * @template {object} TComment
+ * @param {(TComment & { range: [number, number], value: string })[]} comments source-ordered comments
+ * @param {[number, number]} range range
+ * @param {import("vm").Context} context context from `createMagicCommentContext`
+ * @returns {{ options: Record<string, EXPECTED_ANY> | null, errors: (Error & { comment: TComment })[] | null }} result
+ */
+const parseCommentOptionsInRange = (comments, range, context) =>
+	parseMagicCommentOptions(getCommentsInRange(comments, range), context);
+
+module.exports = {
+	CompilerHintNotationRegExp,
+	createMagicCommentContext,
+	getCommentsInRange,
+	parseCommentOptionsInRange,
+	parseMagicComment,
+	webpackCommentRegExp
+};

package/lib/util/numberHash.js

@@ -83,8 +83,8 @@ function fnv1a64(str) {
  * @example
  * ```js
  * const numberHash = require("webpack/lib/util/numberHash");
- * numberHash("hello", 1000); // 73
- * numberHash("hello world"); // 72
+ * numberHash("hello", 1000); // 723
+ * numberHash("hello world", 1000); // 159
  * ```
  */
 module.exports = (str, range) => {

package/lib/wasm-async/AsyncWasmCompileRuntimeModule.js

@@ -53,13 +53,15 @@ class AsyncWasmCompileRuntimeModule extends RuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const chunk = /** @type {Chunk} */ (this.chunk);
 		const { outputOptions, runtimeTemplate } = compilation;
+		// Opt-out fallback to non-streaming when the server serves wasm with a wrong MIME type.
+		const streamingFallback = outputOptions.wasmStreamingFallback;
 		const fn = RuntimeGlobals.compileWasm;
 		const wasmModuleSrcPath = compilation.getPath(
 			JSON.stringify(outputOptions.webassemblyModuleFilename),
 			{
 				hash: `" + ${RuntimeGlobals.getFullHash}() + "`,
 				hashWithLength: (length) =>
-					`" + ${RuntimeGlobals.getFullHash}}().slice(0, ${length}) + "`,
+					`" + ${RuntimeGlobals.getFullHash}().slice(0, ${length}) + "`,
 				module: {
 					id: '" + wasmModuleId + "',
 					hash: '" + wasmModuleHash + "',
@@ -105,24 +107,28 @@ class AsyncWasmCompileRuntimeModule extends RuntimeModule {
 								? this.generateBeforeCompileStreaming()
 								: ""
 						),
-						Template.indent([
-							"return WebAssembly.compileStreaming(res)",
-							Template.indent([
-								".catch(",
-								Template.indent([
-									runtimeTemplate.basicFunction("e", [
-										'if(res.headers.get("Content-Type") !== "application/wasm") {',
+						Template.indent(
+							streamingFallback
+								? [
+										"return WebAssembly.compileStreaming(res)",
 										Template.indent([
-											'console.warn("`WebAssembly.compileStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.compile` which is slower. Original error:\\n", e);',
-											"return fallback();"
-										]),
-										"}",
-										"throw e;"
-									])
-								]),
-								");"
-							])
-						]),
+											".catch(",
+											Template.indent([
+												runtimeTemplate.basicFunction("e", [
+													'if(res.headers.get("Content-Type") !== "application/wasm") {',
+													Template.indent([
+														'console.warn("`WebAssembly.compileStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.compile` which is slower. Original error:\\n", e);',
+														"return fallback();"
+													]),
+													"}",
+													"throw e;"
+												])
+											]),
+											");"
+										])
+									]
+								: ["return WebAssembly.compileStreaming(res);"]
+						),
 						"}",
 						"return fallback();"
 					]),