webpack 5.100.2 → 5.101.0

package/lib/CleanPlugin.js

@@ -72,7 +72,7 @@ function getDirectories(assets) {
 	/**
 	 * @param {string} filename asset filename
 	 */
-	const addDirectory = filename => {
+	const addDirectory = (filename) => {
 		directories.add(path.dirname(filename));
 	};
 
@@ -87,38 +87,6 @@ function getDirectories(assets) {
 	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 */
 
 /**
@@ -147,18 +115,18 @@ const getDiffToFs = (fs, outputPath, currentAssets, callback) => {
 				}
 				for (const entry of /** @type {string[]} */ (entries)) {
 					const file = entry;
-					const filename = directory ? `${directory}/${file}` : file;
-					if (
-						!hasFile(directories, filename) &&
-						!hasFile(currentAssets, filename)
-					) {
+					// Since path.normalize("./file") === path.normalize("file"),
+					// return file directly when directory === "."
+					const filename =
+						directory && directory !== "." ? `${directory}/${file}` : file;
+					if (!directories.has(filename) && !currentAssets.has(filename)) {
 						diff.add(filename);
 					}
 				}
 				callback();
 			});
 		},
-		err => {
+		(err) => {
 			if (err) return callback(err);
 
 			callback(null, diff);
@@ -210,7 +178,7 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 	/**
 	 * @param {string} msg message
 	 */
-	const log = msg => {
+	const log = (msg) => {
 		if (dry) {
 			logger.info(msg);
 		} else {
@@ -219,7 +187,7 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 	};
 	/** @typedef {{ type: "check" | "unlink" | "rmdir", filename: string, parent: { remaining: number, job: Job } | undefined }} Job */
 	/** @type {Job[]} */
-	const jobs = Array.from(diff.keys(), filename => ({
+	const jobs = Array.from(diff.keys(), (filename) => ({
 		type: "check",
 		filename,
 		parent: undefined
@@ -235,15 +203,15 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 			 * @param {Error & { code?: string }} err error
 			 * @returns {void}
 			 */
-			const handleError = err => {
+			const handleError = (err) => {
 				const isAlreadyRemoved = () =>
-					new Promise(resolve => {
+					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 => {
+							doStat(fs, path, (err) => {
 								if (err) {
 									resolve(err.code === "ENOENT");
 								} else {
@@ -255,7 +223,7 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 						}
 					});
 
-				isAlreadyRemoved().then(isRemoved => {
+				isAlreadyRemoved().then((isRemoved) => {
 					if (isRemoved) {
 						log(`${filename} was removed during cleaning by something else`);
 						handleParent();
@@ -334,7 +302,7 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 						);
 						return process.nextTick(callback);
 					}
-					fs.rmdir(path, err => {
+					fs.rmdir(path, (err) => {
 						if (err) return handleError(err);
 						handleParent();
 						callback();
@@ -352,7 +320,7 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 						);
 						return process.nextTick(callback);
 					}
-					fs.unlink(path, err => {
+					fs.unlink(path, (err) => {
 						if (err) return handleError(err);
 						handleParent();
 						callback();
@@ -360,7 +328,7 @@ const applyDiff = (fs, outputPath, dry, logger, diff, isKept, callback) => {
 					break;
 			}
 		},
-		err => {
+		(err) => {
 			if (err) return callback(err);
 			callback(undefined, keptAssets);
 		}
@@ -412,9 +380,9 @@ class CleanPlugin {
 			typeof keep === "function"
 				? keep
 				: typeof keep === "string"
-					? path => path.startsWith(keep)
+					? (path) => path.startsWith(keep)
 					: typeof keep === "object" && keep.test
-						? path => keep.test(path)
+						? (path) => keep.test(path)
 						: () => false;
 
 		// We assume that no external modification happens while the compiler is active
@@ -470,7 +438,7 @@ class CleanPlugin {
 				 * @param {string} path path
 				 * @returns {boolean | void} true, if needs to be kept
 				 */
-				const isKept = path => {
+				const isKept = (path) => {
 					const result = hooks.keep.call(path);
 					if (result !== undefined) return result;
 					return keepFn(path);
@@ -518,5 +486,3 @@ class CleanPlugin {
 
 module.exports = CleanPlugin;
 module.exports._getDirectories = getDirectories;
-module.exports._hasFile = hasFile;
-module.exports._isEqualPath = isEqualPath;

package/lib/CodeGenerationResults.js

@@ -39,7 +39,7 @@ class CodeGenerationResults {
 			throw new Error(
 				`No code generation entry for ${module.identifier()} (existing entries: ${Array.from(
 					this.map.keys(),
-					m => m.identifier()
+					(m) => m.identifier()
 				).join(", ")})`
 			);
 		}
@@ -50,7 +50,7 @@ class CodeGenerationResults {
 					throw new Error(
 						`No unique code generation entry for unspecified runtime for ${module.identifier()} (existing runtimes: ${Array.from(
 							entry.keys(),
-							r => runtimeToString(r)
+							(r) => runtimeToString(r)
 						).join(", ")}).
 Caller might not support runtime-dependent code generation (opt-out via optimization.usedExports: "global").`
 					);
@@ -66,7 +66,7 @@ Caller might not support runtime-dependent code generation (opt-out via optimiza
 					runtime
 				)} for ${module.identifier()} (existing runtimes: ${Array.from(
 					entry.keys(),
-					r => runtimeToString(r)
+					(r) => runtimeToString(r)
 				).join(", ")})`
 			);
 		}

package/lib/CompatibilityPlugin.js

@@ -54,7 +54,7 @@ class CompatibilityPlugin {
 							 * @param {CallExpression} expr call expression
 							 * @returns {boolean | void} true when need to handle
 							 */
-							expr => {
+							(expr) => {
 								// support for browserify style require delegator: "require(o, !0)"
 								if (expr.arguments.length !== 2) return;
 								const second = parser.evaluateExpression(expr.arguments[1]);
@@ -90,9 +90,9 @@ class CompatibilityPlugin {
 				 * @param {JavascriptParser} parser the parser
 				 * @returns {void}
 				 */
-				const handler = parser => {
+				const handler = (parser) => {
 					// Handle nested requires
-					parser.hooks.preStatement.tap(PLUGIN_NAME, statement => {
+					parser.hooks.preStatement.tap(PLUGIN_NAME, (statement) => {
 						if (
 							statement.type === "FunctionDeclaration" &&
 							statement.id &&
@@ -118,7 +118,7 @@ class CompatibilityPlugin {
 					});
 					parser.hooks.pattern
 						.for(RuntimeGlobals.require)
-						.tap(PLUGIN_NAME, pattern => {
+						.tap(PLUGIN_NAME, (pattern) => {
 							const newName = `__nested_webpack_require_${
 								/** @type {Range} */ (pattern.range)[0]
 							}__`;
@@ -134,7 +134,7 @@ class CompatibilityPlugin {
 						});
 					parser.hooks.pattern
 						.for(RuntimeGlobals.exports)
-						.tap(PLUGIN_NAME, pattern => {
+						.tap(PLUGIN_NAME, (pattern) => {
 							parser.tagVariable(pattern.name, nestedWebpackIdentifierTag, {
 								name: "__nested_webpack_exports__",
 								declaration: {
@@ -147,7 +147,7 @@ class CompatibilityPlugin {
 						});
 					parser.hooks.expression
 						.for(nestedWebpackIdentifierTag)
-						.tap(PLUGIN_NAME, expr => {
+						.tap(PLUGIN_NAME, (expr) => {
 							const { name, declaration } =
 								/** @type {TagData} */
 								(parser.currentTagData);