webpack 5.97.1 → 5.104.1

package/lib/AutomaticPrefetchPlugin.js

@@ -11,6 +11,8 @@ const PrefetchDependency = require("./dependencies/PrefetchDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
 
+const PLUGIN_NAME = "AutomaticPrefetchPlugin";
+
 class AutomaticPrefetchPlugin {
 	/**
 	 * Apply the plugin
@@ -19,7 +21,7 @@ class AutomaticPrefetchPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"AutomaticPrefetchPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyFactories.set(
 					PrefetchDependency,
@@ -29,7 +31,7 @@ class AutomaticPrefetchPlugin {
 		);
 		/** @type {{context: string | null, request: string}[] | null} */
 		let lastModules = null;
-		compiler.hooks.afterCompile.tap("AutomaticPrefetchPlugin", compilation => {
+		compiler.hooks.afterCompile.tap(PLUGIN_NAME, (compilation) => {
 			lastModules = [];
 
 			for (const m of compilation.modules) {
@@ -41,26 +43,24 @@ class AutomaticPrefetchPlugin {
 				}
 			}
 		});
-		compiler.hooks.make.tapAsync(
-			"AutomaticPrefetchPlugin",
-			(compilation, callback) => {
-				if (!lastModules) return callback();
-				asyncLib.each(
-					lastModules,
-					(m, callback) => {
-						compilation.addModuleChain(
-							m.context || compiler.context,
-							new PrefetchDependency(`!!${m.request}`),
-							callback
-						);
-					},
-					err => {
-						lastModules = null;
-						callback(err);
-					}
-				);
-			}
-		);
+		compiler.hooks.make.tapAsync(PLUGIN_NAME, (compilation, callback) => {
+			if (!lastModules) return callback();
+			asyncLib.each(
+				lastModules,
+				(m, callback) => {
+					compilation.addModuleChain(
+						m.context || compiler.context,
+						new PrefetchDependency(`!!${m.request}`),
+						callback
+					);
+				},
+				(err) => {
+					lastModules = null;
+					callback(err);
+				}
+			);
+		});
 	}
 }
+
 module.exports = AutomaticPrefetchPlugin;

package/lib/BannerPlugin.js

@@ -13,14 +13,13 @@ const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/BannerPlugin").BannerFunction} BannerFunction */
 /** @typedef {import("../declarations/plugins/BannerPlugin").BannerPluginArgument} BannerPluginArgument */
-/** @typedef {import("../declarations/plugins/BannerPlugin").BannerPluginOptions} BannerPluginOptions */
 /** @typedef {import("./Compilation").PathData} PathData */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 
 const validate = createSchemaValidation(
-	/** @type {(function(typeof import("../schemas/plugins/BannerPlugin.json")): boolean)} */
-	(require("../schemas/plugins/BannerPlugin.check.js")),
+	/** @type {((value: typeof import("../schemas/plugins/BannerPlugin.json")) => boolean)} */
+	(require("../schemas/plugins/BannerPlugin.check")),
 	() => require("../schemas/plugins/BannerPlugin.json"),
 	{
 		name: "Banner Plugin",
@@ -32,7 +31,7 @@ const validate = createSchemaValidation(
  * @param {string} str string to wrap
  * @returns {string} wrapped string
  */
-const wrapComment = str => {
+const wrapComment = (str) => {
 	if (!str.includes("\n")) {
 		return Template.toComment(str);
 	}
@@ -44,6 +43,8 @@ const wrapComment = str => {
 		.trimEnd()}\n */`;
 };
 
+const PLUGIN_NAME = "BannerPlugin";
+
 class BannerPlugin {
 	/**
 	 * @param {BannerPluginArgument} options options object
@@ -65,7 +66,7 @@ class BannerPlugin {
 			/** @type {BannerFunction} */
 			this.banner = this.options.raw
 				? getBanner
-				: /** @type {BannerFunction} */ data => wrapComment(getBanner(data));
+				: /** @type {BannerFunction} */ (data) => wrapComment(getBanner(data));
 		} else {
 			const banner = this.options.raw
 				? bannerOption
@@ -91,47 +92,41 @@ class BannerPlugin {
 		const stage =
 			this.options.stage || Compilation.PROCESS_ASSETS_STAGE_ADDITIONS;
 
-		compiler.hooks.compilation.tap("BannerPlugin", compilation => {
-			compilation.hooks.processAssets.tap(
-				{
-					name: "BannerPlugin",
-					stage
-				},
-				() => {
-					for (const chunk of compilation.chunks) {
-						if (options.entryOnly && !chunk.canBeInitial()) {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.processAssets.tap({ name: PLUGIN_NAME, stage }, () => {
+				for (const chunk of compilation.chunks) {
+					if (options.entryOnly && !chunk.canBeInitial()) {
+						continue;
+					}
+
+					for (const file of chunk.files) {
+						if (!matchObject(file)) {
 							continue;
 						}
 
-						for (const file of chunk.files) {
-							if (!matchObject(file)) {
-								continue;
+						/** @type {PathData} */
+						const data = { chunk, filename: file };
+
+						const comment = compilation.getPath(
+							/** @type {TemplatePath} */
+							(banner),
+							data
+						);
+
+						compilation.updateAsset(file, (old) => {
+							const cached = cache.get(old);
+							if (!cached || cached.comment !== comment) {
+								const source = options.footer
+									? new ConcatSource(old, "\n", comment)
+									: new ConcatSource(comment, "\n", old);
+								cache.set(old, { source, comment });
+								return source;
 							}
-
-							/** @type {PathData} */
-							const data = { chunk, filename: file };
-
-							const comment = compilation.getPath(
-								/** @type {TemplatePath} */
-								(banner),
-								data
-							);
-
-							compilation.updateAsset(file, old => {
-								const cached = cache.get(old);
-								if (!cached || cached.comment !== comment) {
-									const source = options.footer
-										? new ConcatSource(old, "\n", comment)
-										: new ConcatSource(comment, "\n", old);
-									cache.set(old, { source, comment });
-									return source;
-								}
-								return cached.source;
-							});
-						}
+							return cached.source;
+						});
 					}
 				}
-			);
+			});
 		});
 	}
 }

package/lib/Cache.js

@@ -15,7 +15,7 @@ const {
 
 /**
  * @typedef {object} Etag
- * @property {function(): string} toString
+ * @property {() => string} toString
  */
 
 /**
@@ -26,19 +26,22 @@ const {
  * @returns {void}
  */
 
+/** @typedef {EXPECTED_ANY} Data */
+
 /**
+ * @template T
  * @callback GotHandler
- * @param {any} result
- * @param {function(Error=): void} callback
+ * @param {T} result
+ * @param {() => void} callback
  * @returns {void}
  */
 
 /**
  * @param {number} times times
- * @param {function(Error=): void} callback callback
- * @returns {function(Error=): void} callback
+ * @param {(err?: Error | null) => void} callback callback
+ * @returns {(err?: Error | null) => void} callback
  */
-const needCalls = (times, callback) => err => {
+const needCalls = (times, callback) => (err) => {
 	if (--times === 0) {
 		return callback(err);
 	}
@@ -51,9 +54,9 @@ const needCalls = (times, callback) => err => {
 class Cache {
 	constructor() {
 		this.hooks = {
-			/** @type {AsyncSeriesBailHook<[string, Etag | null, GotHandler[]], any>} */
+			/** @type {AsyncSeriesBailHook<[string, Etag | null, GotHandler<EXPECTED_ANY>[]], Data>} */
 			get: new AsyncSeriesBailHook(["identifier", "etag", "gotHandlers"]),
-			/** @type {AsyncParallelHook<[string, Etag | null, any]>} */
+			/** @type {AsyncParallelHook<[string, Etag | null, Data]>} */
 			store: new AsyncParallelHook(["identifier", "etag", "data"]),
 			/** @type {AsyncParallelHook<[Iterable<string>]>} */
 			storeBuildDependencies: new AsyncParallelHook(["dependencies"]),
@@ -74,7 +77,7 @@ class Cache {
 	 * @returns {void}
 	 */
 	get(identifier, etag, callback) {
-		/** @type {GotHandler[]} */
+		/** @type {GotHandler<T>[]} */
 		const gotHandlers = [];
 		this.hooks.get.callAsync(identifier, etag, gotHandlers, (err, result) => {
 			if (err) {

package/lib/CacheFacade.js

@@ -12,7 +12,6 @@ const mergeEtags = require("./cache/mergeEtags");
 
 /** @typedef {import("./Cache")} Cache */
 /** @typedef {import("./Cache").Etag} Etag */
-/** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./cache/getLazyHashedEtag").HashableObject} HashableObject */
 /** @typedef {typeof import("./util/Hash")} HashConstructor */
 
@@ -38,8 +37,9 @@ class MultiItemCache {
 	 */
 	constructor(items) {
 		this._items = items;
+		// @ts-expect-error expected - returns the single ItemCacheFacade when passed an array of length 1
 		// eslint-disable-next-line no-constructor-return
-		if (items.length === 1) return /** @type {any} */ (items[0]);
+		if (items.length === 1) return /** @type {ItemCacheFacade} */ (items[0]);
 	}
 
 	/**
@@ -60,8 +60,8 @@ class MultiItemCache {
 		 * @param {number} i index
 		 * @returns {Promise<T>} promise with the data
 		 */
-		const next = i =>
-			this._items[i].getPromise().then(result => {
+		const next = (i) =>
+			this._items[i].getPromise().then((result) => {
 				if (result !== undefined) return result;
 				if (++i < this._items.length) return next(i);
 			});
@@ -88,7 +88,7 @@ class MultiItemCache {
 	 * @returns {Promise<void>} promise signals when the value is stored
 	 */
 	storePromise(data) {
-		return Promise.all(this._items.map(item => item.storePromise(data))).then(
+		return Promise.all(this._items.map((item) => item.storePromise(data))).then(
 			() => {}
 		);
 	}
@@ -148,7 +148,7 @@ class ItemCacheFacade {
 	 */
 	storePromise(data) {
 		return new Promise((resolve, reject) => {
-			this._cache.store(this._name, this._etag, data, err => {
+			this._cache.store(this._name, this._etag, data, (err) => {
 				if (err) {
 					reject(err);
 				} else {
@@ -160,7 +160,7 @@ class ItemCacheFacade {
 
 	/**
 	 * @template T
-	 * @param {function(CallbackNormalErrorCache<T>): void} computer function to compute the value if not cached
+	 * @param {(callback: CallbackNormalErrorCache<T>) => void} computer function to compute the value if not cached
 	 * @param {CallbackNormalErrorCache<T>} callback signals when the value is retrieved
 	 * @returns {void}
 	 */
@@ -170,7 +170,7 @@ class ItemCacheFacade {
 			if (cacheEntry !== undefined) return cacheEntry;
 			computer((err, result) => {
 				if (err) return callback(err);
-				this.store(result, err => {
+				this.store(result, (err) => {
 					if (err) return callback(err);
 					callback(null, result);
 				});
@@ -180,7 +180,7 @@ class ItemCacheFacade {
 
 	/**
 	 * @template T
-	 * @param {function(): Promise<T> | T} computer function to compute the value if not cached
+	 * @param {() => Promise<T> | T} computer function to compute the value if not cached
 	 * @returns {Promise<T>} promise with the data
 	 */
 	async providePromise(computer) {
@@ -296,7 +296,7 @@ class CacheFacade {
 	 */
 	storePromise(identifier, etag, data) {
 		return new Promise((resolve, reject) => {
-			this._cache.store(`${this._name}|${identifier}`, etag, data, err => {
+			this._cache.store(`${this._name}|${identifier}`, etag, data, (err) => {
 				if (err) {
 					reject(err);
 				} else {
@@ -310,7 +310,7 @@ class CacheFacade {
 	 * @template T
 	 * @param {string} identifier the cache identifier
 	 * @param {Etag | null} etag the etag
-	 * @param {function(CallbackNormalErrorCache<T>): void} computer function to compute the value if not cached
+	 * @param {(callback: CallbackNormalErrorCache<T>) => void} computer function to compute the value if not cached
 	 * @param {CallbackNormalErrorCache<T>} callback signals when the value is retrieved
 	 * @returns {void}
 	 */
@@ -320,7 +320,7 @@ class CacheFacade {
 			if (cacheEntry !== undefined) return cacheEntry;
 			computer((err, result) => {
 				if (err) return callback(err);
-				this.store(identifier, etag, result, err => {
+				this.store(identifier, etag, result, (err) => {
 					if (err) return callback(err);
 					callback(null, result);
 				});
@@ -332,7 +332,7 @@ class CacheFacade {
 	 * @template T
 	 * @param {string} identifier the cache identifier
 	 * @param {Etag | null} etag the etag
-	 * @param {function(): Promise<T> | T} computer function to compute the value if not cached
+	 * @param {() => Promise<T> | T} computer function to compute the value if not cached
 	 * @returns {Promise<T>} promise with the data
 	 */
 	async providePromise(identifier, etag, computer) {

package/lib/CaseSensitiveModulesWarning.js

@@ -14,7 +14,7 @@ const WebpackError = require("./WebpackError");
  * @param {Module[]} modules the modules to be sorted
  * @returns {Module[]} sorted version of original modules
  */
-const sortModules = modules =>
+const sortModules = (modules) =>
 	modules.sort((a, b) => {
 		const aIdent = a.identifier();
 		const bIdent = b.identifier();
@@ -33,11 +33,11 @@ const sortModules = modules =>
  */
 const createModulesListMessage = (modules, moduleGraph) =>
 	modules
-		.map(m => {
+		.map((m) => {
 			let message = `* ${m.identifier()}`;
-			const validReasons = Array.from(
-				moduleGraph.getIncomingConnectionsByOriginModule(m).keys()
-			).filter(Boolean);
+			const validReasons = [
+				...moduleGraph.getIncomingConnectionsByOriginModule(m).keys()
+			].filter(Boolean);
 
 			if (validReasons.length > 0) {
 				message += `\n    Used by ${validReasons.length} module(s), i. e.`;
@@ -56,7 +56,7 @@ class CaseSensitiveModulesWarning extends WebpackError {
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 */
 	constructor(modules, moduleGraph) {
-		const sortedModules = sortModules(Array.from(modules));
+		const sortedModules = sortModules([...modules]);
 		const modulesList = createModulesListMessage(sortedModules, moduleGraph);
 		super(`There are multiple modules with names that only differ in casing.
 This can lead to unexpected behavior when compiling on a filesystem with other case-semantic.