webpack 5.97.1 → 5.99.0

package/lib/util/registerExternalSerializer.js

@@ -7,7 +7,7 @@
 
 const { register } = require("./serialization");
 
-const Position = /** @type {TODO} */ (require("acorn")).Position;
+const Position = require("acorn").Position;
 const SourceLocation = require("acorn").SourceLocation;
 const ValidationError = require("schema-utils").ValidationError;
 const {
@@ -23,10 +23,8 @@ const {
 /** @typedef {import("acorn").Position} Position */
 /** @typedef {import("../Dependency").RealDependencyLocation} RealDependencyLocation */
 /** @typedef {import("../Dependency").SourcePosition} SourcePosition */
-/** @typedef {import("./serialization").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization").ObjectSerializerContext} ObjectSerializerContext */
-
-/** @typedef {ObjectSerializerContext & { writeLazy?: (value: any) => void }} WebpackObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 const CURRENT_MODULE = "webpack/lib/util/registerExternalSerializer";
 
@@ -37,7 +35,7 @@ register(
 	new (class CachedSourceSerializer {
 		/**
 		 * @param {CachedSource} source the cached source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(source, { write, writeLazy }) {
@@ -68,7 +66,7 @@ register(
 	new (class RawSourceSerializer {
 		/**
 		 * @param {RawSource} source the raw source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(source, { write }) {
@@ -95,7 +93,7 @@ register(
 	new (class ConcatSourceSerializer {
 		/**
 		 * @param {ConcatSource} source the concat source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(source, { write }) {
@@ -121,7 +119,7 @@ register(
 	new (class PrefixSourceSerializer {
 		/**
 		 * @param {PrefixSource} source the prefix source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(source, { write }) {
@@ -146,7 +144,7 @@ register(
 	new (class ReplaceSourceSerializer {
 		/**
 		 * @param {ReplaceSource} source the replace source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(source, { write }) {
@@ -196,7 +194,7 @@ register(
 	new (class OriginalSourceSerializer {
 		/**
 		 * @param {OriginalSource} source the original source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(source, { write }) {
@@ -223,7 +221,7 @@ register(
 	new (class SourceLocationSerializer {
 		/**
 		 * @param {SourceLocation} loc the location to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(loc, { write }) {
@@ -259,7 +257,7 @@ register(
 	new (class PositionSerializer {
 		/**
 		 * @param {Position} pos the position to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(pos, { write }) {
@@ -287,7 +285,7 @@ register(
 	new (class SourceMapSourceSerializer {
 		/**
 		 * @param {SourceMapSource} source the source map source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(source, { write }) {
@@ -310,10 +308,9 @@ register(
 	CURRENT_MODULE,
 	"schema-utils/ValidationError",
 	new (class ValidationErrorSerializer {
-		// TODO error should be ValidationError, but this fails the type checks
 		/**
-		 * @param {TODO} error the source map source to be serialized
-		 * @param {WebpackObjectSerializerContext} context context
+		 * @param {ValidationError} error the source map source to be serialized
+		 * @param {ObjectSerializerContext} context context
 		 * @returns {void}
 		 */
 		serialize(error, { write }) {
@@ -328,7 +325,7 @@ register(
 
 		/**
 		 * @param {ObjectDeserializerContext} context context
-		 * @returns {TODO} error
+		 * @returns {ValidationError} error
 		 */
 		deserialize({ read }) {
 			return new ValidationError(read(), read(), read());

package/lib/util/removeBOM.js

@@ -0,0 +1,25 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+/**
+ * @param {string | Buffer} strOrBuffer string or buffer
+ * @returns {string | Buffer} result without BOM
+ */
+module.exports = strOrBuffer => {
+	if (typeof strOrBuffer === "string" && strOrBuffer.charCodeAt(0) === 0xfeff) {
+		return strOrBuffer.substr(1);
+	} else if (
+		Buffer.isBuffer(strOrBuffer) &&
+		strOrBuffer[0] === 0xef &&
+		strOrBuffer[1] === 0xbb &&
+		strOrBuffer[2] === 0xbf
+	) {
+		return strOrBuffer.subarray(3);
+	}
+
+	return strOrBuffer;
+};

package/lib/util/runtime.js

@@ -52,7 +52,7 @@ module.exports.getEntryRuntime = (compilation, name, options) => {
 
 /**
  * @param {RuntimeSpec} runtime runtime
- * @param {function(string | undefined): void} fn functor
+ * @param {(runtime: string | undefined) => void} fn functor
  * @param {boolean} deterministicOrder enforce a deterministic order
  * @returns {void}
  */
@@ -394,7 +394,7 @@ module.exports.subtractRuntimeCondition = (a, b, runtime) => {
 
 /**
  * @param {RuntimeSpec} runtime runtime
- * @param {function(RuntimeSpec=): boolean} filter filter function
+ * @param {(runtime?: RuntimeSpec) => boolean} filter filter function
  * @returns {boolean | RuntimeSpec} true/false if filter is constant for all runtimes, otherwise runtimes that are active
  */
 module.exports.filterRuntime = (runtime, filter) => {
@@ -424,24 +424,25 @@ module.exports.filterRuntime = (runtime, filter) => {
 
 /**
  * @template T
+ * @template [R=T]
  */
 class RuntimeSpecMap {
 	/**
-	 * @param {RuntimeSpecMap<T>=} clone copy form this
+	 * @param {RuntimeSpecMap<T, R>=} clone copy form this
 	 */
 	constructor(clone) {
 		this._mode = clone ? clone._mode : 0; // 0 = empty, 1 = single entry, 2 = map
 		/** @type {RuntimeSpec} */
 		this._singleRuntime = clone ? clone._singleRuntime : undefined;
-		/** @type {T | undefined} */
+		/** @type {R | undefined} */
 		this._singleValue = clone ? clone._singleValue : undefined;
-		/** @type {RuntimeSpecMapInnerMap<T> | undefined} */
+		/** @type {RuntimeSpecMapInnerMap<R> | undefined} */
 		this._map = clone && clone._map ? new Map(clone._map) : undefined;
 	}
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @returns {T | undefined} value
+	 * @returns {R | undefined} value
 	 */
 	get(runtime) {
 		switch (this._mode) {
@@ -452,7 +453,7 @@ class RuntimeSpecMap {
 					? this._singleValue
 					: undefined;
 			default:
-				return /** @type {RuntimeSpecMapInnerMap<T>} */ (this._map).get(
+				return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).get(
 					getRuntimeKey(runtime)
 				);
 		}
@@ -469,7 +470,7 @@ class RuntimeSpecMap {
 			case 1:
 				return runtimeEqual(this._singleRuntime, runtime);
 			default:
-				return /** @type {RuntimeSpecMapInnerMap<T>} */ (this._map).has(
+				return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).has(
 					getRuntimeKey(runtime)
 				);
 		}
@@ -477,7 +478,7 @@ class RuntimeSpecMap {
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @param {T} value the value
+	 * @param {R} value the value
 	 */
 	set(runtime, value) {
 		switch (this._mode) {
@@ -495,21 +496,21 @@ class RuntimeSpecMap {
 				this._map = new Map();
 				this._map.set(
 					getRuntimeKey(this._singleRuntime),
-					/** @type {T} */ (this._singleValue)
+					/** @type {R} */ (this._singleValue)
 				);
 				this._singleRuntime = undefined;
 				this._singleValue = undefined;
 			/* falls through */
 			default:
-				/** @type {RuntimeSpecMapInnerMap<T>} */
+				/** @type {RuntimeSpecMapInnerMap<R>} */
 				(this._map).set(getRuntimeKey(runtime), value);
 		}
 	}
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @param {() => TODO} computer function to compute the value
-	 * @returns {TODO} true, when the runtime was deleted
+	 * @param {() => R} computer function to compute the value
+	 * @returns {R} the new value
 	 */
 	provide(runtime, computer) {
 		switch (this._mode) {
@@ -519,13 +520,14 @@ class RuntimeSpecMap {
 				return (this._singleValue = computer());
 			case 1: {
 				if (runtimeEqual(this._singleRuntime, runtime)) {
-					return /** @type {T} */ (this._singleValue);
+					return /** @type {R} */ (this._singleValue);
 				}
 				this._mode = 2;
 				this._map = new Map();
 				this._map.set(
 					getRuntimeKey(this._singleRuntime),
-					/** @type {T} */ (this._singleValue)
+					/** @type {R} */
+					(this._singleValue)
 				);
 				this._singleRuntime = undefined;
 				this._singleValue = undefined;
@@ -535,10 +537,12 @@ class RuntimeSpecMap {
 			}
 			default: {
 				const key = getRuntimeKey(runtime);
-				const value = /** @type {Map<string, T>} */ (this._map).get(key);
+				const value =
+					/** @type {RuntimeSpecMapInnerMap<R>} */
+					(this._map).get(key);
 				if (value !== undefined) return value;
 				const newValue = computer();
-				/** @type {Map<string, T>} */
+				/** @type {RuntimeSpecMapInnerMap<R>} */
 				(this._map).set(key, newValue);
 				return newValue;
 			}
@@ -560,14 +564,14 @@ class RuntimeSpecMap {
 				}
 				return;
 			default:
-				/** @type {RuntimeSpecMapInnerMap<T>} */
+				/** @type {RuntimeSpecMapInnerMap<R>} */
 				(this._map).delete(getRuntimeKey(runtime));
 		}
 	}
 
 	/**
 	 * @param {RuntimeSpec} runtime the runtimes
-	 * @param {function(T | undefined): T} fn function to update the value
+	 * @param {(value: R | undefined) => R} fn function to update the value
 	 */
 	update(runtime, fn) {
 		switch (this._mode) {
@@ -584,7 +588,8 @@ class RuntimeSpecMap {
 					this._map = new Map();
 					this._map.set(
 						getRuntimeKey(this._singleRuntime),
-						/** @type {T} */ (this._singleValue)
+						/** @type {R} */
+						(this._singleValue)
 					);
 					this._singleRuntime = undefined;
 					this._singleValue = undefined;
@@ -594,10 +599,12 @@ class RuntimeSpecMap {
 			}
 			default: {
 				const key = getRuntimeKey(runtime);
-				const oldValue = /** @type {Map<string, T>} */ (this._map).get(key);
+				const oldValue =
+					/** @type {RuntimeSpecMapInnerMap<R>} */
+					(this._map).get(key);
 				const newValue = fn(oldValue);
 				if (newValue !== oldValue)
-					/** @type {RuntimeSpecMapInnerMap<T>} */
+					/** @type {RuntimeSpecMapInnerMap<R>} */
 					(this._map).set(key, newValue);
 			}
 		}
@@ -611,7 +618,7 @@ class RuntimeSpecMap {
 				return [this._singleRuntime];
 			default:
 				return Array.from(
-					/** @type {RuntimeSpecMapInnerMap<T>} */
+					/** @type {RuntimeSpecMapInnerMap<R>} */
 					(this._map).keys(),
 					keyToRuntime
 				);
@@ -619,16 +626,16 @@ class RuntimeSpecMap {
 	}
 
 	/**
-	 * @returns {IterableIterator<T>} values
+	 * @returns {IterableIterator<R>} values
 	 */
 	values() {
 		switch (this._mode) {
 			case 0:
 				return [][Symbol.iterator]();
 			case 1:
-				return [/** @type {T} */ (this._singleValue)][Symbol.iterator]();
+				return [/** @type {R} */ (this._singleValue)][Symbol.iterator]();
 			default:
-				return /** @type {Map<string, T>} */ (this._map).values();
+				return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).values();
 		}
 	}
 
@@ -637,7 +644,7 @@ class RuntimeSpecMap {
 			return /** @type {number} */ (this._mode);
 		}
 
-		return /** @type {Map<string, T>} */ (this._map).size;
+		return /** @type {RuntimeSpecMapInnerMap<R>} */ (this._map).size;
 	}
 }
 

package/lib/util/semver.js

@@ -259,15 +259,25 @@ module.exports.parseRange = str => {
 		const items = str.split(/\s+-\s+/);
 
 		if (items.length === 1) {
-			const items =
-				/** @type {SemVerRangeItem[][]} */
-				(
-					str
-						.trim()
-						.split(/(?<=[-0-9A-Za-z])\s+/g)
-						.map(parseSimple)
-				);
+			str = str.trim();
 
+			/** @type {SemVerRangeItem[][]} */
+			const items = [];
+			const r = /[-0-9A-Za-z]\s+/g;
+			var start = 0;
+			var match;
+			while ((match = r.exec(str))) {
+				const end = match.index + 1;
+				items.push(
+					/** @type {SemVerRangeItem[]} */
+					(parseSimple(str.slice(start, end).trim()))
+				);
+				start = end;
+			}
+			items.push(
+				/** @type {SemVerRangeItem[]} */
+				(parseSimple(str.slice(start).trim()))
+			);
 			return combine(items, 2);
 		}
 

package/lib/util/serialization.js

@@ -4,12 +4,11 @@
 
 "use strict";
 
+const { DEFAULTS } = require("../config/defaults");
 const memoize = require("./memoize");
 
 /** @typedef {import("../serialization/BinaryMiddleware").MEASURE_END_OPERATION_TYPE} MEASURE_END_OPERATION */
 /** @typedef {import("../serialization/BinaryMiddleware").MEASURE_START_OPERATION_TYPE} MEASURE_START_OPERATION */
-/** @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 */
@@ -47,6 +46,7 @@ const registerSerializers = memoize(() => {
 		if (loader) {
 			loader();
 		} else {
+			// eslint-disable-next-line no-console
 			console.warn(`${req} not found in internalSerializables`);
 		}
 		return true;
@@ -91,17 +91,14 @@ module.exports = {
 		return (buffersSerializer = new Serializer([
 			new SingleItemMiddleware(),
 			new (getObjectMiddleware())(context => {
-				if (context.write) {
-					/**
-					 * @param {any} value value
-					 */
+				if ("write" in context) {
 					context.writeLazy = value => {
 						context.write(
 							SerializerMiddleware.createLazy(value, binaryMiddleware)
 						);
 					};
 				}
-			}, "md4"),
+			}, DEFAULTS.HASH_FUNCTION),
 			binaryMiddleware
 		]));
 	},
@@ -121,20 +118,12 @@ module.exports = {
 		return new Serializer([
 			new SingleItemMiddleware(),
 			new (getObjectMiddleware())(context => {
-				if (context.write) {
-					/**
-					 * @param {any} value value
-					 */
+				if ("write" in context) {
 					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,9 +16,9 @@
  * @template T
  * @template R
  * @typedef {object} GroupConfig
- * @property {function(T): string[] | undefined} getKeys
- * @property {function(string, (R | T)[], T[]): R} createGroup
- * @property {function(string, T[]): GroupOptions=} getOptions
+ * @property {(item: T) => string[] | undefined} getKeys
+ * @property {(key: string, children: (R | T)[], items: T[]) => R} createGroup
+ * @property {(name: string, items: T[]) => GroupOptions=} getOptions
  */
 
 /**

package/lib/validateSchema.js

@@ -87,7 +87,7 @@ const validateSchema = (schema, options, validationConfiguration) => {
 					children.some(
 						child =>
 							child.keyword === "absolutePath" &&
-							child.dataPath === ".output.filename"
+							child.instancePath === "/output/filename"
 					)
 				) {
 					return `${formattedError}\nPlease use output.path to specify absolute path and output.filename for the file name.`;
@@ -97,7 +97,7 @@ const validateSchema = (schema, options, validationConfiguration) => {
 					children &&
 					children.some(
 						child =>
-							child.keyword === "pattern" && child.dataPath === ".devtool"
+							child.keyword === "pattern" && child.instancePath === "/devtool"
 					)
 				) {
 					return (
@@ -108,10 +108,7 @@ const validateSchema = (schema, options, validationConfiguration) => {
 				}
 
 				if (error.keyword === "additionalProperties") {
-					const params =
-						/** @type {import("ajv").AdditionalPropertiesParams} */ (
-							error.params
-						);
+					const params = error.params;
 					if (
 						Object.prototype.hasOwnProperty.call(
 							DID_YOU_MEAN,
@@ -136,7 +133,7 @@ const validateSchema = (schema, options, validationConfiguration) => {
 						}?`;
 					}
 
-					if (!error.dataPath) {
+					if (!error.instancePath) {
 						if (params.additionalProperty === "debug") {
 							return (
 								`${formattedError}\n` +

package/lib/wasm/EnableWasmLoadingPlugin.js

@@ -99,7 +99,7 @@ class EnableWasmLoadingPlugin {
 						new ReadFileCompileWasmPlugin({
 							mangleImports: compiler.options.optimization.mangleWasmImports,
 							import:
-								compiler.options.output.environment.module &&
+								compiler.options.output.module &&
 								compiler.options.output.environment.dynamicImport
 						}).apply(compiler);
 					}
@@ -108,7 +108,7 @@ class EnableWasmLoadingPlugin {
 						const ReadFileCompileAsyncWasmPlugin = require("../node/ReadFileCompileAsyncWasmPlugin");
 						new ReadFileCompileAsyncWasmPlugin({
 							import:
-								compiler.options.output.environment.module &&
+								compiler.options.output.module &&
 								compiler.options.output.environment.dynamicImport
 						}).apply(compiler);
 					}

package/lib/wasm-async/AsyncWasmLoadingRuntimeModule.js

@@ -14,9 +14,9 @@ const Template = require("../Template");
 
 /**
  * @typedef {object} AsyncWasmLoadingRuntimeModuleOptions
- * @property {(function(string): string)=} generateBeforeLoadBinaryCode
- * @property {function(string): string} generateLoadBinaryCode
- * @property {(function(): string)=} generateBeforeInstantiateStreaming
+ * @property {((wasmModuleSrcPath: string) => string)=} generateBeforeLoadBinaryCode
+ * @property {(wasmModuleSrcPath: string) => string} generateLoadBinaryCode
+ * @property {(() => string)=} generateBeforeInstantiateStreaming
  * @property {boolean} supportsStreaming
  */
 

package/lib/wasm-async/AsyncWebAssemblyGenerator.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { RawSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypesConstants");
 
@@ -56,6 +57,16 @@ class AsyncWebAssemblyGenerator extends Generator {
 	generate(module, generateContext) {
 		return /** @type {Source} */ (module.originalSource());
 	}
+
+	/**
+	 * @param {Error} error the error
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source | null} generated code
+	 */
+	generateError(error, module, generateContext) {
+		return new RawSource(error.message);
+	}
 }
 
 module.exports = AsyncWebAssemblyGenerator;

package/lib/wasm-async/AsyncWebAssemblyJavascriptGenerator.js

@@ -201,6 +201,16 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 
 		return InitFragment.addToSource(source, initFragments, generateContext);
 	}
+
+	/**
+	 * @param {Error} error the error
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source | null} generated code
+	 */
+	generateError(error, module, generateContext) {
+		return new RawSource(`throw new Error(${JSON.stringify(error.message)});`);
+	}
 }
 
 module.exports = AsyncWebAssemblyJavascriptGenerator;

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -11,7 +11,7 @@ const Generator = require("../Generator");
 const { tryRunOrWebpackError } = require("../HookWebpackError");
 const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
-const { compareModulesByIdentifier } = require("../util/comparators");
+const { compareModulesByIdOrIdentifier } = require("../util/comparators");
 const memoize = require("../util/memoize");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -146,7 +146,7 @@ class AsyncWebAssemblyModulesPlugin {
 
 						for (const module of chunkGraph.getOrderedChunkModulesIterable(
 							chunk,
-							compareModulesByIdentifier
+							compareModulesByIdOrIdentifier(chunkGraph)
 						)) {
 							if (module.type === WEBASSEMBLY_MODULE_TYPE_ASYNC) {
 								const filenameTemplate =

package/lib/wasm-async/UniversalCompileAsyncWasmPlugin.js

@@ -42,6 +42,10 @@ class UniversalCompileAsyncWasmPlugin {
 					Template.indent(["return fallback();"]),
 					"}"
 				]);
+			/**
+			 * @param {string} path path
+			 * @returns {string} code
+			 */
 			const generateBeforeLoadBinaryCode = path =>
 				Template.asString([
 					"var useFetch = typeof document !== 'undefined' || typeof self !== 'undefined';",