webpack 5.97.1 → 5.99.0

package/lib/ModuleFilenameHelpers.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const NormalModule = require("./NormalModule");
+const { DEFAULTS } = require("./config/defaults");
 const createHash = require("./util/createHash");
 const memoize = require("./util/memoize");
 
@@ -15,7 +16,7 @@ const memoize = require("./util/memoize");
 /** @typedef {typeof import("./util/Hash")} Hash */
 
 /** @typedef {string | RegExp | (string | RegExp)[]} Matcher */
-/** @typedef {{test?: Matcher, include?: Matcher, exclude?: Matcher }} MatchObject */
+/** @typedef {{ test?: Matcher, include?: Matcher, exclude?: Matcher }} MatchObject */
 
 const ModuleFilenameHelpers = module.exports;
 
@@ -79,7 +80,7 @@ const getBefore = (strFn, token) => () => {
  * @returns {ReturnStringCallback} a function that returns the hash of the string
  */
 const getHash =
-	(strFn, hashFunction = "md4") =>
+	(strFn, hashFunction = DEFAULTS.HASH_FUNCTION) =>
 	() => {
 		const hash = createHash(hashFunction);
 		hash.update(strFn());
@@ -87,37 +88,15 @@ const getHash =
 		return digest.slice(0, 4);
 	};
 
-/**
- * Returns a function that returns the string with the token replaced with the replacement
- * @param {string|RegExp} test A regular expression string or Regular Expression object
- * @returns	{RegExp} A regular expression object
- * @example
- * ```js
- * const test = asRegExp("test");
- * test.test("test"); // true
- *
- * const test2 = asRegExp(/test/);
- * test2.test("test"); // true
- * ```
- */
-const asRegExp = test => {
-	if (typeof test === "string") {
-		// Escape special characters in the string to prevent them from being interpreted as special characters in a regular expression. Do this by
-		// adding a backslash before each special character
-		test = new RegExp(`^${test.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")}`);
-	}
-	return test;
-};
-
 /**
  * @template T
  * Returns a lazy object. The object is lazy in the sense that the properties are
  * only evaluated when they are accessed. This is only obtained by setting a function as the value for each key.
  * @param {Record<string, () => T>} obj the object to convert to a lazy access object
- * @returns {object} the lazy access object
+ * @returns {T} the lazy access object
  */
 const lazyObject = obj => {
-	const newObj = {};
+	const newObj = /** @type {T} */ ({});
 	for (const key of Object.keys(obj)) {
 		const fn = obj[key];
 		Object.defineProperty(newObj, key, {
@@ -140,18 +119,15 @@ const SQUARE_BRACKET_TAG_REGEXP = /\[\\*([\w-]+)\\*\]/gi;
 
 /**
  * @param {Module | string} module the module
- * @param {TODO} options options
- * @param {object} contextInfo context info
- * @param {RequestShortener} contextInfo.requestShortener requestShortener
- * @param {ChunkGraph} contextInfo.chunkGraph chunk graph
- * @param {string | Hash=} contextInfo.hashFunction the hash function to use
+ * @param {{ namespace?: string, moduleFilenameTemplate?: string | TODO }} options options
+ * @param {{ requestShortener: RequestShortener, chunkGraph: ChunkGraph, hashFunction?: string | Hash }} contextInfo context info
  * @returns {string} the filename
  */
 ModuleFilenameHelpers.createFilename = (
 	// eslint-disable-next-line default-param-last
 	module = "",
 	options,
-	{ requestShortener, chunkGraph, hashFunction = "md4" }
+	{ requestShortener, chunkGraph, hashFunction = DEFAULTS.HASH_FUNCTION }
 ) => {
 	const opts = {
 		namespace: "",
@@ -163,6 +139,7 @@ ModuleFilenameHelpers.createFilename = (
 				})
 	};
 
+	/** @type {ReturnStringCallback} */
 	let absoluteResourcePath;
 	let hash;
 	/** @type {ReturnStringCallback} */
@@ -177,7 +154,8 @@ ModuleFilenameHelpers.createFilename = (
 			(memoize(() => requestShortener.shorten(module)));
 		identifier = shortIdentifier;
 		moduleId = () => "";
-		absoluteResourcePath = () => module.split("!").pop();
+		absoluteResourcePath = () =>
+			/** @type {string} */ (module.split("!").pop());
 		hash = getHash(identifier, hashFunction);
 	} else {
 		shortIdentifier = memoize(() =>
@@ -192,7 +170,7 @@ ModuleFilenameHelpers.createFilename = (
 		absoluteResourcePath = () =>
 			module instanceof NormalModule
 				? module.resource
-				: module.identifier().split("!").pop();
+				: /** @type {string} */ (module.identifier().split("!").pop());
 		hash = getHash(identifier, hashFunction);
 	}
 	const resource =
@@ -225,7 +203,7 @@ ModuleFilenameHelpers.createFilename = (
 	}
 
 	// TODO webpack 6: consider removing alternatives without dashes
-	/** @type {Map<string, function(): string>} */
+	/** @type {Map<string, () => string>} */
 	const replacements = new Map([
 		["identifier", identifier],
 		["short-identifier", shortIdentifier],
@@ -335,15 +313,19 @@ ModuleFilenameHelpers.replaceDuplicates = (array, fn, comparator) => {
  * ModuleFilenameHelpers.matchPart("foo.js", [/^baz/, /^bar/]); // false
  * ```
  */
-ModuleFilenameHelpers.matchPart = (str, test) => {
+const matchPart = (str, test) => {
 	if (!test) return true;
-
 	if (Array.isArray(test)) {
-		return test.map(asRegExp).some(regExp => regExp.test(str));
+		return test.some(test => matchPart(str, test));
+	}
+	if (typeof test === "string") {
+		return str.startsWith(test);
 	}
-	return asRegExp(test).test(str);
+	return test.test(str);
 };
 
+ModuleFilenameHelpers.matchPart = matchPart;
+
 /**
  * Tests if a string matches a match object. The match object can have the following properties:
  * - `test`: a RegExp or an array of RegExp

package/lib/ModuleGraph.js

@@ -11,6 +11,7 @@ const ModuleGraphConnection = require("./ModuleGraphConnection");
 const SortableSet = require("./util/SortableSet");
 const WeakTupleMap = require("./util/WeakTupleMap");
 
+/** @typedef {import("./Compilation").ModuleMemCaches} ModuleMemCaches */
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./ExportsInfo").ExportInfo} ExportInfo */
@@ -119,6 +120,11 @@ class ModuleGraphModule {
 	}
 }
 
+/** @typedef {(moduleGraphConnection: ModuleGraphConnection) => boolean} FilterConnection */
+
+/** @typedef {EXPECTED_OBJECT} MetaKey */
+/** @typedef {TODO} Meta */
+
 class ModuleGraph {
 	constructor() {
 		/**
@@ -132,7 +138,7 @@ class ModuleGraph {
 		 */
 		this._moduleMap = new Map();
 		/**
-		 * @type {WeakMap<any, object>}
+		 * @type {WeakMap<MetaKey, Meta>}
 		 * @private
 		 */
 		this._metaMap = new WeakMap();
@@ -142,7 +148,7 @@ class ModuleGraph {
 		 */
 		this._cache = undefined;
 		/**
-		 * @type {Map<Module, WeakTupleMap<any, any>> | undefined}
+		 * @type {ModuleMemCaches | undefined}
 		 * @private
 		 */
 		this._moduleMemCaches = undefined;
@@ -331,7 +337,7 @@ class ModuleGraph {
 	/**
 	 * @param {Module} oldModule the old referencing module
 	 * @param {Module} newModule the new referencing module
-	 * @param {function(ModuleGraphConnection): boolean} filterConnection filter predicate for replacement
+	 * @param {FilterConnection} filterConnection filter predicate for replacement
 	 * @returns {void}
 	 */
 	moveModuleConnections(oldModule, newModule, filterConnection) {
@@ -368,7 +374,7 @@ class ModuleGraph {
 	/**
 	 * @param {Module} oldModule the old referencing module
 	 * @param {Module} newModule the new referencing module
-	 * @param {function(ModuleGraphConnection): boolean} filterConnection filter predicate for replacement
+	 * @param {FilterConnection} filterConnection filter predicate for replacement
 	 * @returns {void}
 	 */
 	copyOutgoingModuleConnections(oldModule, newModule, filterConnection) {
@@ -756,21 +762,21 @@ class ModuleGraph {
 	}
 
 	/**
-	 * @param {any} thing any thing
-	 * @returns {object} metadata
+	 * @param {MetaKey} thing any thing
+	 * @returns {Meta} metadata
 	 */
 	getMeta(thing) {
 		let meta = this._metaMap.get(thing);
 		if (meta === undefined) {
 			meta = Object.create(null);
-			this._metaMap.set(thing, /** @type {object} */ (meta));
+			this._metaMap.set(thing, meta);
 		}
-		return /** @type {object} */ (meta);
+		return meta;
 	}
 
 	/**
-	 * @param {any} thing any thing
-	 * @returns {object | undefined} metadata
+	 * @param {MetaKey} thing any thing
+	 * @returns {Meta | undefined} metadata
 	 */
 	getMetaIfExisting(thing) {
 		return this._metaMap.get(thing);
@@ -790,10 +796,10 @@ class ModuleGraph {
 	}
 
 	/**
-	 * @template {any[]} T
+	 * @template T
 	 * @template V
-	 * @param {(moduleGraph: ModuleGraph, ...args: T) => V} fn computer
-	 * @param {T} args arguments
+	 * @param {(moduleGraph: ModuleGraph, ...args: T[]) => V} fn computer
+	 * @param {...T} args arguments
 	 * @returns {V} computed value or cached
 	 */
 	cached(fn, ...args) {
@@ -802,7 +808,7 @@ class ModuleGraph {
 	}
 
 	/**
-	 * @param {Map<Module, WeakTupleMap<any, any>>} moduleMemCaches mem caches for modules for better caching
+	 * @param {ModuleMemCaches} moduleMemCaches mem caches for modules for better caching
 	 */
 	setModuleMemCaches(moduleMemCaches) {
 		this._moduleMemCaches = moduleMemCaches;

package/lib/ModuleGraphConnection.js

@@ -75,7 +75,6 @@ class ModuleGraphConnection {
 		this.weak = weak;
 		this.conditional = Boolean(condition);
 		this._active = condition !== false;
-		/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState) | undefined} */
 		this.condition = condition || undefined;
 		/** @type {Set<string> | undefined} */
 		this.explanations = undefined;
@@ -103,15 +102,16 @@ class ModuleGraphConnection {
 	}
 
 	/**
-	 * @param {function(ModuleGraphConnection, RuntimeSpec): ConnectionState} condition condition for the connection
+	 * @param {GetConditionFn} condition condition for the connection
 	 * @returns {void}
 	 */
 	addCondition(condition) {
 		if (this.conditional) {
 			const old =
-				/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */
+				/** @type {GetConditionFn} */
 				(this.condition);
-			this.condition = (c, r) =>
+			/** @type {GetConditionFn} */
+			(this.condition) = (c, r) =>
 				intersectConnectionStates(old(c, r), condition(c, r));
 		} else if (this._active) {
 			this.conditional = true;
@@ -143,9 +143,7 @@ class ModuleGraphConnection {
 		if (!this.conditional) return this._active;
 
 		return (
-			/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */ (
-				this.condition
-			)(this, runtime) !== false
+			/** @type {GetConditionFn} */ (this.condition)(this, runtime) !== false
 		);
 	}
 
@@ -156,9 +154,7 @@ class ModuleGraphConnection {
 	isTargetActive(runtime) {
 		if (!this.conditional) return this._active;
 		return (
-			/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */ (
-				this.condition
-			)(this, runtime) === true
+			/** @type {GetConditionFn} */ (this.condition)(this, runtime) === true
 		);
 	}
 
@@ -168,9 +164,7 @@ class ModuleGraphConnection {
 	 */
 	getActiveState(runtime) {
 		if (!this.conditional) return this._active;
-		return /** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */ (
-			this.condition
-		)(this, runtime);
+		return /** @type {GetConditionFn} */ (this.condition)(this, runtime);
 	}
 
 	/**

package/lib/ModuleNotFoundError.js

@@ -44,7 +44,7 @@ const previouslyPolyfilledBuiltinModules = {
 class ModuleNotFoundError extends WebpackError {
 	/**
 	 * @param {Module | null} module module tied to dependency
-	 * @param {Error&any} err error thrown
+	 * @param {Error & { details?: string }} err error thrown
 	 * @param {DependencyLocation} loc location of dependency
 	 */
 	constructor(module, err, loc) {

package/lib/ModuleParseError.js

@@ -8,6 +8,7 @@
 const WebpackError = require("./WebpackError");
 const makeSerializable = require("./util/makeSerializable");
 
+/** @typedef {import("./Dependency").SourcePosition} SourcePosition */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
@@ -16,7 +17,7 @@ const WASM_HEADER = Buffer.from([0x00, 0x61, 0x73, 0x6d]);
 class ModuleParseError extends WebpackError {
 	/**
 	 * @param {string | Buffer} source source code
-	 * @param {Error & any} err the parse error
+	 * @param {Error & { loc?: SourcePosition }} err the parse error
 	 * @param {string[]} loaders the loaders used
 	 * @param {string} type module type
 	 */

package/lib/ModuleSourceTypesConstants.js

@@ -34,6 +34,11 @@ const ASSET_AND_JS_AND_CSS_URL_TYPES = new Set([
 	"css-url"
 ]);
 
+/**
+ * @type {"javascript"}
+ */
+const JS_TYPE = "javascript";
+
 /**
  * @type {ReadonlySet<"javascript">}
  */
@@ -54,6 +59,10 @@ const JS_AND_CSS_URL_TYPES = new Set(["javascript", "css-url"]);
  */
 const JS_AND_CSS_TYPES = new Set(["javascript", "css"]);
 
+/**
+ * @type {"css"}
+ */
+const CSS_TYPE = "css";
 /**
  * @type {ReadonlySet<"css">}
  */
@@ -94,6 +103,7 @@ const CONSUME_SHARED_TYPES = new Set(["consume-shared"]);
 const SHARED_INIT_TYPES = new Set(["share-init"]);
 
 module.exports.NO_TYPES = NO_TYPES;
+module.exports.JS_TYPE = JS_TYPE;
 module.exports.JS_TYPES = JS_TYPES;
 module.exports.JS_AND_CSS_TYPES = JS_AND_CSS_TYPES;
 module.exports.JS_AND_CSS_URL_TYPES = JS_AND_CSS_URL_TYPES;
@@ -102,6 +112,7 @@ module.exports.ASSET_TYPES = ASSET_TYPES;
 module.exports.ASSET_AND_JS_TYPES = ASSET_AND_JS_TYPES;
 module.exports.ASSET_AND_CSS_URL_TYPES = ASSET_AND_CSS_URL_TYPES;
 module.exports.ASSET_AND_JS_AND_CSS_URL_TYPES = ASSET_AND_JS_AND_CSS_URL_TYPES;
+module.exports.CSS_TYPE = CSS_TYPE;
 module.exports.CSS_TYPES = CSS_TYPES;
 module.exports.CSS_URL_TYPES = CSS_URL_TYPES;
 module.exports.CSS_IMPORT_TYPES = CSS_IMPORT_TYPES;

package/lib/ModuleTemplate.js

@@ -44,7 +44,7 @@ class ModuleTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Source, Module, ChunkRenderContext, DependencyTemplates): Source} fn fn
+					 * @param {(source: Source, module: Module, chunkRenderContext: ChunkRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()
@@ -69,7 +69,7 @@ class ModuleTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Source, Module, ChunkRenderContext, DependencyTemplates): Source} fn fn
+					 * @param {(source: Source, module: Module, chunkRenderContext: ChunkRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()
@@ -94,7 +94,7 @@ class ModuleTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Source, Module, ChunkRenderContext, DependencyTemplates): Source} fn fn
+					 * @param {(source: Source, module: Module, chunkRenderContext: ChunkRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()
@@ -119,7 +119,7 @@ class ModuleTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Source, Module, ChunkRenderContext, DependencyTemplates): Source} fn fn
+					 * @param {(source: Source, module: Module, chunkRenderContext: ChunkRenderContext, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()
@@ -144,7 +144,7 @@ class ModuleTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Hash): void} fn fn
+					 * @param {(hash: Hash) => void} fn fn
 					 */
 					(options, fn) => {
 						compilation.hooks.fullHash.tap(options, fn);

package/lib/ModuleTypeConstants.js

@@ -151,13 +151,28 @@ module.exports.ASSET_MODULE_TYPE_INLINE = ASSET_MODULE_TYPE_INLINE;
 module.exports.JAVASCRIPT_MODULE_TYPE_AUTO = JAVASCRIPT_MODULE_TYPE_AUTO;
 module.exports.JAVASCRIPT_MODULE_TYPE_DYNAMIC = JAVASCRIPT_MODULE_TYPE_DYNAMIC;
 module.exports.JAVASCRIPT_MODULE_TYPE_ESM = JAVASCRIPT_MODULE_TYPE_ESM;
+module.exports.JAVASCRIPT_MODULES = [
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+];
 module.exports.JSON_MODULE_TYPE = JSON_MODULE_TYPE;
 module.exports.WEBASSEMBLY_MODULE_TYPE_ASYNC = WEBASSEMBLY_MODULE_TYPE_ASYNC;
 module.exports.WEBASSEMBLY_MODULE_TYPE_SYNC = WEBASSEMBLY_MODULE_TYPE_SYNC;
+module.exports.WEBASSEMBLY_MODULES = [
+	WEBASSEMBLY_MODULE_TYPE_SYNC,
+	WEBASSEMBLY_MODULE_TYPE_SYNC
+];
 module.exports.CSS_MODULE_TYPE = CSS_MODULE_TYPE;
 module.exports.CSS_MODULE_TYPE_GLOBAL = CSS_MODULE_TYPE_GLOBAL;
 module.exports.CSS_MODULE_TYPE_MODULE = CSS_MODULE_TYPE_MODULE;
 module.exports.CSS_MODULE_TYPE_AUTO = CSS_MODULE_TYPE_AUTO;
+module.exports.CSS_MODULES = [
+	CSS_MODULE_TYPE,
+	CSS_MODULE_TYPE_GLOBAL,
+	CSS_MODULE_TYPE_MODULE,
+	CSS_MODULE_TYPE_AUTO
+];
 module.exports.WEBPACK_MODULE_TYPE_RUNTIME = WEBPACK_MODULE_TYPE_RUNTIME;
 module.exports.WEBPACK_MODULE_TYPE_FALLBACK = WEBPACK_MODULE_TYPE_FALLBACK;
 module.exports.WEBPACK_MODULE_TYPE_REMOTE = WEBPACK_MODULE_TYPE_REMOTE;

package/lib/MultiCompiler.js

@@ -70,7 +70,7 @@ module.exports = class MultiCompiler {
 			watchClose: new SyncHook([]),
 			/** @type {MultiHook<AsyncSeriesHook<[Compiler]>>} */
 			watchRun: new MultiHook(compilers.map(c => c.hooks.watchRun)),
-			/** @type {MultiHook<SyncBailHook<[string, string, any[]], true>>} */
+			/** @type {MultiHook<SyncBailHook<[string, string, EXPECTED_ANY[] | undefined], true | void>>} */
 			infrastructureLog: new MultiHook(
 				compilers.map(c => c.hooks.infrastructureLog)
 			)
@@ -223,7 +223,7 @@ module.exports = class MultiCompiler {
 	}
 
 	/**
-	 * @param {string | (function(): string)} name name of the logger, or function called once to get the logger name
+	 * @param {string | (() => string)} name name of the logger, or function called once to get the logger name
 	 * @returns {Logger} a logger with that name
 	 */
 	getInfrastructureLogger(name) {
@@ -377,8 +377,8 @@ module.exports = class MultiCompiler {
 
 	/**
 	 * @template SetupResult
-	 * @param {function(Compiler, number, Callback<Stats>, function(): boolean, function(): void, function(): void): SetupResult} setup setup a single compiler
-	 * @param {function(Compiler, SetupResult, Callback<Stats>): void} run run/continue a single compiler
+	 * @param {(compiler: Compiler, index: number, doneCallback: Callback<Stats>, isBlocked: () => boolean, setChanged: () => void, setInvalid: () => void) => SetupResult} setup setup a single compiler
+	 * @param {(compiler: Compiler, setupResult: SetupResult, callback: Callback<Stats>) => void} run run/continue a single compiler
 	 * @param {Callback<MultiStats>} callback callback when all compilers are done, result includes Stats of all changed compilers
 	 * @returns {SetupResult[]} result of setup
 	 */

package/lib/MultiStats.js

@@ -135,7 +135,7 @@ class MultiStats {
 		/**
 		 * @param {StatsCompilation} j stats error
 		 * @param {StatsError} obj Stats error
-		 * @returns {TODO} result
+		 * @returns {StatsError} result
 		 */
 		const mapError = (j, obj) => ({
 			...obj,