webpack 5.92.1 → 5.94.0

package/lib/node/NodeWatchFileSystem.js

@@ -11,9 +11,7 @@ const Watchpack = require("watchpack");
 /** @typedef {import("../../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("../FileSystemInfo").FileSystemInfoEntry} FileSystemInfoEntry */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
-/** @typedef {import("../util/fs").WatchFileSystem} WatchFileSystem */
 /** @typedef {import("../util/fs").WatchMethod} WatchMethod */
-/** @typedef {import("../util/fs").Watcher} Watcher */
 
 class NodeWatchFileSystem {
 	/**
@@ -27,16 +25,7 @@ class NodeWatchFileSystem {
 		this.watcher = new Watchpack(this.watcherOptions);
 	}
 
-	/**
-	 * @param {Iterable<string>} files watched files
-	 * @param {Iterable<string>} directories watched directories
-	 * @param {Iterable<string>} missing watched existence entries
-	 * @param {number} startTime timestamp of start time
-	 * @param {WatchOptions} options options object
-	 * @param {function(Error | null, Map<string, FileSystemInfoEntry>, Map<string, FileSystemInfoEntry>, Set<string>, Set<string>): void} callback aggregated callback
-	 * @param {function(string, number): void} callbackUndelayed callback when the first change was detected
-	 * @returns {Watcher} a watcher
-	 */
+	/** @type {WatchMethod} */
 	watch(
 		files,
 		directories,
@@ -161,16 +150,12 @@ class NodeWatchFileSystem {
 				"DEP_WEBPACK_WATCHER_GET_AGGREGATED_CHANGES"
 			),
 			getFileTimeInfoEntries: util.deprecate(
-				() => {
-					return fetchTimeInfo().fileTimeInfoEntries;
-				},
+				() => fetchTimeInfo().fileTimeInfoEntries,
 				"Watcher.getFileTimeInfoEntries is deprecated in favor of Watcher.getInfo since that's more performant.",
 				"DEP_WEBPACK_WATCHER_FILE_TIME_INFO_ENTRIES"
 			),
 			getContextTimeInfoEntries: util.deprecate(
-				() => {
-					return fetchTimeInfo().contextTimeInfoEntries;
-				},
+				() => fetchTimeInfo().contextTimeInfoEntries,
 				"Watcher.getContextTimeInfoEntries is deprecated in favor of Watcher.getInfo since that's more performant.",
 				"DEP_WEBPACK_WATCHER_CONTEXT_TIME_INFO_ENTRIES"
 			),

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -43,7 +43,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
 			rootOutputDir
-				? `__dirname + ${JSON.stringify("/" + rootOutputDir)}`
+				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
 				: "__filename"
 		});`;
 	}
@@ -227,7 +227,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 									Template.indent([
 										`if(${RuntimeGlobals.hasOwnProperty}(updatedModules, moduleId)) {`,
 										Template.indent([
-											`currentUpdate[moduleId] = updatedModules[moduleId];`,
+											"currentUpdate[moduleId] = updatedModules[moduleId];",
 											"if(updatedModulesList) updatedModulesList.push(moduleId);"
 										]),
 										"}"

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -18,6 +18,7 @@ class ReadFileCompileAsyncWasmPlugin {
 		this._type = type;
 		this._import = useImport;
 	}
+
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -43,7 +43,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
 			rootOutputDir !== "./"
-				? `__dirname + ${JSON.stringify("/" + rootOutputDir)}`
+				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
 				: "__filename"
 		});`;
 	}
