webpack 5.99.9 → 5.100.1

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -14,13 +14,13 @@ const AggressiveSplittingPlugin = require("../optimize/AggressiveSplittingPlugin
 const SizeLimitsPlugin = require("../performance/SizeLimitsPlugin");
 const { countIterable } = require("../util/IterableHelpers");
 const {
-	compareLocations,
 	compareChunksById,
-	compareNumbers,
 	compareIds,
-	concatComparators,
+	compareLocations,
+	compareModulesByIdentifier,
+	compareNumbers,
 	compareSelect,
-	compareModulesByIdentifier
+	concatComparators
 } = require("../util/comparators");
 const { makePathsRelative, parseResource } = require("../util/identifier");
 
@@ -358,7 +358,7 @@ const uniqueArray = (items, selector) => {
 			set.add(i);
 		}
 	}
-	return Array.from(set);
+	return [...set];
 };
 
 /**
@@ -495,7 +495,7 @@ const EXTRACT_ERROR = {
 	errorDetails: (
 		object,
 		error,
-		{ type, compilation, cachedGetErrors, cachedGetWarnings },
+		{ type, compilation, cachedGetErrors },
 		{ errorDetails }
 	) => {
 		if (
@@ -582,6 +582,7 @@ const SIMPLE_EXTRACTORS = {
 			const { logging, loggingDebug, loggingTrace } = options;
 			if (logging || (loggingDebug && loggingDebug.length > 0)) {
 				const util = require("util");
+
 				object.logging = {};
 				let acceptedTypes;
 				let collapsedGroups = false;
@@ -654,8 +655,9 @@ const SIMPLE_EXTRACTORS = {
 						if (
 							type === LogType.groupCollapsed &&
 							(debugMode || collapsedGroups)
-						)
+						) {
 							type = LogType.group;
+						}
 
 						if (depthInCollapsedGroup === 0) {
 							processedLogEntries++;
@@ -821,15 +823,11 @@ const SIMPLE_EXTRACTORS = {
 				}
 			}
 
-			const groupedAssets = factory.create(
-				`${type}.assets`,
-				Array.from(assets),
-				{
-					...context,
-					compilationFileToChunks,
-					compilationAuxiliaryFileToChunks
-				}
-			);
+			const groupedAssets = factory.create(`${type}.assets`, [...assets], {
+				...context,
+				compilationFileToChunks,
+				compilationAuxiliaryFileToChunks
+			});
 			const limited = spaceLimited(
 				groupedAssets,
 				/** @type {number} */ (options.assetsSpace)
@@ -841,13 +839,13 @@ const SIMPLE_EXTRACTORS = {
 			const { type } = context;
 			object.chunks = factory.create(
 				`${type}.chunks`,
-				Array.from(compilation.chunks),
+				[...compilation.chunks],
 				context
 			);
 		},
 		modules: (object, compilation, context, options, factory) => {
 			const { type } = context;
-			const array = Array.from(compilation.modules);
+			const array = [...compilation.modules];
 			const groupedModules = factory.create(`${type}.modules`, array, context);
 			const limited = spaceLimited(groupedModules, options.modulesSpace);
 			object.modules = limited.children;
@@ -980,9 +978,10 @@ const SIMPLE_EXTRACTORS = {
 					!warningsFilter &&
 					/** @type {KnownNormalizedStatsOptions["warningsFilter"]} */
 					(warningsFilter).length === 0
-				)
+				) {
 					// Type is wrong, because we don't need the real value for counting
 					return /** @type {EXPECTED_ANY[]} */ (cachedGetWarnings(c));
+				}
 				return factory
 					.create(`${type}${childType}.warnings`, cachedGetWarnings(c), context)
 					.filter(
@@ -1038,7 +1037,7 @@ const SIMPLE_EXTRACTORS = {
 		_: (
 			object,
 			asset,
-			{ compilation, compilationFileToChunks, compilationAuxiliaryFileToChunks }
+			{ compilationFileToChunks, compilationAuxiliaryFileToChunks }
 		) => {
 			const chunks = compilationFileToChunks.get(asset.name) || [];
 			const auxiliaryChunks =
@@ -1050,7 +1049,7 @@ const SIMPLE_EXTRACTORS = {
 			);
 			object.chunkIdHints = uniqueOrderedArray(
 				chunks,
-				c => Array.from(c.idNameHints),
+				c => [...c.idNameHints],
 				compareIds
 			);
 			object.auxiliaryChunkNames = uniqueOrderedArray(
@@ -1060,7 +1059,7 @@ const SIMPLE_EXTRACTORS = {
 			);
 			object.auxiliaryChunkIdHints = uniqueOrderedArray(
 				auxiliaryChunks,
-				c => Array.from(c.idNameHints),
+				c => [...c.idNameHints],
 				compareIds
 			);
 			object.filteredRelated = asset.related ? asset.related.length : undefined;
@@ -1200,7 +1199,7 @@ const SIMPLE_EXTRACTORS = {
 									}
 								}
 							}
-							return Array.from(set);
+							return [...set];
 						})
 					: undefined
 			};
