webpack 5.101.3 → 5.102.1

package/lib/logging/Logger.js

@@ -35,9 +35,11 @@ const LOG_SYMBOL = Symbol("webpack logger raw log method");
 const TIMERS_SYMBOL = Symbol("webpack logger times");
 const TIMERS_AGGREGATES_SYMBOL = Symbol("webpack logger aggregated times");
 
+/** @typedef {EXPECTED_ANY[]} Args */
+
 class WebpackLogger {
 	/**
-	 * @param {(type: LogTypeEnum, args?: EXPECTED_ANY[]) => void} log log function
+	 * @param {(type: LogTypeEnum, args?: Args) => void} log log function
 	 * @param {(name: string | (() => string)) => WebpackLogger} getChildLogger function to create child logger
 	 */
 	constructor(log, getChildLogger) {
@@ -46,35 +48,35 @@ class WebpackLogger {
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	error(...args) {
 		this[LOG_SYMBOL](LogType.error, args);
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	warn(...args) {
 		this[LOG_SYMBOL](LogType.warn, args);
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	info(...args) {
 		this[LOG_SYMBOL](LogType.info, args);
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	log(...args) {
 		this[LOG_SYMBOL](LogType.log, args);
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	debug(...args) {
 		this[LOG_SYMBOL](LogType.debug, args);
@@ -82,7 +84,7 @@ class WebpackLogger {
 
 	/**
 	 * @param {EXPECTED_ANY} assertion assertion
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	assert(assertion, ...args) {
 		if (!assertion) {
@@ -99,21 +101,21 @@ class WebpackLogger {
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	status(...args) {
 		this[LOG_SYMBOL](LogType.status, args);
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	group(...args) {
 		this[LOG_SYMBOL](LogType.group, args);
 	}
 
 	/**
-	 * @param {...EXPECTED_ANY} args args
+	 * @param {Args} args args
 	 */
 	groupCollapsed(...args) {
 		this[LOG_SYMBOL](LogType.groupCollapsed, args);

package/lib/logging/createConsoleLogger.js

@@ -10,26 +10,27 @@ const { LogType } = require("./Logger");
 /** @typedef {import("../../declarations/WebpackOptions").FilterItemTypes} FilterItemTypes */
 /** @typedef {import("../../declarations/WebpackOptions").FilterTypes} FilterTypes */
 /** @typedef {import("./Logger").LogTypeEnum} LogTypeEnum */
+/** @typedef {import("./Logger").Args} Args */
 
 /** @typedef {(item: string) => boolean} FilterFunction */
-/** @typedef {(value: string, type: LogTypeEnum, args?: EXPECTED_ANY[]) => void} LoggingFunction */
+/** @typedef {(value: string, type: LogTypeEnum, args?: Args) => void} LoggingFunction */
 
 /**
  * @typedef {object} LoggerConsole
  * @property {() => void} clear
  * @property {() => void} trace
- * @property {(...args: EXPECTED_ANY[]) => void} info
- * @property {(...args: EXPECTED_ANY[]) => void} log
- * @property {(...args: EXPECTED_ANY[]) => void} warn
- * @property {(...args: EXPECTED_ANY[]) => void} error
- * @property {(...args: EXPECTED_ANY[]) => void=} debug
- * @property {(...args: EXPECTED_ANY[]) => void=} group
- * @property {(...args: EXPECTED_ANY[]) => void=} groupCollapsed
- * @property {(...args: EXPECTED_ANY[]) => void=} groupEnd
- * @property {(...args: EXPECTED_ANY[]) => void=} status
- * @property {(...args: EXPECTED_ANY[]) => void=} profile
- * @property {(...args: EXPECTED_ANY[]) => void=} profileEnd
- * @property {(...args: EXPECTED_ANY[]) => void=} logTime
+ * @property {(...args: Args) => void} info
+ * @property {(...args: Args) => void} log
+ * @property {(...args: Args) => void} warn
+ * @property {(...args: Args) => void} error
+ * @property {(...args: Args) => void=} debug
+ * @property {(...args: Args) => void=} group
+ * @property {(...args: Args) => void=} groupCollapsed
+ * @property {(...args: Args) => void=} groupEnd
+ * @property {(...args: Args) => void=} status
+ * @property {(...args: Args) => void=} profile
+ * @property {(...args: Args) => void=} profileEnd
+ * @property {(...args: Args) => void=} logTime
  */
 
 /**
@@ -94,7 +95,7 @@ module.exports = ({ level = "info", debug = false, console }) => {
 	/**
 	 * @param {string} name name of the logger
 	 * @param {LogTypeEnum} type type of the log entry
-	 * @param {EXPECTED_ANY[]=} args arguments of the log entry
+	 * @param {Args=} args arguments of the log entry
 	 * @returns {void}
 	 */
 	const logger = (name, type, args) => {

package/lib/logging/truncateArgs.js

@@ -6,7 +6,7 @@
 "use strict";
 
 /**
- * @param {Array<number>} array array of numbers
+ * @param {number[]} array array of numbers
  * @returns {number} sum of all numbers in array
  */
 const arraySum = (array) => {

package/lib/node/CommonJsChunkLoadingPlugin.js

@@ -10,6 +10,7 @@ const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenc
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 
 /**
  * @typedef {object} CommonJsChunkLoadingPluginOptions
@@ -59,7 +60,7 @@ class CommonJsChunkLoadingPlugin {
 			const onceForChunkSet = new WeakSet();
 			/**
 			 * @param {Chunk} chunk chunk
-			 * @param {Set<string>} set runtime requirements
+			 * @param {RuntimeRequirements} set runtime requirements
 			 */
 			const handler = (chunk, set) => {
 				if (onceForChunkSet.has(chunk)) return;

package/lib/node/NodeWatchFileSystem.js

@@ -8,10 +8,10 @@
 const util = require("util");
 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").WatchMethod} WatchMethod */
+/** @typedef {import("../util/fs").Changes} Changes */
+/** @typedef {import("../util/fs").Removals} Removals */
 
 class NodeWatchFileSystem {
 	/**
@@ -78,8 +78,8 @@ class NodeWatchFileSystem {
 		this.watcher.once(
 			"aggregated",
 			/**
-			 * @param {Set<string>} changes changes
-			 * @param {Set<string>} removals removals
+			 * @param {Changes} changes changes
+			 * @param {Removals} removals removals
 			 */
 			(changes, removals) => {
 				// pause emitting events (avoids clearing aggregated changes and removals on timeout)

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -91,7 +91,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			/** @type {string} */ (compilation.outputOptions.path),
+			compilation.outputOptions.path,
 			false
 		);
 
@@ -264,7 +264,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 								Template.indent([
 									"if(err) {",
 									Template.indent([
-										'if(err.code === "ENOENT") return resolve();',
+										'if(["MODULE_NOT_FOUND", "ENOENT"].includes(err.code)) return resolve();',
 										"return reject(err);"
 									]),
 									"}",

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -91,7 +91,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			/** @type {string} */ (compilation.outputOptions.path),
+			compilation.outputOptions.path,
 			true
 		);
 
@@ -223,7 +223,10 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 									RuntimeGlobals.getUpdateManifestFilename
 								}());`
 							]),
-							"})['catch'](function(err) { if(err.code !== 'MODULE_NOT_FOUND') throw err; });"
+							`}).catch(${runtimeTemplate.basicFunction("err", [
+								"if(['MODULE_NOT_FOUND', 'ENOENT'].includes(err.code)) return;",
+								"throw err;"
+							])});`
 						]),
 						"}"
 					])

package/lib/node/nodeConsole.js

@@ -8,7 +8,7 @@
 const util = require("util");
 const truncateArgs = require("../logging/truncateArgs");
 
-/** @typedef {import("../../declarations/WebpackOptions").InfrastructureLogging} InfrastructureLogging */
+/** @typedef {import("../config/defaults").InfrastructureLoggingNormalizedWithDefaults} InfrastructureLoggingNormalizedWithDefaults */
 /** @typedef {import("../logging/createConsoleLogger").LoggerConsole} LoggerConsole */
 
 /* eslint-disable no-console */
@@ -17,7 +17,7 @@ const truncateArgs = require("../logging/truncateArgs");
  * @param {object} options options
  * @param {boolean=} options.colors colors
  * @param {boolean=} options.appendOnly append only
- * @param {NonNullable<InfrastructureLogging["stream"]>} options.stream stream
+ * @param {InfrastructureLoggingNormalizedWithDefaults["stream"]} options.stream stream
  * @returns {LoggerConsole} logger function
  */
 module.exports = ({ colors, appendOnly, stream }) => {

package/lib/optimize/AggressiveSplittingPlugin.js

@@ -16,6 +16,7 @@ const identifierUtils = require("../util/identifier");
 
 /** @typedef {import("../../declarations/plugins/optimize/AggressiveSplittingPlugin").AggressiveSplittingPluginOptions} AggressiveSplittingPluginOptions */
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Chunk").ChunkId} ChunkId */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
@@ -127,6 +128,7 @@ class AggressiveSplittingPlugin {
 					}
 
 					// Check used chunk ids
+					/** @typedef {Set<ChunkId>} */
 					const usedIds = new Set();
 					for (const chunk of chunks) {
 						usedIds.add(chunk.id);