webpack 5.97.1 → 5.104.1

package/lib/TemplatedPathPlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const mime = require("mime-types");
 const { basename, extname } = require("path");
 const util = require("util");
+const mime = require("mime-types");
 const Chunk = require("./Chunk");
 const Module = require("./Module");
 const { parseResource } = require("./util/identifier");
@@ -20,11 +20,8 @@ const { parseResource } = require("./util/identifier");
 
 const REGEXP = /\[\\*([\w:]+)\\*\]/gi;
 
-/**
- * @param {string | number} id id
- * @returns {string | number} result
- */
-const prepareId = id => {
+/** @type {PathData["prepareId"]} */
+const prepareId = (id) => {
 	if (typeof id !== "string") return id;
 
 	if (/^"\s\+*.*\+\s*"$/.test(id)) {
@@ -50,10 +47,10 @@ const prepareId = id => {
  * @param {((arg0: number) => string) | undefined} handler handler
  * @param {AssetInfo | undefined} assetInfo asset info
  * @param {string} hashName hash name
- * @returns {ReplacerFunction} hash replacer function
+ * @returns {Replacer} hash replacer function
  */
 const hashLength = (replacer, handler, assetInfo, hashName) => {
-	/** @type {ReplacerFunction} */
+	/** @type {Replacer} */
 	const fn = (match, arg, input) => {
 		let result;
 		const length = arg && Number.parseInt(arg, 10);
@@ -81,7 +78,7 @@ const hashLength = (replacer, handler, assetInfo, hashName) => {
 	return fn;
 };
 
-/** @typedef {(match: string, arg?: string, input?: string) => string} Replacer */
+/** @typedef {(match: string, arg: string | undefined, input: string) => string} Replacer */
 
 /**
  * @param {string | number | null | undefined | (() => string | number | null | undefined)} value value
@@ -113,10 +110,11 @@ const replacer = (value, allowEmpty) => {
 const deprecationCache = new Map();
 const deprecatedFunction = (() => () => {})();
 /**
- * @param {Function} fn function
+ * @template {(...args: EXPECTED_ANY[]) => EXPECTED_ANY} T
+ * @param {T} fn function
  * @param {string} message message
  * @param {string} code code
- * @returns {function(...any[]): void} function with deprecation output
+ * @returns {T} function with deprecation output
  */
 const deprecated = (fn, message, code) => {
 	let d = deprecationCache.get(message);
@@ -124,13 +122,16 @@ const deprecated = (fn, message, code) => {
 		d = util.deprecate(deprecatedFunction, message, code);
 		deprecationCache.set(message, d);
 	}
-	return (...args) => {
-		d();
-		return fn(...args);
-	};
+	return /** @type {T} */ (
+		(...args) => {
+			d();
+			return fn(...args);
+		}
+	);
 };
 
-/** @typedef {string | function(PathData, AssetInfo=): string} TemplatePath */
+/** @typedef {(pathData: PathData, assetInfo?: AssetInfo) => string} TemplatePathFn */
+/** @typedef {string | TemplatePathFn} TemplatePath */
 
 /**
  * @param {TemplatePath} path the raw path
@@ -141,7 +142,7 @@ const deprecated = (fn, message, code) => {
 const replacePathVariables = (path, data, assetInfo) => {
 	const chunkGraph = data.chunkGraph;
 
-	/** @type {Map<string, Function>} */
+	/** @type {Map<string, Replacer>} */
 	const replacements = new Map();
 
 	// Filename context
@@ -299,7 +300,7 @@ const replacePathVariables = (path, data, assetInfo) => {
 		const module = data.module;
 
 		const idReplacer = replacer(() =>
-			prepareId(
+			(data.prepareId || prepareId)(
 				module instanceof Module
 					? /** @type {ModuleId} */
 						(/** @type {ChunkGraph} */ (chunkGraph).getModuleId(module))
@@ -349,7 +350,9 @@ const replacePathVariables = (path, data, assetInfo) => {
 	if (typeof data.runtime === "string") {
 		replacements.set(
 			"runtime",
-			replacer(() => prepareId(/** @type {string} */ (data.runtime)))
+			replacer(() =>
+				(data.prepareId || prepareId)(/** @type {string} */ (data.runtime))
+			)
 		);
 	} else {
 		replacements.set("runtime", replacer("_"));
@@ -366,7 +369,7 @@ const replacePathVariables = (path, data, assetInfo) => {
 			const [, kind, arg] = contentMatch;
 			const replacer = replacements.get(kind);
 			if (replacer !== undefined) {
-				return replacer(match, arg, path);
+				return replacer(match, arg, /** @type {string} */ (path));
 			}
 		} else if (match.startsWith("[\\") && match.endsWith("\\]")) {
 			return `[${match.slice(2, -2)}]`;
@@ -386,7 +389,7 @@ class TemplatedPathPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(plugin, compilation => {
+		compiler.hooks.compilation.tap(plugin, (compilation) => {
 			compilation.hooks.assetPath.tap(plugin, replacePathVariables);
 		});
 	}

package/lib/UseStrictPlugin.js

@@ -36,7 +36,7 @@ class UseStrictPlugin {
 				 * @param {JavascriptParserOptions} parserOptions the javascript parser options
 				 */
 				const handler = (parser, parserOptions) => {
-					parser.hooks.program.tap(PLUGIN_NAME, ast => {
+					parser.hooks.program.tap(PLUGIN_NAME, (ast) => {
 						const firstNode = ast.body[0];
 						if (
 							firstNode &&

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -11,6 +11,8 @@ const CaseSensitiveModulesWarning = require("./CaseSensitiveModulesWarning");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./NormalModule")} NormalModule */
 
+const PLUGIN_NAME = "WarnCaseSensitiveModulesPlugin";
+
 class WarnCaseSensitiveModulesPlugin {
 	/**
 	 * Apply the plugin
@@ -18,47 +20,44 @@ class WarnCaseSensitiveModulesPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"WarnCaseSensitiveModulesPlugin",
-			compilation => {
-				compilation.hooks.seal.tap("WarnCaseSensitiveModulesPlugin", () => {
-					/** @type {Map<string, Map<string, Module>>} */
-					const moduleWithoutCase = new Map();
-					for (const module of compilation.modules) {
-						const identifier = module.identifier();
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.seal.tap(PLUGIN_NAME, () => {
+				/** @type {Map<string, Map<string, Module>>} */
+				const moduleWithoutCase = new Map();
+				for (const module of compilation.modules) {
+					const identifier = module.identifier();
 
-						// Ignore `data:` URLs, because it's not a real path
-						if (
-							/** @type {NormalModule} */
-							(module).resourceResolveData !== undefined &&
-							/** @type {NormalModule} */
-							(module).resourceResolveData.encodedContent !== undefined
-						) {
-							continue;
-						}
+					// Ignore `data:` URLs, because it's not a real path
+					if (
+						/** @type {NormalModule} */
+						(module).resourceResolveData !== undefined &&
+						/** @type {NormalModule} */
+						(module).resourceResolveData.encodedContent !== undefined
+					) {
+						continue;
+					}
 
-						const lowerIdentifier = identifier.toLowerCase();
-						let map = moduleWithoutCase.get(lowerIdentifier);
-						if (map === undefined) {
-							map = new Map();
-							moduleWithoutCase.set(lowerIdentifier, map);
-						}
-						map.set(identifier, module);
+					const lowerIdentifier = identifier.toLowerCase();
+					let map = moduleWithoutCase.get(lowerIdentifier);
+					if (map === undefined) {
+						map = new Map();
+						moduleWithoutCase.set(lowerIdentifier, map);
 					}
-					for (const pair of moduleWithoutCase) {
-						const map = pair[1];
-						if (map.size > 1) {
-							compilation.warnings.push(
-								new CaseSensitiveModulesWarning(
-									map.values(),
-									compilation.moduleGraph
-								)
-							);
-						}
+					map.set(identifier, module);
+				}
+				for (const pair of moduleWithoutCase) {
+					const map = pair[1];
+					if (map.size > 1) {
+						compilation.warnings.push(
+							new CaseSensitiveModulesWarning(
+								map.values(),
+								compilation.moduleGraph
+							)
+						);
 					}
-				});
-			}
-		);
+				}
+			});
+		});
 	}
 }
 

package/lib/WarnDeprecatedOptionPlugin.js

@@ -9,6 +9,8 @@ const WebpackError = require("./WebpackError");
 
 /** @typedef {import("./Compiler")} Compiler */
 
+const PLUGIN_NAME = "WarnDeprecatedOptionPlugin";
+
 class WarnDeprecatedOptionPlugin {
 	/**
 	 * Create an instance of the plugin
@@ -28,14 +30,11 @@ class WarnDeprecatedOptionPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"WarnDeprecatedOptionPlugin",
-			compilation => {
-				compilation.warnings.push(
-					new DeprecatedOptionWarning(this.option, this.value, this.suggestion)
-				);
-			}
-		);
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.warnings.push(
+				new DeprecatedOptionWarning(this.option, this.value, this.suggestion)
+			);
+		});
 	}
 }
 

package/lib/WarnNoModeSetPlugin.js

@@ -9,6 +9,8 @@ const NoModeWarning = require("./NoModeWarning");
 
 /** @typedef {import("./Compiler")} Compiler */
 
+const PLUGIN_NAME = "WarnNoModeSetPlugin";
+
 class WarnNoModeSetPlugin {
 	/**
 	 * Apply the plugin
@@ -16,7 +18,7 @@ class WarnNoModeSetPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap("WarnNoModeSetPlugin", compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.warnings.push(new NoModeWarning());
 		});
 	}

package/lib/WatchIgnorePlugin.js

@@ -9,14 +9,14 @@ const { groupBy } = require("./util/ArrayHelpers");
 const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/WatchIgnorePlugin").WatchIgnorePluginOptions} WatchIgnorePluginOptions */
-/** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./util/fs").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
 /** @typedef {import("./util/fs").WatchMethod} WatchMethod */
 /** @typedef {import("./util/fs").Watcher} Watcher */
+
 const validate = createSchemaValidation(
-	require("../schemas/plugins/WatchIgnorePlugin.check.js"),
+	require("../schemas/plugins/WatchIgnorePlugin.check"),
 	() => require("../schemas/plugins/WatchIgnorePlugin.json"),
 	{
 		name: "Watch Ignore Plugin",
@@ -38,24 +38,24 @@ class IgnoringWatchFileSystem {
 
 	/** @type {WatchMethod} */
 	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-		files = Array.from(files);
-		dirs = Array.from(dirs);
+		files = [...files];
+		dirs = [...dirs];
 		/**
 		 * @param {string} path path to check
 		 * @returns {boolean} true, if path is ignored
 		 */
-		const ignored = path =>
-			this.paths.some(p =>
+		const ignored = (path) =>
+			this.paths.some((p) =>
 				p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0
 			);
 
 		const [ignoredFiles, notIgnoredFiles] = groupBy(
-			/** @type {Array<string>} */
+			/** @type {string[]} */
 			(files),
 			ignored
 		);
 		const [ignoredDirs, notIgnoredDirs] = groupBy(
-			/** @type {Array<string>} */
+			/** @type {string[]} */
 			(dirs),
 			ignored
 		);
@@ -125,6 +125,8 @@ class IgnoringWatchFileSystem {
 	}
 }
 
+const PLUGIN_NAME = "WatchIgnorePlugin";
+
 class WatchIgnorePlugin {
 	/**
 	 * @param {WatchIgnorePluginOptions} options options
@@ -140,7 +142,7 @@ class WatchIgnorePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.afterEnvironment.tap("WatchIgnorePlugin", () => {
+		compiler.hooks.afterEnvironment.tap(PLUGIN_NAME, () => {
 			compiler.watchFileSystem = new IgnoringWatchFileSystem(
 				/** @type {WatchFileSystem} */
 				(compiler.watchFileSystem),

package/lib/Watching.js

@@ -10,20 +10,20 @@ const Stats = require("./Stats");
 /** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./FileSystemInfo").FileSystemInfoEntry} FileSystemInfoEntry */
+/** @typedef {import("./Compiler").ErrorCallback} ErrorCallback */
 /** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./util/fs").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
-/** @typedef {import("./util/fs").Watcher} Watcher */
 
 /**
  * @template T
- * @callback Callback
- * @param {Error | null} err
- * @param {T=} result
+ * @template [R=void]
+ * @typedef {import("./webpack").Callback<T, R>} Callback
  */
 
+/** @typedef {Set<string>} CollectedFiles */
+
 class Watching {
 	/**
 	 * @param {Compiler} compiler the compiler
@@ -34,9 +34,9 @@ class Watching {
 		this.startTime = null;
 		this.invalid = false;
 		this.handler = handler;
-		/** @type {Callback<void>[]} */
+		/** @type {ErrorCallback[]} */
 		this.callbacks = [];
-		/** @type {Callback<void>[] | undefined} */
+		/** @type {ErrorCallback[] | undefined} */
 		this._closeCallbacks = undefined;
 		this.closed = false;
 		this.suspended = false;
@@ -66,9 +66,9 @@ class Watching {
 		this._needRecords = true;
 		this.watcher = undefined;
 		this.pausedWatcher = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {CollectedFiles | undefined} */
 		this._collectedChangedFiles = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {CollectedFiles | undefined} */
 		this._collectedRemovedFiles = undefined;
 		this._done = this._done.bind(this);
 		process.nextTick(() => {
@@ -88,12 +88,12 @@ class Watching {
 		} else {
 			for (const file of changedFiles) {
 				this._collectedChangedFiles.add(file);
-				/** @type {Set<string>} */
+				/** @type {CollectedFiles} */
 				(this._collectedRemovedFiles).delete(file);
 			}
 			for (const file of /** @type {ReadonlySet<string>} */ (removedFiles)) {
 				this._collectedChangedFiles.delete(file);
-				/** @type {Set<string>} */
+				/** @type {CollectedFiles} */
 				(this._collectedRemovedFiles).add(file);
 			}
 		}
@@ -159,14 +159,14 @@ class Watching {
 
 		const run = () => {
 			if (this.compiler.idle) {
-				return this.compiler.cache.endIdle(err => {
+				return this.compiler.cache.endIdle((err) => {
 					if (err) return this._done(err);
 					this.compiler.idle = false;
 					run();
 				});
 			}
 			if (this._needRecords) {
-				return this.compiler.readRecords(err => {
+				return this.compiler.readRecords((err) => {
 					if (err) return this._done(err);
 
 					this._needRecords = false;
@@ -175,7 +175,7 @@ class Watching {
 			}
 			this.invalid = false;
 			this._invalidReported = false;
-			this.compiler.hooks.watchRun.callAsync(this.compiler, err => {
+			this.compiler.hooks.watchRun.callAsync(this.compiler, (err) => {
 				if (err) return this._done(err);
 				/**
 				 * @param {Error | null} err error
@@ -187,8 +187,6 @@ class Watching {
 
 					const compilation = /** @type {Compilation} */ (_compilation);
 
-					if (this.invalid) return this._done(null, compilation);
-
 					if (this.compiler.hooks.shouldEmit.call(compilation) === false) {
 						return this._done(null, compilation);
 					}
@@ -196,13 +194,13 @@ class Watching {
 					process.nextTick(() => {
 						const logger = compilation.getLogger("webpack.Compiler");
 						logger.time("emitAssets");
-						this.compiler.emitAssets(compilation, err => {
+						this.compiler.emitAssets(compilation, (err) => {
 							logger.timeEnd("emitAssets");
 							if (err) return this._done(err, compilation);
 							if (this.invalid) return this._done(null, compilation);
 
 							logger.time("emitRecords");
-							this.compiler.emitRecords(err => {
+							this.compiler.emitRecords((err) => {
 								logger.timeEnd("emitRecords");
 								if (err) return this._done(err, compilation);
 
@@ -215,11 +213,11 @@ class Watching {
 									compilation.endTime = Date.now();
 									logger.time("done hook");
 									const stats = new Stats(compilation);
-									this.compiler.hooks.done.callAsync(stats, err => {
+									this.compiler.hooks.done.callAsync(stats, (err) => {
 										logger.timeEnd("done hook");
 										if (err) return this._done(err, compilation);
 
-										this.compiler.hooks.additionalPass.callAsync(err => {
+										this.compiler.hooks.additionalPass.callAsync((err) => {
 											if (err) return this._done(err, compilation);
 											this.compiler.compile(onCompiled);
 										});
@@ -264,7 +262,7 @@ class Watching {
 
 		/**
 		 * @param {Error} err error
-		 * @param {Callback<void>[]=} cbs callbacks
+		 * @param {ErrorCallback[]=} cbs callbacks
 		 */
 		const handleError = (err, cbs) => {
 			this.compiler.hooks.failed.call(err);
@@ -288,7 +286,7 @@ class Watching {
 				logger.time("storeBuildDependencies");
 				this.compiler.cache.storeBuildDependencies(
 					compilation.buildDependencies,
-					err => {
+					(err) => {
 						logger.timeEnd("storeBuildDependencies");
 						if (err) return handleError(err);
 						this._go();
@@ -311,7 +309,7 @@ class Watching {
 		const cbs = this.callbacks;
 		this.callbacks = [];
 		logger.time("done hook");
-		this.compiler.hooks.done.callAsync(/** @type {Stats} */ (stats), err => {
+		this.compiler.hooks.done.callAsync(/** @type {Stats} */ (stats), (err) => {
 			logger.timeEnd("done hook");
 			if (err) return handleError(err, cbs);
 			this.handler(null, stats);
@@ -319,7 +317,7 @@ class Watching {
 			this.compiler.cache.storeBuildDependencies(
 				/** @type {Compilation} */
 				(compilation).buildDependencies,
-				err => {
+				(err) => {
 					logger.timeEnd("storeBuildDependencies");
 					if (err) return handleError(err, cbs);
 					logger.time("beginIdle");
@@ -395,7 +393,7 @@ class Watching {
 	}
 
 	/**
-	 * @param {Callback<void>=} callback signals when the build has completed again
+	 * @param {ErrorCallback=} callback signals when the build has completed again
 	 * @returns {void}
 	 */
 	invalidate(callback) {
@@ -453,7 +451,7 @@ class Watching {
 	}
 
 	/**
-	 * @param {Callback<void>} callback signals when the watcher is closed
+	 * @param {ErrorCallback} callback signals when the watcher is closed
 	 * @returns {void}
 	 */
 	close(callback) {
@@ -480,10 +478,10 @@ class Watching {
 			/**
 			 * @param {WebpackError | null} err error if any
 			 */
-			const shutdown = err => {
+			const shutdown = (err) => {
 				this.compiler.hooks.watchClose.call();
 				const closeCallbacks =
-					/** @type {Callback<void>[]} */
+					/** @type {ErrorCallback[]} */
 					(this._closeCallbacks);
 				this._closeCallbacks = undefined;
 				for (const cb of closeCallbacks) cb(err);
@@ -493,7 +491,7 @@ class Watching {
 				logger.time("storeBuildDependencies");
 				this.compiler.cache.storeBuildDependencies(
 					compilation.buildDependencies,
-					err2 => {
+					(err2) => {
 						logger.timeEnd("storeBuildDependencies");
 						shutdown(err || err2);
 					}

package/lib/WebpackError.js

@@ -18,9 +18,10 @@ class WebpackError extends Error {
 	/**
 	 * Creates an instance of WebpackError.
 	 * @param {string=} message error message
+	 * @param {{ cause?: unknown }} options error options
 	 */
-	constructor(message) {
-		super(message);
+	constructor(message, options = {}) {
+		super(message, options);
 
 		/** @type {string=} */
 		this.details = undefined;
@@ -37,7 +38,11 @@ class WebpackError extends Error {
 	}
 
 	[inspect]() {
-		return this.stack + (this.details ? `\n${this.details}` : "");
+		return (
+			this.stack +
+			(this.details ? `\n${this.details}` : "") +
+			(this.cause ? `\n${this.cause}` : "")
+		);
 	}
 
 	/**
@@ -47,6 +52,7 @@ class WebpackError extends Error {
 		write(this.name);
 		write(this.message);
 		write(this.stack);
+		write(this.cause);
 		write(this.details);
 		write(this.loc);
 		write(this.hideStack);
@@ -59,6 +65,7 @@ class WebpackError extends Error {
 		this.name = read();
 		this.message = read();
 		this.stack = read();
+		this.cause = read();
 		this.details = read();
 		this.loc = read();
 		this.hideStack = read();

package/lib/WebpackIsIncludedPlugin.js

@@ -16,10 +16,8 @@ const {
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 
-/** @typedef {import("enhanced-resolve").Resolver} Resolver */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./Module")} Module */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
@@ -47,16 +45,17 @@ class WebpackIsIncludedPlugin {
 				 * @param {JavascriptParser} parser the parser
 				 * @returns {void}
 				 */
-				const handler = parser => {
+				const handler = (parser) => {
 					parser.hooks.call
 						.for("__webpack_is_included__")
-						.tap(PLUGIN_NAME, expr => {
+						.tap(PLUGIN_NAME, (expr) => {
 							if (
 								expr.type !== "CallExpression" ||
 								expr.arguments.length !== 1 ||
 								expr.arguments[0].type === "SpreadElement"
-							)
+							) {
 								return;
+							}
 
 							const request = parser.evaluateExpression(expr.arguments[0]);