@@ -189,7 +189,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 							Template.indent([
 								`if(${RuntimeGlobals.hasOwnProperty}(updatedModules, moduleId)) {`,
 								Template.indent([
-									`currentUpdate[moduleId] = updatedModules[moduleId];`,
+									"currentUpdate[moduleId] = updatedModules[moduleId];",
 									"if(updatedModulesList) updatedModulesList.push(moduleId);"
 								]),
 								"}"

package/lib/node/nodeConsole.js

@@ -19,7 +19,7 @@ const truncateArgs = require("../logging/truncateArgs");
  */
 module.exports = ({ colors, appendOnly, stream }) => {
 	/** @type {string[] | undefined} */
-	let currentStatusMessage = undefined;
+	let currentStatusMessage;
 	let hasStatusMessage = false;
 	let currentIndent = "";
 	let currentCollapsed = 0;
@@ -38,17 +38,17 @@ module.exports = ({ colors, appendOnly, stream }) => {
 			return (
 				prefix +
 				colorPrefix +
-				str.replace(/\n/g, colorSuffix + "\n" + prefix + colorPrefix) +
+				str.replace(/\n/g, `${colorSuffix}\n${prefix}${colorPrefix}`) +
 				colorSuffix
 			);
-		} else {
-			return prefix + str.replace(/\n/g, "\n" + prefix);
 		}
+
+		return prefix + str.replace(/\n/g, `\n${prefix}`);
 	};
 
 	const clearStatusMessage = () => {
 		if (hasStatusMessage) {
-			stream.write("\x1b[2K\r");
+			stream.write("\u001B[2K\r");
 			hasStatusMessage = false;
 		}
 	};
@@ -58,8 +58,8 @@ module.exports = ({ colors, appendOnly, stream }) => {
 		const l = /** @type {TODO} */ (stream).columns || 40;
 		const args = truncateArgs(currentStatusMessage, l - 1);
 		const str = args.join(" ");
-		const coloredStr = `\u001b[1m${str}\u001b[39m\u001b[22m`;
-		stream.write(`\x1b[2K\r${coloredStr}`);
+		const coloredStr = `\u001B[1m${str}\u001B[39m\u001B[22m`;
+		stream.write(`\u001B[2K\r${coloredStr}`);
 		hasStatusMessage = true;
 	};
 
@@ -69,8 +69,9 @@ module.exports = ({ colors, appendOnly, stream }) => {
 	 * @param {string} colorSuffix color suffix
 	 * @returns {(function(...any[]): void)} function to write with colors
 	 */
-	const writeColored = (prefix, colorPrefix, colorSuffix) => {
-		return (...args) => {
+	const writeColored =
+		(prefix, colorPrefix, colorSuffix) =>
+		(...args) => {
 			if (currentCollapsed > 0) return;
 			clearStatusMessage();
 			const str = indent(
@@ -79,34 +80,33 @@ module.exports = ({ colors, appendOnly, stream }) => {
 				colorPrefix,
 				colorSuffix
 			);
-			stream.write(str + "\n");
+			stream.write(`${str}\n`);
 			writeStatusMessage();
 		};
-	};
 
 	const writeGroupMessage = writeColored(
 		"<-> ",
-		"\u001b[1m\u001b[36m",
-		"\u001b[39m\u001b[22m"
+		"\u001B[1m\u001B[36m",
+		"\u001B[39m\u001B[22m"
 	);
 
 	const writeGroupCollapsedMessage = writeColored(
 		"<+> ",
-		"\u001b[1m\u001b[36m",
-		"\u001b[39m\u001b[22m"
+		"\u001B[1m\u001B[36m",
+		"\u001B[39m\u001B[22m"
 	);
 
 	return {
-		log: writeColored("    ", "\u001b[1m", "\u001b[22m"),
+		log: writeColored("    ", "\u001B[1m", "\u001B[22m"),
 		debug: writeColored("    ", "", ""),
 		trace: writeColored("    ", "", ""),
-		info: writeColored("<i> ", "\u001b[1m\u001b[32m", "\u001b[39m\u001b[22m"),
-		warn: writeColored("<w> ", "\u001b[1m\u001b[33m", "\u001b[39m\u001b[22m"),
-		error: writeColored("<e> ", "\u001b[1m\u001b[31m", "\u001b[39m\u001b[22m"),
+		info: writeColored("<i> ", "\u001B[1m\u001B[32m", "\u001B[39m\u001B[22m"),
+		warn: writeColored("<w> ", "\u001B[1m\u001B[33m", "\u001B[39m\u001B[22m"),
+		error: writeColored("<e> ", "\u001B[1m\u001B[31m", "\u001B[39m\u001B[22m"),
 		logTime: writeColored(
 			"<t> ",
-			"\u001b[1m\u001b[35m",
-			"\u001b[39m\u001b[22m"
+			"\u001B[1m\u001B[35m",
+			"\u001B[39m\u001B[22m"
 		),
 		group: (...args) => {
 			writeGroupMessage(...args);
@@ -123,7 +123,7 @@ module.exports = ({ colors, appendOnly, stream }) => {
 		groupEnd: () => {
 			if (currentCollapsed > 0) currentCollapsed--;
 			else if (currentIndent.length >= 2)
-				currentIndent = currentIndent.slice(0, currentIndent.length - 2);
+				currentIndent = currentIndent.slice(0, -2);
 		},
 		profile: console.profile && (name => console.profile(name)),
 		profileEnd: console.profileEnd && (name => console.profileEnd(name)),

package/lib/optimize/AggressiveMergingPlugin.js

@@ -51,7 +51,7 @@ class AggressiveMergingPlugin {
 					chunks => {
 						const chunkGraph = compilation.chunkGraph;
 						/** @type {{a: Chunk, b: Chunk, improvement: number}[]} */
-						let combinations = [];
+						const combinations = [];
 						for (const a of chunks) {
 							if (a.canBeInitial()) continue;
 							for (const b of chunks) {
@@ -78,9 +78,7 @@ class AggressiveMergingPlugin {
 							}
 						}
 
-						combinations.sort((a, b) => {
-							return b.improvement - a.improvement;
-						});
+						combinations.sort((a, b) => b.improvement - a.improvement);
 
 						const pair = combinations[0];
 

package/lib/optimize/AggressiveSplittingPlugin.js

@@ -36,11 +36,9 @@ const validate = createSchemaValidation(
  * @param {Chunk} newChunk the new chunk
  * @returns {(module: Module) => void} function to move module between chunks
  */
-const moveModuleBetween = (chunkGraph, oldChunk, newChunk) => {
-	return module => {
-		chunkGraph.disconnectChunkAndModule(oldChunk, module);
-		chunkGraph.connectChunkAndModule(newChunk, module);
-	};
+const moveModuleBetween = (chunkGraph, oldChunk, newChunk) => module => {
+	chunkGraph.disconnectChunkAndModule(oldChunk, module);
+	chunkGraph.connectChunkAndModule(newChunk, module);
 };
 
 /**
@@ -48,11 +46,8 @@ const moveModuleBetween = (chunkGraph, oldChunk, newChunk) => {
  * @param {Chunk} chunk the chunk
  * @returns {function(Module): boolean} filter for entry module
  */
-const isNotAEntryModule = (chunkGraph, chunk) => {
-	return module => {
-		return !chunkGraph.isEntryModuleInChunk(module, chunk);
-	};
-};
+const isNotAEntryModule = (chunkGraph, chunk) => module =>
+	!chunkGraph.isEntryModuleInChunk(module, chunk);
 
 /** @type {WeakSet<Chunk>} */
 const recordedChunks = new WeakSet();
@@ -191,9 +186,9 @@ class AggressiveSplittingPlugin {
 							const newChunk = compilation.addChunk();
 							newChunk.chunkReason = "aggressive splitted";
 							for (const chunk of selectedChunks) {
-								selectedModules.forEach(
-									moveModuleBetween(chunkGraph, chunk, newChunk)
-								);
+								for (const module of selectedModules) {
+									moveModuleBetween(chunkGraph, chunk, newChunk)(module);
+								}
 								chunk.split(newChunk);
 								chunk.name = null;
 							}
@@ -277,12 +272,14 @@ class AggressiveSplittingPlugin {
 						// We remove invalid splittings and try again
 						for (const chunk of compilation.chunks) {
 							const splitData = chunkSplitDataMap.get(chunk);
-							if (splitData !== undefined) {
-								if (splitData.hash && chunk.hash !== splitData.hash) {
-									// Split was successful, but hash doesn't equal
-									// We can throw away the split since it's useless now
-									invalidSplits.add(splitData);
-								}
+							if (
+								splitData !== undefined &&
+								splitData.hash &&
+								chunk.hash !== splitData.hash
+							) {
+								// Split was successful, but hash doesn't equal
+								// We can throw away the split since it's useless now
+								invalidSplits.add(splitData);
 							}
 						}