webpack 5.99.8 → 5.100.0

package/README.md

@@ -9,7 +9,6 @@
 
 [![node][node]][node-url]
 [![builds1][builds1]][builds1-url]
-[![builds2][builds2]][builds2-url]
 [![dependency-review][dependency-review]][dependency-review-url]
 [![coverage][cover]][cover-url]
 [![PR's welcome][prs]][prs-url]
@@ -672,8 +671,6 @@ Before we started using OpenCollective, donations were made anonymously. Now tha
 [prs-url]: https://webpack.js.org/contribute/
 [builds1]: https://github.com/webpack/webpack/actions/workflows/test.yml/badge.svg
 [builds1-url]: https://github.com/webpack/webpack/actions/workflows/test.yml
-[builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status%2Fwebpack.webpack?branchName=main
-[builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3&branchName=main
 [dependency-review-url]: https://github.com/webpack/webpack/actions/workflows/dependency-review.yml
 [dependency-review]: https://github.com/webpack/webpack/actions/workflows/dependency-review.yml/badge.svg
 [cover]: https://codecov.io/gh/webpack/webpack/graph/badge.svg?token=mDP3mQJNnn

package/bin/webpack.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+"use strict";
+
 /**
  * @param {string} command process to run
  * @param {string[]} args command line arguments
@@ -7,6 +9,7 @@
  */
 const runCommand = (command, args) => {
 	const cp = require("child_process");
+
 	return new Promise((resolve, reject) => {
 		const executedCommand = cp.spawn(command, args, {
 			stdio: "inherit",
@@ -75,7 +78,9 @@ const isInstalled = packageName => {
  */
 const runCli = cli => {
 	const path = require("path");
+
 	const pkgPath = require.resolve(`${cli.package}/package.json`);
+
 	const pkg = require(pkgPath);
 
 	if (pkg.type === "module" || /\.mjs/i.test(pkg.bin[cli.binName])) {
@@ -171,8 +176,9 @@ if (!cli.installed) {
 		);
 
 		runCommand(
-			/** @type {string} */ (packageManager),
-			installOptions.concat(cli.package)
+			/** @type {string} */
+			(packageManager),
+			[...installOptions, cli.package]
 		)
 			.then(() => {
 				runCli(cli);

package/hot/log.js

@@ -45,6 +45,21 @@ module.exports = function (level, msg) {
 	}
 };
 
+/**
+ * @param {Error} err error
+ * @returns {string} formatted error
+ */
+module.exports.formatError = function (err) {
+	var message = err.message;
+	var stack = err.stack;
+	if (!stack) {
+		return message;
+	} else if (stack.indexOf(message) < 0) {
+		return message + "\n" + stack;
+	}
+	return stack;
+};
+
 var group = console.group || dummy;
 var groupCollapsed = console.groupCollapsed || dummy;
 var groupEnd = console.groupEnd || dummy;
@@ -61,18 +76,3 @@ module.exports.groupEnd = logGroup(groupEnd);
 module.exports.setLogLevel = function (level) {
 	logLevel = level;
 };
-
-/**
- * @param {Error} err error
- * @returns {string} formatted error
- */
-module.exports.formatError = function (err) {
-	var message = err.message;
-	var stack = err.stack;
-	if (!stack) {
-		return message;
-	} else if (stack.indexOf(message) < 0) {
-		return message + "\n" + stack;
-	}
-	return stack;
-};

package/hot/poll.js

@@ -4,6 +4,7 @@
 */
 /* globals __resourceQuery */
 if (module.hot) {
+	// eslint-disable-next-line no-implicit-coercion
 	var hotPollInterval = +__resourceQuery.slice(1) || 10 * 60 * 1000;
 	var log = require("./log");
 

package/lib/APIPlugin.js

@@ -17,8 +17,8 @@ const ConstDependency = require("./dependencies/ConstDependency");
 const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const {
-	toConstantDependency,
-	evaluateToString
+	evaluateToString,
+	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 const ChunkNameRuntimeModule = require("./runtime/ChunkNameRuntimeModule");
 const GetFullHashRuntimeModule = require("./runtime/GetFullHashRuntimeModule");
@@ -179,7 +179,7 @@ class APIPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.getFullHash)
-					.tap(PLUGIN_NAME, (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(chunk, new GetFullHashRuntimeModule());
 						return true;
 					});

package/lib/AbstractMethodError.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const WebpackError = require("./WebpackError");
+
 const CURRENT_METHOD_REGEXP = /at ([a-zA-Z0-9_.]*)/;
 
 /**

package/lib/AutomaticPrefetchPlugin.js

@@ -62,4 +62,5 @@ class AutomaticPrefetchPlugin {
 		});
 	}
 }
+
 module.exports = AutomaticPrefetchPlugin;

package/lib/BannerPlugin.js

@@ -20,7 +20,7 @@ const createSchemaValidation = require("./util/create-schema-validation");
 
 const validate = createSchemaValidation(
 	/** @type {((value: typeof import("../schemas/plugins/BannerPlugin.json")) => boolean)} */
-	(require("../schemas/plugins/BannerPlugin.check.js")),
+	(require("../schemas/plugins/BannerPlugin.check")),
 	() => require("../schemas/plugins/BannerPlugin.json"),
 	{
 		name: "Banner Plugin",

package/lib/CacheFacade.js

@@ -38,8 +38,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 {TODO} */ (items[0]);
+		if (items.length === 1) return /** @type {ItemCacheFacade} */ (items[0]);
 	}
 
 	/**

package/lib/CaseSensitiveModulesWarning.js

@@ -35,9 +35,9 @@ const createModulesListMessage = (modules, moduleGraph) =>
 	modules
 		.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.

package/lib/Chunk.js

@@ -11,9 +11,9 @@ const { intersect } = require("./util/SetHelpers");
 const SortableSet = require("./util/SortableSet");
 const StringXor = require("./util/StringXor");
 const {
-	compareModulesByIdentifier,
 	compareChunkGroupsByIndex,
-	compareModulesById
+	compareModulesById,
+	compareModulesByIdentifier
 } = require("./util/comparators");
 const { createArrayToSetDeprecationSet } = require("./util/deprecation");
 const { mergeRuntime } = require("./util/runtime");
@@ -116,13 +116,13 @@ class Chunk {
 	// TODO remove in webpack 6
 	// BACKWARD-COMPAT START
 	get entryModule() {
-		const entryModules = Array.from(
-			ChunkGraph.getChunkGraphForChunk(
+		const entryModules = [
+			...ChunkGraph.getChunkGraphForChunk(
 				this,
 				"Chunk.entryModule",
 				"DEP_WEBPACK_CHUNK_ENTRY_MODULE"
 			).getChunkEntryModulesIterable(this)
-		);
+		];
 		if (entryModules.length === 0) {
 			return undefined;
 		} else if (entryModules.length === 1) {
@@ -747,7 +747,7 @@ class Chunk {
 				}
 			}
 			if (chunkIdSet.size > 0) {
-				result[name] = Array.from(chunkIdSet);
+				result[name] = [...chunkIdSet];
 			}
 		}
 		return result;

package/lib/ChunkGraph.js

@@ -12,21 +12,21 @@ const { DEFAULTS } = require("./config/defaults");
 const { first } = require("./util/SetHelpers");
 const SortableSet = require("./util/SortableSet");
 const {
-	compareModulesById,
+	compareIds,
 	compareIterables,
+	compareModulesById,
 	compareModulesByIdentifier,
-	concatComparators,
 	compareSelect,
-	compareIds
+	concatComparators
 } = require("./util/comparators");
 const createHash = require("./util/createHash");
 const findGraphRoots = require("./util/findGraphRoots");
 const {
 	RuntimeSpecMap,
 	RuntimeSpecSet,
-	runtimeToString,
+	forEachRuntime,
 	mergeRuntime,
-	forEachRuntime
+	runtimeToString
 } = require("./util/runtime");
 
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
@@ -76,7 +76,7 @@ class ModuleHashInfo {
  * @param {SortableSet<T>} set the set
  * @returns {T[]} set as array
  */
-const getArray = set => Array.from(set);
+const getArray = set => [...set];
 
 /**
  * @param {SortableSet<Chunk>} chunks the chunks
@@ -141,7 +141,7 @@ const createOrderedArrayFunction = comparator => {
 	if (fn !== undefined) return fn;
 	fn = set => {
 		set.sortWith(comparator);
-		return Array.from(set);
+		return [...set];
 	};
 	createOrderedArrayFunctionMap.set(comparator, fn);
 	return fn;
@@ -310,8 +310,8 @@ class ChunkGraph {
 	 */
 	_getGraphRoots(set) {
 		const { moduleGraph } = this;
-		return Array.from(
-			findGraphRoots(set, module => {
+		return [
+			...findGraphRoots(set, module => {
 				/** @type {Set<Module>} */
 				const set = new Set();
 				/**
@@ -332,7 +332,7 @@ class ChunkGraph {
 				addDependencies(module);
 				return set;
 			})
-		).sort(compareModulesByIdentifier);
+		].sort(compareModulesByIdentifier);
 	}
 
 	/**
@@ -420,8 +420,9 @@ class ChunkGraph {
 	 */
 	attachDependentHashModules(chunk, modules) {
 		const cgc = this._getChunkGraphChunk(chunk);
-		if (cgc.dependentHashModules === undefined)
+		if (cgc.dependentHashModules === undefined) {
 			cgc.dependentHashModules = new Set();
+		}
 		for (const module of modules) {
 			cgc.dependentHashModules.add(module);
 		}
@@ -668,7 +669,6 @@ class ChunkGraph {
 			if (st === undefined) return;
 			if (!sourceTypes) {
 				sourceTypes = st;
-				continue;
 			} else if (!newSet) {
 				for (const type of st) {
 					if (!newSet) {
@@ -1022,9 +1022,10 @@ class ChunkGraph {
 			this.connectChunkAndModule(chunkA, module);
 		}
 
-		for (const [module, chunkGroup] of Array.from(
-			this.getChunkEntryModulesWithChunkGroupIterable(chunkB)
-		)) {
+		for (const [
+			module,
+			chunkGroup
+		] of this.getChunkEntryModulesWithChunkGroupIterable(chunkB)) {
 			this.disconnectChunkAndEntryModule(chunkB, module);
 			this.connectChunkAndEntryModule(
 				chunkA,
@@ -1118,8 +1119,9 @@ class ChunkGraph {
 	 */
 	addDependentHashModuleToChunk(chunk, module) {
 		const cgc = this._getChunkGraphChunk(chunk);
-		if (cgc.dependentHashModules === undefined)
+		if (cgc.dependentHashModules === undefined) {
 			cgc.dependentHashModules = new Set();
+		}
 		cgc.dependentHashModules.add(module);
 	}
 
@@ -1267,7 +1269,7 @@ class ChunkGraph {
 	 */
 	getChunkRuntimeModulesInOrder(chunk) {
 		const cgc = this._getChunkGraphChunk(chunk);
-		const array = Array.from(cgc.runtimeModules);
+		const array = [...cgc.runtimeModules];
 		array.sort(
 			concatComparators(
 				compareSelect(r => /** @type {RuntimeModule} */ (r).stage, compareIds),
@@ -1647,8 +1649,9 @@ Caller might not support runtime-dependent code generation (opt-out via optimiza
 				const module = connection.module;
 				stateInfo += module.getExportsType(this.moduleGraph, strict);
 				// cspell:word Tnamespace
-				if (stateInfo === "Tnamespace") activeNamespaceModules.add(module);
-				else {
+				if (stateInfo === "Tnamespace") {
+					activeNamespaceModules.add(module);
+				} else {
 					const oldModule = connectedModules.get(stateInfo);
 					if (oldModule === undefined) {
 						connectedModules.set(stateInfo, module);
@@ -1688,11 +1691,12 @@ Caller might not support runtime-dependent code generation (opt-out via optimiza
 				}
 			}
 			// cspell:word Tnamespace
-			if (activeNamespaceModules.size === 0 && connectedModules.size === 0)
+			if (activeNamespaceModules.size === 0 && connectedModules.size === 0) {
 				return graphHash;
+			}
 			const connectedModulesInOrder =
 				connectedModules.size > 1
-					? Array.from(connectedModules).sort(([a], [b]) => (a < b ? -1 : 1))
+					? [...connectedModules].sort(([a], [b]) => (a < b ? -1 : 1))
 					: connectedModules;
 			const hash = createHash(this._hashFunction);
 			/**
@@ -1713,22 +1717,21 @@ Caller might not support runtime-dependent code generation (opt-out via optimiza
 			const addModulesToHash = modules => {
 				let xor = ZERO_BIG_INT;
 				for (const m of modules) {
-					xor =
-						xor ^
-						this._getModuleGraphHashBigInt(
-							this._getChunkGraphModule(m),
-							m,
-							runtime
-						);
+					xor ^= this._getModuleGraphHashBigInt(
+						this._getChunkGraphModule(m),
+						m,
+						runtime
+					);
 				}
 				hash.update(xor.toString(16));
 			};
-			if (activeNamespaceModules.size === 1)
+			if (activeNamespaceModules.size === 1) {
 				addModuleToHash(
 					/** @type {Module} */ (activeNamespaceModules.values().next().value)
 				);
-			else if (activeNamespaceModules.size > 1)
+			} else if (activeNamespaceModules.size > 1) {
 				addModulesToHash(activeNamespaceModules);
+			}
 			for (const [stateInfo, modules] of connectedModulesInOrder) {
 				hash.update(stateInfo);
 				if (modules instanceof Set) {
@@ -1768,12 +1771,13 @@ Caller might not support runtime-dependent code generation (opt-out via optimiza
 			 */
 			module => {
 				const chunkGraph = chunkGraphForModuleMap.get(module);
-				if (!chunkGraph)
+				if (!chunkGraph) {
 					throw new Error(
 						`${
 							deprecateMessage
 						}: There was no ChunkGraph assigned to the Module for backward-compat (Use the new API)`
 					);
+				}
 				return chunkGraph;
 			},
 			`${deprecateMessage}: Use new ChunkGraph API`,
@@ -1819,12 +1823,13 @@ Caller might not support runtime-dependent code generation (opt-out via optimiza
 			 */
 			chunk => {
 				const chunkGraph = chunkGraphForChunkMap.get(chunk);
-				if (!chunkGraph)
+				if (!chunkGraph) {
 					throw new Error(
 						`${
 							deprecateMessage
 						}There was no ChunkGraph assigned to the Chunk for backward-compat (Use the new API)`
 					);
+				}
 				return chunkGraph;
 			},
 			`${deprecateMessage}: Use new ChunkGraph API`,

package/lib/ChunkGroup.js

@@ -8,9 +8,9 @@
 const util = require("util");
 const SortableSet = require("./util/SortableSet");
 const {
-	compareLocations,
 	compareChunks,
-	compareIterables
+	compareIterables,
+	compareLocations
 } = require("./util/comparators");
 
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
@@ -40,7 +40,7 @@ let debugId = 5000;
  * @param {SortableSet<T>} set set to convert to array.
  * @returns {T[]} the array format of existing set
  */
-const getArray = set => Array.from(set);
+const getArray = set => [...set];
 
 /**
  * A convenience method used to sort chunks based on their id's
@@ -115,16 +115,23 @@ class ChunkGroup {
 	 */
 	addOptions(options) {
 		for (const _key of Object.keys(options)) {
-			const key = /** @type {keyof ChunkGroupOptions} */ (_key);
+			const key =
+				/** @type {keyof ChunkGroupOptions} */
+				(_key);
 			if (this.options[key] === undefined) {
-				/** @type {TODO} */
+				/** @type {EXPECTED_ANY} */
 				(this.options)[key] = options[key];
 			} else if (this.options[key] !== options[key]) {
 				if (key.endsWith("Order")) {
-					/** @type {TODO} */
-					(this.options)[key] = Math.max(
-						/** @type {number} */ (this.options[key]),
-						/** @type {number} */ (options[key])
+					const orderKey =
+						/** @type {Exclude<keyof ChunkGroupOptions, "name" | "fetchPriority">} */
+						(key);
+
+					this.options[orderKey] = Math.max(
+						/** @type {number} */
+						(this.options[orderKey]),
+						/** @type {number} */
+						(options[orderKey])
 					);
 				} else {
 					throw new Error(
@@ -429,7 +436,7 @@ class ChunkGroup {
 			}
 		}
 
-		return Array.from(files);
+		return [...files];
 	}
 
 	/**

package/lib/ChunkTemplate.js

@@ -170,7 +170,7 @@ Object.defineProperty(ChunkTemplate.prototype, "outputOptions", {
 		 * @this {ChunkTemplate}
 		 * @returns {OutputOptions} output options
 		 */
-		function () {
+		function outputOptions() {
 			return this._outputOptions;
 		},
 		"ChunkTemplate.outputOptions is deprecated (use Compilation.outputOptions instead)",

package/lib/CleanPlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const path = require("path");
 const asyncLib = require("neo-async");
 const { SyncBailHook } = require("tapable");
 const Compilation = require("./Compilation");
@@ -36,6 +37,7 @@ const validate = createSchemaValidation(
 	undefined,
 	() => {
 		const { definitions } = require("../schemas/WebpackOptions.json");
+
 		return {
 			definitions,
 			oneOf: [{ $ref: "#/definitions/CleanOptions" }]
@@ -61,6 +63,62 @@ const mergeAssets = (as1, as2) => {
 	}
 };
 
+/**
+ * @param {Map<string, number>} assets current assets
+ * @returns {Set<string>} Set of directory paths
+ */
+function getDirectories(assets) {
+	const directories = new Set();
+	/**
+	 * @param {string} filename asset filename
+	 */
+	const addDirectory = filename => {
+		directories.add(path.dirname(filename));
+	};
+
+	// get directories of assets
+	for (const [asset] of assets) {
+		addDirectory(asset);
+	}
+	// and all parent directories
+	for (const directory of directories) {
+		addDirectory(directory);
+	}
+	return directories;
+}
+
+/**
+ * @param {string} a First directory path to compare
+ * @param {string} b Second directory path to compare
+ * @returns {boolean} True if both paths have the same parent directory
+ */
+function isEqualPath(a, b) {
+	return path.normalize(a) === path.normalize(b);
+}
+
+/**
+ * @param {Map<string, number>|Set<string>} files Collection of files to check against
+ * @param {string} file File path to check
+ * @returns {boolean} True if the file or its parent exists in the collection
+ */
+function hasFile(files, file) {
+	if (files instanceof Set) {
+		for (const dir of files) {
+			if (isEqualPath(dir, file)) {
+				return true;
+			}
+		}
+	}
+	if (files instanceof Map) {
+		for (const dir of files.keys()) {
+			if (isEqualPath(dir, file)) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 /** @typedef {Set<string>} Diff */
 
 /**
@@ -71,15 +129,7 @@ const mergeAssets = (as1, as2) => {
  * @returns {void}
  */
 const getDiffToFs = (fs, outputPath, currentAssets, callback) => {
-	const directories = new Set();
-	// get directories of assets
-	for (const [asset] of currentAssets) {
-		directories.add(asset.replace(/(^|\/)[^/]*$/, ""));
-	}
-	// and all parent directories
-	for (const directory of directories) {
-		directories.add(directory.replace(/(^|\/)[^/]*$/, ""));
-	}
+	const directories = getDirectories(currentAssets);
 	const diff = new Set();
 	asyncLib.forEachLimit(
 		directories,
@@ -98,7 +148,10 @@ const getDiffToFs = (fs, outputPath, currentAssets, callback) => {
 				for (const entry of /** @type {string[]} */ (entries)) {
 					const file = entry;
 					const filename = directory ? `${directory}/${file}` : file;
-					if (!directories.has(filename) && !currentAssets.has(filename)) {
+					if (
+						!hasFile(directories, filename) &&
+						!hasFile(currentAssets, filename)
+					) {
 						diff.add(filename);
 					}
 				}
@@ -177,22 +230,43 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 		jobs,
 		10,
 		({ type, filename, parent }, push, callback) => {
+			const path = join(fs, outputPath, filename);
 			/**
 			 * @param {Error & { code?: string }} err error
 			 * @returns {void}
 			 */
 			const handleError = err => {
-				if (err.code === "ENOENT") {
-					log(`${filename} was removed during cleaning by something else`);
-					handleParent();
-					return callback();
-				}
-				return callback(err);
+				const isAlreadyRemoved = () =>
+					new Promise(resolve => {
+						if (err.code === "ENOENT") {
+							resolve(true);
+						} else if (err.code === "EPERM") {
+							// https://github.com/isaacs/rimraf/blob/main/src/fix-eperm.ts#L37
+							// fs.existsSync(path) === false https://github.com/webpack/webpack/actions/runs/15493412975/job/43624272783?pr=19586
+							doStat(fs, path, err => {
+								if (err) {
+									resolve(err.code === "ENOENT");
+								} else {
+									resolve(false);
+								}
+							});
+						} else {
+							resolve(false);
+						}
+					});
+
+				isAlreadyRemoved().then(isRemoved => {
+					if (isRemoved) {
+						log(`${filename} was removed during cleaning by something else`);
+						handleParent();
+						return callback();
+					}
+					return callback(err);
+				});
 			};
 			const handleParent = () => {
 				if (parent && --parent.remaining === 0) push(parent.job);
 			};
-			const path = join(fs, outputPath, filename);
 			switch (type) {
 				case "check":
 					if (isKept(filename)) {
@@ -443,3 +517,6 @@ class CleanPlugin {
 }
 
 module.exports = CleanPlugin;
+module.exports._getDirectories = getDirectories;
+module.exports._hasFile = hasFile;
+module.exports._isEqualPath = isEqualPath;

package/lib/CodeGenerationResults.js

@@ -9,7 +9,7 @@ const { DEFAULTS } = require("./config/defaults");
 const { getOrInsert } = require("./util/MapHelpers");
 const { first } = require("./util/SetHelpers");
 const createHash = require("./util/createHash");
-const { runtimeToString, RuntimeSpecMap } = require("./util/runtime");
+const { RuntimeSpecMap, runtimeToString } = require("./util/runtime");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("./Module")} Module */