@@ -1330,7 +1329,7 @@ const SIMPLE_EXTRACTORS = {
 			} = context;
 			const groupsReasons = factory.create(
 				`${type.slice(0, -8)}.reasons`,
-				Array.from(moduleGraph.getIncomingConnections(module)),
+				[...moduleGraph.getIncomingConnections(module)],
 				context
 			);
 			const limited = spaceLimited(
@@ -1352,7 +1351,7 @@ const SIMPLE_EXTRACTORS = {
 			} else if (typeof usedExports === "boolean") {
 				object.usedExports = usedExports;
 			} else {
-				object.usedExports = Array.from(usedExports);
+				object.usedExports = [...usedExports];
 			}
 		},
 		providedExports: (object, module, { compilation: { moduleGraph } }) => {
@@ -1506,15 +1505,15 @@ const SIMPLE_EXTRACTORS = {
 				size: chunkGraph.getChunkModulesSize(chunk),
 				sizes: chunkGraph.getChunkModulesSizes(chunk),
 				names: chunk.name ? [chunk.name] : [],
-				idHints: Array.from(chunk.idNameHints),
+				idHints: [...chunk.idNameHints],
 				runtime:
 					chunk.runtime === undefined
 						? undefined
 						: typeof chunk.runtime === "string"
 							? [makePathsRelative(chunk.runtime)]
 							: Array.from(chunk.runtime.sort(), makePathsRelative),
-				files: Array.from(chunk.files),
-				auxiliaryFiles: Array.from(chunk.auxiliaryFiles).sort(compareIds),
+				files: [...chunk.files],
+				auxiliaryFiles: [...chunk.auxiliaryFiles].sort(compareIds),
 				hash: /** @type {string} */ (chunk.renderedHash),
 				childrenByOrder: childIdByOrder
 			};
@@ -1523,7 +1522,7 @@ const SIMPLE_EXTRACTORS = {
 		ids: (object, chunk) => {
 			object.id = /** @type {ChunkId} */ (chunk.id);
 		},
-		chunkRelations: (object, chunk, { compilation: { chunkGraph } }) => {
+		chunkRelations: (object, chunk, _context) => {
 			/** @type {Set<string|number>} */
 			const parents = new Set();
 			/** @type {Set<string|number>} */
@@ -1543,13 +1542,14 @@ const SIMPLE_EXTRACTORS = {
 					}
 				}
 				for (const sibling of chunkGroup.chunks) {
-					if (sibling !== chunk)
+					if (sibling !== chunk) {
 						siblings.add(/** @type {ChunkId} */ (sibling.id));
+					}
 				}
 			}
-			object.siblings = Array.from(siblings).sort(compareIds);
-			object.parents = Array.from(parents).sort(compareIds);
-			object.children = Array.from(children).sort(compareIds);
+			object.siblings = [...siblings].sort(compareIds);
+			object.parents = [...parents].sort(compareIds);
+			object.children = [...children].sort(compareIds);
 		},
 		chunkModules: (object, chunk, context, options, factory) => {
 			const {
@@ -1624,15 +1624,13 @@ const SIMPLE_EXTRACTORS = {
 			object.originName = origin.readableIdentifier(requestShortener);
 			object.moduleIdentifier = module.identifier();
 			object.moduleName = module.readableIdentifier(requestShortener);
-			const dependencies = Array.from(
-				moduleGraph.getIncomingConnections(module)
-			)
+			const dependencies = [...moduleGraph.getIncomingConnections(module)]
 				.filter(c => c.resolvedOriginModule === origin && c.dependency)
 				.map(c => c.dependency);
 			object.dependencies = factory.create(
 				`${type}.dependencies`,
 				/** @type {Dependency[]} */
-				(Array.from(new Set(dependencies))),
+				([...new Set(dependencies)]),
 				context
 			);
 		},
@@ -1705,7 +1703,7 @@ const SORTERS = {
 	"chunk.modules": MODULES_SORTER,
 	"module.modules": MODULES_SORTER,
 	"module.reasons": {
-		_: (comparators, { compilation: { chunkGraph } }) => {
+		_: (comparators, _context) => {
 			comparators.push(
 				compareSelect(x => x.originModule, compareModulesByIdentifier)
 			);
@@ -1868,7 +1866,7 @@ const spaceLimited = (
 	if (groupsSize + items.length <= max) {
 		// The total size in the current state fits into the max
 		// keep all
-		children = groups.length > 0 ? groups.concat(items) : items;
+		children = groups.length > 0 ? [...groups, ...items] : items;
 	} else if (groups.length === 0) {
 		// slice items to max
 		// inner space marks that lines for filteredChildren already reserved
@@ -1931,7 +1929,7 @@ const spaceLimited = (
 					}
 				}
 			}
-			children = groups.concat(items);
+			children = [...groups, ...items];
 		} else if (limit === max) {
 			// If we have only enough space to show one line per group and one line for the filtered items
 			// collapse all groups and items
@@ -1956,7 +1954,7 @@ const errorsSpaceLimit = (errors, max) => {
 	let filtered = 0;
 	// Can not fit into limit
 	// print only messages
-	if (errors.length + 1 >= max)
+	if (errors.length + 1 >= max) {
 		return [
 			errors.map(error => {
 				if (typeof error === "string" || !error.details) return error;
@@ -1965,6 +1963,7 @@ const errorsSpaceLimit = (errors, max) => {
 			}),
 			filtered
 		];
+	}
 	let fullLength = errors.length;
 	let result = errors;
 
@@ -2123,12 +2122,13 @@ const ASSETS_GROUPERS = {
 					const keys = [];
 					if (groupAssetsByPath) {
 						keys.push(".");
-						if (extension)
+						if (extension) {
 							keys.push(
 								path.length
 									? `${path.join("/")}/*${extension}`
 									: `*${extension}`
 							);
+						}
 						while (path.length > 0) {
 							keys.push(`${path.join("/")}/`);
 							path.pop();
@@ -2147,7 +2147,7 @@ const ASSETS_GROUPERS = {
 			});
 		}
 	},
-	groupAssetsByInfo: (groupConfigs, context, options) => {
+	groupAssetsByInfo: (groupConfigs, _context, _options) => {
 		/**
 		 * @param {string} name name
 		 */
@@ -2168,7 +2168,7 @@ const ASSETS_GROUPERS = {
 		groupByAssetInfoFlag("development");
 		groupByAssetInfoFlag("hotModuleReplacement");
 	},
-	groupAssetsByChunk: (groupConfigs, context, options) => {
+	groupAssetsByChunk: (groupConfigs, _context, _options) => {
 		/**
 		 * @param {keyof KnownStatsAsset} name name
 		 */
@@ -2319,12 +2319,13 @@ const MODULES_GROUPERS = type => ({
 					const path = pathMatch ? pathMatch[1].split(/[/\\]/) : [];
 					const keys = [];
 					if (groupModulesByPath) {
-						if (extension)
+						if (extension) {
 							keys.push(
 								path.length
 									? `${path.join("/")}/*${extension}`
 									: `*${extension}`
 							);
+						}
 						while (path.length > 0) {
 							keys.push(`${path.join("/")}/`);
 							path.pop();
@@ -2511,8 +2512,9 @@ const iterateConfig = (config, options, fn) => {
 						value === false ||
 						value === undefined ||
 						(Array.isArray(value) && value.length === 0)
-					)
+					) {
 						continue;
+					}
 				}
 			}
 			fn(hookFor, subConfig[option]);
@@ -2684,4 +2686,5 @@ class DefaultStatsFactoryPlugin {
 		});
 	}
 }
+
 module.exports = DefaultStatsFactoryPlugin;

package/lib/stats/DefaultStatsPresetPlugin.js

@@ -182,7 +182,7 @@ const AUTO_FOR_TO_STRING = ({ all }, { forToString }) => {
 /** @typedef {keyof NormalizedStatsOptions} DefaultsKeys */
 /** @typedef {{ [Key in DefaultsKeys]: (options: Partial<NormalizedStatsOptions>, context: CreateStatsOptionsContext, compilation: Compilation) => NormalizedStatsOptions[Key] | RequestShortener }} Defaults */
 
-/** @type {Partial<Defaults>} */
+/** @type {Defaults} */
 const DEFAULTS = {
 	context: (options, context, compilation) => compilation.compiler.context,
 	requestShortener: (options, context, compilation) =>
@@ -307,9 +307,9 @@ const normalizeFilter = item => {
 };
 
 /** @typedef {keyof (KnownNormalizedStatsOptions | StatsOptions)} NormalizerKeys */
-/** @typedef {{ [Key in NormalizerKeys]: (value: StatsOptions[Key]) => KnownNormalizedStatsOptions[Key] }} Normalizers */
+/** @typedef {{ [Key in NormalizerKeys]?: (value: StatsOptions[Key]) => KnownNormalizedStatsOptions[Key] }} Normalizers */
 
-/** @type {Partial<Normalizers>} */
+/** @type {Normalizers} */
 const NORMALIZER = {
 	excludeModules: value => {
 		if (!Array.isArray(value)) {
@@ -384,28 +384,28 @@ class DefaultStatsPresetPlugin {
 				const defaults = NAMED_PRESETS[/** @type {keyof NamedPresets} */ (key)];
 				compilation.hooks.statsPreset
 					.for(key)
-					.tap(PLUGIN_NAME, (options, context) => {
+					.tap(PLUGIN_NAME, (options, _context) => {
 						applyDefaults(options, defaults);
 					});
 			}
 			compilation.hooks.statsNormalize.tap(PLUGIN_NAME, (options, context) => {
 				for (const key of Object.keys(DEFAULTS)) {
-					if (options[key] === undefined)
-						options[key] =
-							/** @type {Defaults[DefaultsKeys]} */
-							(DEFAULTS[/** @type {DefaultsKeys} */ (key)])(
-								options,
-								context,
-								compilation
-							);
+					if (options[key] === undefined) {
+						options[key] = DEFAULTS[/** @type {DefaultsKeys} */ (key)](
+							options,
+							context,
+							compilation
+						);
+					}
 				}
 				for (const key of Object.keys(NORMALIZER)) {
 					options[key] =
-						/** @type {TODO} */
+						/** @type {NonNullable<Normalizers[keyof Normalizers]>} */
 						(NORMALIZER[/** @type {NormalizerKeys} */ (key)])(options[key]);
 				}
 			});
 		});
 	}
 }
+
 module.exports = DefaultStatsPresetPlugin;

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -277,8 +277,9 @@ const COMPILATION_SIMPLE_PRINTERS = {
 			(errorsCount === 0 && warningsCount === 0) ||
 			timeMessage ||
 			hashMessage
-		)
+		) {
 			return `${builtAtMessage}${subjectMessage} ${statusMessage}${timeMessage}${hashMessage}`;
+		}
 	},
 	"compilation.filteredWarningDetailsCount": count =>
 		count
@@ -493,7 +494,7 @@ const MODULE_SIMPLE_PRINTERS = {
 		const [prefix, resource] = getModuleName(name);
 		return `${prefix || ""}${bold(resource || "")}`;
 	},
-	"module.identifier": identifier => undefined,
+	"module.identifier": _identifier => undefined,
 	"module.layer": (layer, { formatLayer }) =>
 		layer ? formatLayer(layer) : undefined,
 	"module.sizes": printSizes,
@@ -547,8 +548,9 @@ const MODULE_SIMPLE_PRINTERS = {
 			if (usedExports === null) return cyan(formatFlag("used exports unknown"));
 			if (usedExports === false) return cyan(formatFlag("module unused"));
 			if (Array.isArray(usedExports)) {
-				if (usedExports.length === 0)
+				if (usedExports.length === 0) {
 					return cyan(formatFlag("no exports used"));
+				}
 				const providedExportsCount = Array.isArray(module.providedExports)
 					? module.providedExports.length
 					: null;
@@ -569,7 +571,7 @@ const MODULE_SIMPLE_PRINTERS = {
 		yellow(optimizationBailout),
 	"module.issuerPath": (issuerPath, { module }) =>
 		module.profile ? undefined : "",
-	"module.profile": profile => undefined,
+	"module.profile": _profile => undefined,
 	"module.filteredModules": (filteredModules, { module: { modules } }) =>
 		filteredModules > 0
 			? `${moreCount(modules, filteredModules)} nested ${plural(
@@ -829,7 +831,7 @@ const ERROR_PRINTERS = {
 					"  "
 				)
 			: undefined,
-	"error.moduleTrace": moduleTrace => undefined,
+	"error.moduleTrace": _moduleTrace => undefined,
 	"error.separator!": () => "\n"
 };
 
@@ -1407,15 +1409,17 @@ const SIMPLE_ELEMENT_JOINERS = {
 			items.map(item => {
 				switch (item.element) {
 					case "moduleId":
-						if (moduleReason.moduleId === moduleReason.module && item.content)
+						if (moduleReason.moduleId === moduleReason.module && item.content) {
 							hasName = true;
+						}
 						break;
 					case "module":
 						if (hasName) return false;
 						break;
 					case "resolvedModule":
-						if (moduleReason.module === moduleReason.resolvedModule)
+						if (moduleReason.module === moduleReason.resolvedModule) {
 							return false;
+						}
 						break;
 					case "children":
 						if (item.content) {
@@ -1564,7 +1568,7 @@ const RESULT_MODIFIER = {
  * @returns {string[]} result
  */
 const createOrder = (array, preferredOrder) => {
-	const originalArray = array.slice();
+	const originalArray = [...array];
 	/** @type {Set<string>} */
 	const set = new Set(array);
 	/** @type {Set<string>} */
@@ -1621,6 +1625,7 @@ class DefaultStatsPrinterPlugin {
 									`${start}${
 										typeof str === "string"
 											? str.replace(
+													// eslint-disable-next-line no-control-regex
 													/((\u001B\[39m|\u001B\[22m|\u001B\[0m)+)/g,
 													`$1${start}`
 												)
@@ -1851,7 +1856,7 @@ class DefaultStatsPrinterPlugin {
 					const preferredOrder = PREFERRED_ORDERS[key];
 					stats.hooks.sortElements
 						.for(key)
-						.tap(PLUGIN_NAME, (elements, context) => {
+						.tap(PLUGIN_NAME, (elements, _context) => {
 							createOrder(elements, preferredOrder);
 						});
 				}
@@ -1886,4 +1891,5 @@ class DefaultStatsPrinterPlugin {
 		});
 	}
 }
+
 module.exports = DefaultStatsPrinterPlugin;

package/lib/stats/StatsFactory.js

@@ -121,7 +121,8 @@ class StatsFactory {
 			getItemFactory: new HookMap(() => new SyncBailHook(["item", "context"]))
 		});
 		const hooks = this.hooks;
-		this._caches = /** @type {TODO} */ ({});
+		this._caches =
+			/** @type {{ [Key in keyof StatsFactoryHooks]: Map<string, SyncBailHook<EXPECTED_ANY, EXPECTED_ANY>[]> }} */ ({});
 		for (const key of Object.keys(hooks)) {
 			this._caches[/** @type {keyof StatsFactoryHooks} */ (key)] = new Map();
 		}
@@ -205,7 +206,7 @@ class StatsFactory {
 	 */
 	_forEachLevelFilter(hookMap, cache, type, items, fn, forceClone) {
 		const hooks = this._getAllLevelHooks(hookMap, cache, type);
-		if (hooks.length === 0) return forceClone ? items.slice() : items;
+		if (hooks.length === 0) return forceClone ? [...items] : items;
 		let i = 0;
 		return items.filter((item, idx) => {
 			for (const hook of hooks) {
@@ -236,8 +237,9 @@ class StatsFactory {
 			this._inCreate = true;
 			return this._create(type, data, baseContext);
 		} finally {
-			for (const key of Object.keys(this._caches))
+			for (const key of Object.keys(this._caches)) {
 				this._caches[/** @type {keyof StatsFactoryHooks} */ (key)].clear();
+			}
 			this._inCreate = false;
 		}
 	}
@@ -397,4 +399,5 @@ class StatsFactory {
 		);
 	}
 }
+
 module.exports = StatsFactory;

package/lib/stats/StatsPrinter.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { HookMap, SyncWaterfallHook, SyncBailHook } = require("tapable");
+const { HookMap, SyncBailHook, SyncWaterfallHook } = require("tapable");
 
 /** @typedef {import("./DefaultStatsFactoryPlugin").StatsAsset} StatsAsset */
 /** @typedef {import("./DefaultStatsFactoryPlugin").StatsChunk} StatsChunk */
@@ -102,9 +102,7 @@ class StatsPrinter {
 			print: new HookMap(() => new SyncBailHook(["object", "context"])),
 			result: new HookMap(() => new SyncWaterfallHook(["result", "context"]))
 		});
-		/**
-		 * @type {TODO}
-		 */
+		/** @type {Map<StatsPrintHooks[keyof StatsPrintHooks], Map<string, import("tapable").Hook<EXPECTED_ANY, EXPECTED_ANY>[]>>} */
 		this._levelHookCache = new Map();
 		this._inPrint = false;
 	}
@@ -126,7 +124,7 @@ class StatsPrinter {
 		}
 		const cacheEntry = cache.get(type);
 		if (cacheEntry !== undefined) {
-			return cacheEntry;
+			return /** @type {H[]} */ (cacheEntry);
 		}
 		/** @type {H[]} */
 		const hooks = [];
@@ -146,7 +144,7 @@ class StatsPrinter {
 	 * @private
 	 * @template {StatsPrintHooks[keyof StatsPrintHooks]} HM
 	 * @template {HM extends HookMap<infer H> ? H : never} H
-	 * @template {H extends import("tapable").Hook<any, infer R> ? R : never} R
+	 * @template {H extends import("tapable").Hook<EXPECTED_ANY, infer R> ? R : never} R
 	 * @param {HM} hookMap hook map
 	 * @param {string} type type
 	 * @param {(hooK: H) => R | undefined | void} fn fn
@@ -217,7 +215,7 @@ class StatsPrinter {
 		);
 		if (printResult === undefined) {
 			if (Array.isArray(object)) {
-				const sortedItems = object.slice();
+				const sortedItems = [...object];
 				this._forEachLevel(this.hooks.sortItems, type, h =>
 					h.call(
 						sortedItems,
@@ -298,4 +296,5 @@ class StatsPrinter {
 		);
 	}
 }
+
 module.exports = StatsPrinter;