webpack 5.97.1 → 5.104.1

package/lib/ids/NamedModuleIdsPlugin.js

@@ -7,25 +7,25 @@
 
 const { compareModulesByIdentifier } = require("../util/comparators");
 const {
-	getShortModuleName,
-	getLongModuleName,
+	assignAscendingModuleIds,
 	assignNames,
-	getUsedModuleIdsAndModules,
-	assignAscendingModuleIds
+	getLongModuleName,
+	getShortModuleName,
+	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} Output */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
 
 /**
  * @typedef {object} NamedModuleIdsPluginOptions
- * @property {string} [context] context
+ * @property {string=} context context
  */
 
+const PLUGIN_NAME = "NamedModuleIdsPlugin";
+
 class NamedModuleIdsPlugin {
 	/**
-	 * @param {NamedModuleIdsPluginOptions} [options] options
+	 * @param {NamedModuleIdsPluginOptions=} options options
 	 */
 	constructor(options = {}) {
 		this.options = options;
@@ -38,11 +38,9 @@ class NamedModuleIdsPlugin {
 	 */
 	apply(compiler) {
 		const { root } = compiler;
-		compiler.hooks.compilation.tap("NamedModuleIdsPlugin", compilation => {
-			const hashFunction =
-				/** @type {NonNullable<Output["hashFunction"]>} */
-				(compilation.outputOptions.hashFunction);
-			compilation.hooks.moduleIds.tap("NamedModuleIdsPlugin", () => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			const hashFunction = compilation.outputOptions.hashFunction;
+			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const chunkGraph = compilation.chunkGraph;
 				const context = this.options.context
 					? this.options.context
@@ -51,7 +49,7 @@ class NamedModuleIdsPlugin {
 				const [usedIds, modules] = getUsedModuleIdsAndModules(compilation);
 				const unnamedModules = assignNames(
 					modules,
-					m => getShortModuleName(m, context, root),
+					(m) => getShortModuleName(m, context, root),
 					(m, shortName) =>
 						getLongModuleName(shortName, m, context, hashFunction, root),
 					compareModulesByIdentifier,

package/lib/ids/NaturalChunkIdsPlugin.js

@@ -10,7 +10,8 @@ const { assignAscendingChunkIds } = require("./IdHelpers");
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+
+const PLUGIN_NAME = "NaturalChunkIdsPlugin";
 
 class NaturalChunkIdsPlugin {
 	/**
@@ -19,11 +20,12 @@ class NaturalChunkIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap("NaturalChunkIdsPlugin", compilation => {
-			compilation.hooks.chunkIds.tap("NaturalChunkIdsPlugin", chunks => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.chunkIds.tap(PLUGIN_NAME, (chunks) => {
 				const chunkGraph = compilation.chunkGraph;
 				const compareNatural = compareChunksNatural(chunkGraph);
-				const chunksInNaturalOrder = Array.from(chunks).sort(compareNatural);
+				/** @type {Chunk[]} */
+				const chunksInNaturalOrder = [...chunks].sort(compareNatural);
 				assignAscendingChunkIds(chunksInNaturalOrder, compilation);
 			});
 		});

package/lib/ids/NaturalModuleIdsPlugin.js

@@ -14,7 +14,8 @@ const {
 } = require("./IdHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+
+const PLUGIN_NAME = "NaturalModuleIdsPlugin";
 
 class NaturalModuleIdsPlugin {
 	/**
@@ -23,8 +24,8 @@ class NaturalModuleIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap("NaturalModuleIdsPlugin", compilation => {
-			compilation.hooks.moduleIds.tap("NaturalModuleIdsPlugin", modules => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const [usedIds, modulesInNaturalOrder] =
 					getUsedModuleIdsAndModules(compilation);
 				modulesInNaturalOrder.sort(

package/lib/ids/OccurrenceChunkIdsPlugin.js

@@ -12,10 +12,9 @@ const { assignAscendingChunkIds } = require("./IdHelpers");
 /** @typedef {import("../../declarations/plugins/ids/OccurrenceChunkIdsPlugin").OccurrenceChunkIdsPluginOptions} OccurrenceChunkIdsPluginOptions */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.check.js"),
+	require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.check"),
 	() => require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.json"),
 	{
 		name: "Occurrence Order Chunk Ids Plugin",
@@ -23,6 +22,8 @@ const validate = createSchemaValidation(
 	}
 );
 
+const PLUGIN_NAME = "OccurrenceChunkIdsPlugin";
+
 class OccurrenceChunkIdsPlugin {
 	/**
 	 * @param {OccurrenceChunkIdsPluginOptions=} options options object
@@ -39,8 +40,8 @@ class OccurrenceChunkIdsPlugin {
 	 */
 	apply(compiler) {
 		const prioritiseInitial = this.options.prioritiseInitial;
-		compiler.hooks.compilation.tap("OccurrenceChunkIdsPlugin", compilation => {
-			compilation.hooks.chunkIds.tap("OccurrenceChunkIdsPlugin", chunks => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.chunkIds.tap(PLUGIN_NAME, (chunks) => {
 				const chunkGraph = compilation.chunkGraph;
 
 				/** @type {Map<Chunk, number>} */
@@ -58,7 +59,8 @@ class OccurrenceChunkIdsPlugin {
 					occursInInitialChunksMap.set(c, occurs);
 				}
 
-				const chunksInOccurrenceOrder = Array.from(chunks).sort((a, b) => {
+				/** @type {Chunk[]} */
+				const chunksInOccurrenceOrder = [...chunks].sort((a, b) => {
 					if (prioritiseInitial) {
 						const aEntryOccurs =
 							/** @type {number} */

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -17,10 +17,9 @@ const {
 /** @typedef {import("../../declarations/plugins/ids/OccurrenceModuleIdsPlugin").OccurrenceModuleIdsPluginOptions} OccurrenceModuleIdsPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.check.js"),
+	require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.check"),
 	() => require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.json"),
 	{
 		name: "Occurrence Order Module Ids Plugin",
@@ -28,6 +27,8 @@ const validate = createSchemaValidation(
 	}
 );
 
+const PLUGIN_NAME = "OccurrenceModuleIdsPlugin";
+
 class OccurrenceModuleIdsPlugin {
 	/**
 	 * @param {OccurrenceModuleIdsPluginOptions=} options options object
@@ -44,10 +45,10 @@ class OccurrenceModuleIdsPlugin {
 	 */
 	apply(compiler) {
 		const prioritiseInitial = this.options.prioritiseInitial;
-		compiler.hooks.compilation.tap("OccurrenceModuleIdsPlugin", compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const moduleGraph = compilation.moduleGraph;
 
-			compilation.hooks.moduleIds.tap("OccurrenceModuleIdsPlugin", () => {
+			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const chunkGraph = compilation.chunkGraph;
 
 				const [usedIds, modulesInOccurrenceOrder] =
@@ -73,14 +74,14 @@ class OccurrenceModuleIdsPlugin {
 				 * @param {Module} module module
 				 * @returns {number} count of occurs
 				 */
-				const countOccursInEntry = module => {
+				const countOccursInEntry = (module) => {
 					let sum = 0;
 					for (const [
 						originModule,
 						connections
 					] of moduleGraph.getIncomingConnectionsByOriginModule(module)) {
 						if (!originModule) continue;
-						if (!connections.some(c => c.isTargetActive(undefined))) continue;
+						if (!connections.some((c) => c.isTargetActive(undefined))) continue;
 						sum += initialChunkChunkMap.get(originModule) || 0;
 					}
 					return sum;
@@ -90,7 +91,7 @@ class OccurrenceModuleIdsPlugin {
 				 * @param {Module} module module
 				 * @returns {number} count of occurs
 				 */
-				const countOccurs = module => {
+				const countOccurs = (module) => {
 					let sum = 0;
 					for (const [
 						originModule,

package/lib/ids/SyncModuleIdsPlugin.js

@@ -10,17 +10,22 @@ const { getUsedModuleIdsAndModules } = require("./IdHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").ModuleId} ModuleId */
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 const plugin = "SyncModuleIdsPlugin";
 
+/**
+ * @typedef {object} SyncModuleIdsPluginOptions
+ * @property {string} path path to file
+ * @property {string=} context context for module names
+ * @property {((module: Module) => boolean)=} test selector for modules
+ * @property {"read" | "create" | "merge" | "update"=} mode operation mode (defaults to merge)
+ */
+
 class SyncModuleIdsPlugin {
 	/**
-	 * @param {object} options options
-	 * @param {string} options.path path to file
-	 * @param {string=} options.context context for module names
-	 * @param {function(Module): boolean} options.test selector for modules
-	 * @param {"read" | "create" | "merge" | "update"=} options.mode operation mode (defaults to merge)
+	 * @param {SyncModuleIdsPluginOptions} options options
 	 */
 	constructor({ path, context, test, mode }) {
 		this._path = path;
@@ -38,11 +43,11 @@ class SyncModuleIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		/** @type {Map<string, string | number>} */
+		/** @type {Map<string, ModuleId>} */
 		let data;
 		let dataChanged = false;
 		if (this._read) {
-			compiler.hooks.readRecords.tapAsync(plugin, callback => {
+			compiler.hooks.readRecords.tapAsync(plugin, (callback) => {
 				const fs =
 					/** @type {IntermediateFileSystem} */
 					(compiler.intermediateFileSystem);
@@ -64,11 +69,11 @@ class SyncModuleIdsPlugin {
 			});
 		}
 		if (this._write) {
-			compiler.hooks.emitRecords.tapAsync(plugin, callback => {
+			compiler.hooks.emitRecords.tapAsync(plugin, (callback) => {
 				if (!data || !dataChanged) return callback();
-				/** @type {{[key: string]: string | number}} */
+				/** @type {{[key: string]: ModuleId}} */
 				const json = {};
-				const sorted = Array.from(data).sort(([a], [b]) => (a < b ? -1 : 1));
+				const sorted = [...data].sort(([a], [b]) => (a < b ? -1 : 1));
 				for (const [key, value] of sorted) {
 					json[key] = value;
 				}
@@ -78,7 +83,7 @@ class SyncModuleIdsPlugin {
 				fs.writeFile(this._path, JSON.stringify(json), callback);
 			});
 		}
-		compiler.hooks.thisCompilation.tap(plugin, compilation => {
+		compiler.hooks.thisCompilation.tap(plugin, (compilation) => {
 			const associatedObjectForCache = compiler.root;
 			const context = this._context || compiler.context;
 			if (this._read) {
@@ -104,13 +109,13 @@ class SyncModuleIdsPlugin {
 							err.module = module;
 							compilation.errors.push(err);
 						}
-						chunkGraph.setModuleId(module, /** @type {string | number} */ (id));
+						chunkGraph.setModuleId(module, /** @type {ModuleId} */ (id));
 						usedIds.add(idAsString);
 					}
 				});
 			}
 			if (this._write) {
-				compilation.hooks.recordModules.tap(plugin, modules => {
+				compilation.hooks.recordModules.tap(plugin, (modules) => {
 					const { chunkGraph } = compilation;
 					let oldData = data;
 					if (!oldData) {

package/lib/index.js

@@ -11,20 +11,24 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").Entry} Entry */
 /** @typedef {import("../declarations/WebpackOptions").EntryNormalized} EntryNormalized */
 /** @typedef {import("../declarations/WebpackOptions").EntryObject} EntryObject */
-/** @typedef {import("../declarations/WebpackOptions").ExternalItemFunctionData} ExternalItemFunctionData */
+/** @typedef {import("../declarations/WebpackOptions").ExternalItem} ExternalItem */
+/** @typedef {import("../declarations/WebpackOptions").ExternalItemFunction} ExternalItemFunction */
 /** @typedef {import("../declarations/WebpackOptions").ExternalItemObjectKnown} ExternalItemObjectKnown */
 /** @typedef {import("../declarations/WebpackOptions").ExternalItemObjectUnknown} ExternalItemObjectUnknown */
 /** @typedef {import("../declarations/WebpackOptions").ExternalItemValue} ExternalItemValue */
 /** @typedef {import("../declarations/WebpackOptions").Externals} Externals */
 /** @typedef {import("../declarations/WebpackOptions").FileCacheOptions} FileCacheOptions */
+/** @typedef {import("../declarations/WebpackOptions").GeneratorOptionsByModuleTypeKnown} GeneratorOptionsByModuleTypeKnown */
 /** @typedef {import("../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../declarations/WebpackOptions").MemoryCacheOptions} MemoryCacheOptions */
 /** @typedef {import("../declarations/WebpackOptions").ModuleOptions} ModuleOptions */
+/** @typedef {import("../declarations/WebpackOptions").ParserOptionsByModuleTypeKnown} ParserOptionsByModuleTypeKnown */
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../declarations/WebpackOptions").RuleSetCondition} RuleSetCondition */
 /** @typedef {import("../declarations/WebpackOptions").RuleSetConditionAbsolute} RuleSetConditionAbsolute */
 /** @typedef {import("../declarations/WebpackOptions").RuleSetRule} RuleSetRule */
 /** @typedef {import("../declarations/WebpackOptions").RuleSetUse} RuleSetUse */
+/** @typedef {import("../declarations/WebpackOptions").RuleSetUseFunction} RuleSetUseFunction */
 /** @typedef {import("../declarations/WebpackOptions").RuleSetUseItem} RuleSetUseItem */
 /** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptions} Configuration */
@@ -32,20 +36,35 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginFunction} WebpackPluginFunction */
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginInstance} WebpackPluginInstance */
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
+/** @typedef {import("./Compiler").AssetEmittedInfo} AssetEmittedInfo */
 /** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compilation").EntryOptions} EntryOptions */
 /** @typedef {import("./Compilation").PathData} PathData */
-/** @typedef {import("./Compiler").AssetEmittedInfo} AssetEmittedInfo */
+/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
+/** @typedef {import("./Entrypoint")} Entrypoint */
+/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionCallback} ExternalItemFunctionCallback */
+/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionData} ExternalItemFunctionData */
+/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolve} ExternalItemFunctionDataGetResolve */
+/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolveCallbackResult} ExternalItemFunctionDataGetResolveCallbackResult */
+/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolveResult} ExternalItemFunctionDataGetResolveResult */
+/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionPromise} ExternalItemFunctionPromise */
 /** @typedef {import("./MultiCompiler").MultiCompilerOptions} MultiCompilerOptions */
+/** @typedef {import("./MultiCompiler").MultiWebpackOptions} MultiConfiguration */
 /** @typedef {import("./MultiStats")} MultiStats */
+/** @typedef {import("./MultiStats").MultiStatsOptions} MultiStatsOptions */
 /** @typedef {import("./NormalModuleFactory").ResolveData} ResolveData */
 /** @typedef {import("./Parser").ParserState} ParserState */
 /** @typedef {import("./ResolverFactory").ResolvePluginInstance} ResolvePluginInstance */
 /** @typedef {import("./ResolverFactory").Resolver} Resolver */
+/** @typedef {import("./Template").RenderManifestEntry} RenderManifestEntry */
+/** @typedef {import("./Template").RenderManifestOptions} RenderManifestOptions */
+/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("./Watching")} Watching */
 /** @typedef {import("./cli").Argument} Argument */
 /** @typedef {import("./cli").Problem} Problem */
+/** @typedef {import("./cli").Colors} Colors */
+/** @typedef {import("./cli").ColorsOptions} ColorsOptions */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsAsset} StatsAsset */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsChunk} StatsChunk */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsChunkGroup} StatsChunkGroup */
@@ -60,19 +79,21 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsModuleTraceDependency} StatsModuleTraceDependency */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsModuleTraceItem} StatsModuleTraceItem */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsProfile} StatsProfile */
+/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
 
 /**
- * @template {Function} T
- * @param {function(): T} factory factory function
+ * @template {EXPECTED_FUNCTION} T
+ * @param {() => T} factory factory function
  * @returns {T} function
  */
-const lazyFunction = factory => {
+const lazyFunction = (factory) => {
 	const fac = memoize(factory);
-	const f = /** @type {any} */ (
+	const f = /** @type {unknown} */ (
 		/**
-		 * @param {...any} args args
+		 * @param {...EXPECTED_ANY} args args
 		 * @returns {T} result
 		 */
 		(...args) => fac()(...args)
@@ -115,32 +136,39 @@ const mergeExports = (obj, exports) => {
 };
 
 const fn = lazyFunction(() => require("./webpack"));
+
 module.exports = mergeExports(fn, {
 	get webpack() {
 		return require("./webpack");
 	},
 	/**
-	 * @returns {function(Configuration | Configuration[]): void} validate fn
+	 * @returns {(configuration: Configuration | MultiConfiguration) => void} validate fn
 	 */
 	get validate() {
-		const webpackOptionsSchemaCheck = require("../schemas/WebpackOptions.check.js");
+		const webpackOptionsSchemaCheck =
+			/** @type {(configuration: Configuration | MultiConfiguration) => boolean} */
+			(require("../schemas/WebpackOptions.check"));
+
 		const getRealValidate = memoize(
 			/**
-			 * @returns {function(Configuration | Configuration[]): void} validate fn
+			 * @returns {(configuration: Configuration | MultiConfiguration) => void} validate fn
 			 */
 			() => {
 				const validateSchema = require("./validateSchema");
 				const webpackOptionsSchema = require("../schemas/WebpackOptions.json");
-				return options => validateSchema(webpackOptionsSchema, options);
+
+				return (options) => validateSchema(webpackOptionsSchema, options);
 			}
 		);
-		return options => {
-			if (!webpackOptionsSchemaCheck(/** @type {TODO} */ (options)))
+		return (options) => {
+			if (!webpackOptionsSchemaCheck(options)) {
 				getRealValidate()(options);
+			}
 		};
 	},
 	get validateSchema() {
 		const validateSchema = require("./validateSchema");
+
 		return validateSchema;
 	},
 	get version() {
@@ -204,6 +232,9 @@ module.exports = mergeExports(fn, {
 	get DynamicEntryPlugin() {
 		return require("./DynamicEntryPlugin");
 	},
+	get DotenvPlugin() {
+		return require("./DotenvPlugin");
+	},
 	get EntryOptionPlugin() {
 		return require("./EntryOptionPlugin");
 	},
@@ -266,6 +297,9 @@ module.exports = mergeExports(fn, {
 	get Module() {
 		return require("./Module");
 	},
+	get ModuleFactory() {
+		return require("./ModuleFactory");
+	},
 	get ModuleFilenameHelpers() {
 		return require("./ModuleFilenameHelpers");
 	},
@@ -324,6 +358,9 @@ module.exports = mergeExports(fn, {
 	get Stats() {
 		return require("./Stats");
 	},
+	get ManifestPlugin() {
+		return require("./ManifestPlugin");
+	},
 	get Template() {
 		return require("./Template");
 	},
@@ -444,7 +481,7 @@ module.exports = mergeExports(fn, {
 			return require("./optimize/LimitChunkCountPlugin");
 		},
 		get MergeDuplicateChunksPlugin() {
-			return require("./optimize/MergeDuplicateChunksPlugin.js");
+			return require("./optimize/MergeDuplicateChunksPlugin");
 		},
 		get MinChunkSizePlugin() {
 			return require("./optimize/MinChunkSizePlugin");
@@ -630,6 +667,9 @@ module.exports = mergeExports(fn, {
 		schemes: {
 			get HttpUriPlugin() {
 				return require("./schemes/HttpUriPlugin");
+			},
+			get VirtualUrlPlugin() {
+				return require("./schemes/VirtualUrlPlugin");
 			}
 		},
 		ids: {