webpack 5.76.1 → 5.88.2

package/lib/asset/AssetModulesPlugin.js

@@ -5,6 +5,12 @@
 
 "use strict";
 
+const {
+	ASSET_MODULE_TYPE_RESOURCE,
+	ASSET_MODULE_TYPE_INLINE,
+	ASSET_MODULE_TYPE,
+	ASSET_MODULE_TYPE_SOURCE
+} = require("../ModuleTypeConstants");
 const { cleverMerge } = require("../util/cleverMerge");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const createSchemaValidation = require("../util/create-schema-validation");
@@ -15,6 +21,10 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
 
+/**
+ * @param {string} name name of definitions
+ * @returns {TODO} definition
+ */
 const getSchema = name => {
 	const { definitions } = require("../../schemas/WebpackOptions.json");
 	return {
@@ -61,7 +71,7 @@ const getAssetSourceGenerator = memoize(() =>
 	require("./AssetSourceGenerator")
 );
 
-const type = "asset";
+const type = ASSET_MODULE_TYPE;
 const plugin = "AssetModulesPlugin";
 
 class AssetModulesPlugin {
@@ -75,7 +85,7 @@ class AssetModulesPlugin {
 			plugin,
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.createParser
-					.for("asset")
+					.for(ASSET_MODULE_TYPE)
 					.tap(plugin, parserOptions => {
 						validateParserOptions(parserOptions);
 						parserOptions = cleverMerge(
@@ -96,35 +106,39 @@ class AssetModulesPlugin {
 						return new AssetParser(dataUrlCondition);
 					});
 				normalModuleFactory.hooks.createParser
-					.for("asset/inline")
+					.for(ASSET_MODULE_TYPE_INLINE)
 					.tap(plugin, parserOptions => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(true);
 					});
 				normalModuleFactory.hooks.createParser
-					.for("asset/resource")
+					.for(ASSET_MODULE_TYPE_RESOURCE)
 					.tap(plugin, parserOptions => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(false);
 					});
 				normalModuleFactory.hooks.createParser
-					.for("asset/source")
+					.for(ASSET_MODULE_TYPE_SOURCE)
 					.tap(plugin, parserOptions => {
 						const AssetSourceParser = getAssetSourceParser();
 
 						return new AssetSourceParser();
 					});
 
-				for (const type of ["asset", "asset/inline", "asset/resource"]) {
+				for (const type of [
+					ASSET_MODULE_TYPE,
+					ASSET_MODULE_TYPE_INLINE,
+					ASSET_MODULE_TYPE_RESOURCE
+				]) {
 					normalModuleFactory.hooks.createGenerator
 						.for(type)
 						.tap(plugin, generatorOptions => {
 							validateGeneratorOptions[type](generatorOptions);
 
 							let dataUrl = undefined;
-							if (type !== "asset/resource") {
+							if (type !== ASSET_MODULE_TYPE_RESOURCE) {
 								dataUrl = generatorOptions.dataUrl;
 								if (!dataUrl || typeof dataUrl === "object") {
 									dataUrl = {
@@ -138,7 +152,7 @@ class AssetModulesPlugin {
 							let filename = undefined;
 							let publicPath = undefined;
 							let outputPath = undefined;
-							if (type !== "asset/inline") {
+							if (type !== ASSET_MODULE_TYPE_INLINE) {
 								filename = generatorOptions.filename;
 								publicPath = generatorOptions.publicPath;
 								outputPath = generatorOptions.outputPath;
@@ -156,7 +170,7 @@ class AssetModulesPlugin {
 						});
 				}
 				normalModuleFactory.hooks.createGenerator
-					.for("asset/source")
+					.for(ASSET_MODULE_TYPE_SOURCE)
 					.tap(plugin, () => {
 						const AssetSourceGenerator = getAssetSourceGenerator();
 
@@ -169,7 +183,7 @@ class AssetModulesPlugin {
 
 					const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
 						chunk,
-						"asset",
+						ASSET_MODULE_TYPE,
 						compareModulesByIdentifier
 					);
 					if (modules) {
@@ -194,7 +208,9 @@ class AssetModulesPlugin {
 										codeGenResult.data.get("fullContentHash")
 								});
 							} catch (e) {
-								e.message += `\nduring rendering of asset ${module.identifier()}`;
+								/** @type {Error} */ (
+									e
+								).message += `\nduring rendering of asset ${module.identifier()}`;
 								throw e;
 							}
 						}
@@ -207,7 +223,7 @@ class AssetModulesPlugin {
 					"AssetModulesPlugin",
 					(options, context) => {
 						const { codeGenerationResult } = options;
-						const source = codeGenerationResult.sources.get("asset");
+						const source = codeGenerationResult.sources.get(ASSET_MODULE_TYPE);
 						if (source === undefined) return;
 						context.assets.set(codeGenerationResult.data.get("filename"), {
 							source,

package/lib/asset/AssetParser.js

@@ -7,7 +7,10 @@
 
 const Parser = require("../Parser");
 
+/** @typedef {import("../../declarations/WebpackOptions").AssetParserDataUrlOptions} AssetParserDataUrlOptions */
 /** @typedef {import("../../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
@@ -29,23 +32,28 @@ class AssetParser extends Parser {
 		if (typeof source === "object" && !Buffer.isBuffer(source)) {
 			throw new Error("AssetParser doesn't accept preparsed AST");
 		}
-		state.module.buildInfo.strict = true;
-		state.module.buildMeta.exportsType = "default";
-		state.module.buildMeta.defaultObject = false;
+
+		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);
+		buildInfo.strict = true;
+		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		buildMeta.exportsType = "default";
+		buildMeta.defaultObject = false;
 
 		if (typeof this.dataUrlCondition === "function") {
-			state.module.buildInfo.dataUrl = this.dataUrlCondition(source, {
+			buildInfo.dataUrl = this.dataUrlCondition(source, {
 				filename: state.module.matchResource || state.module.resource,
 				module: state.module
 			});
 		} else if (typeof this.dataUrlCondition === "boolean") {
-			state.module.buildInfo.dataUrl = this.dataUrlCondition;
+			buildInfo.dataUrl = this.dataUrlCondition;
 		} else if (
 			this.dataUrlCondition &&
 			typeof this.dataUrlCondition === "object"
 		) {
-			state.module.buildInfo.dataUrl =
-				Buffer.byteLength(source) <= this.dataUrlCondition.maxSize;
+			buildInfo.dataUrl =
+				Buffer.byteLength(source) <=
+				/** @type {NonNullable<AssetParserDataUrlOptions["maxSize"]>} */
+				(this.dataUrlCondition.maxSize);
 		} else {
 			throw new Error("Unexpected dataUrlCondition type");
 		}

package/lib/asset/AssetSourceParser.js

@@ -7,6 +7,8 @@
 
 const Parser = require("../Parser");
 
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
@@ -21,9 +23,12 @@ class AssetSourceParser extends Parser {
 			throw new Error("AssetSourceParser doesn't accept preparsed AST");
 		}
 		const { module } = state;
-		module.buildInfo.strict = true;
-		module.buildMeta.exportsType = "default";
-		state.module.buildMeta.defaultObject = false;
+		/** @type {BuildInfo} */
+		(module.buildInfo).strict = true;
+		/** @type {BuildMeta} */
+		(module.buildMeta).exportsType = "default";
+		/** @type {BuildMeta} */
+		(state.module.buildMeta).defaultObject = false;
 
 		return state;
 	}

package/lib/asset/RawDataUrlModule.js

@@ -7,6 +7,7 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("../Module");
+const { ASSET_MODULE_TYPE_RAW_DATA_URL } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 
@@ -19,6 +20,8 @@ const makeSerializable = require("../util/makeSerializable");
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
@@ -31,7 +34,7 @@ class RawDataUrlModule extends Module {
 	 * @param {string=} readableIdentifier readable identifier
 	 */
 	constructor(url, identifier, readableIdentifier) {
-		super("asset/raw-data-url", null);
+		super(ASSET_MODULE_TYPE_RAW_DATA_URL, null);
 		this.url = url;
 		this.urlBuffer = url ? Buffer.from(url) : undefined;
 		this.identifierStr = identifier || this.url;
@@ -57,7 +60,8 @@ class RawDataUrlModule extends Module {
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
 	size(type) {
-		if (this.url === undefined) this.url = this.urlBuffer.toString();
+		if (this.url === undefined)
+			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
 		return Math.max(1, this.url.length);
 	}
 
@@ -99,7 +103,8 @@ class RawDataUrlModule extends Module {
 	 * @returns {CodeGenerationResult} result
 	 */
 	codeGeneration(context) {
-		if (this.url === undefined) this.url = this.urlBuffer.toString();
+		if (this.url === undefined)
+			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
 		const sources = new Map();
 		sources.set(
 			"javascript",
@@ -118,10 +123,13 @@ class RawDataUrlModule extends Module {
 	 * @returns {void}
 	 */
 	updateHash(hash, context) {
-		hash.update(this.urlBuffer);
+		hash.update(/** @type {Buffer} */ (this.urlBuffer));
 		super.updateHash(hash, context);
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 
@@ -132,6 +140,9 @@ class RawDataUrlModule extends Module {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -29,6 +29,10 @@ class AwaitDependenciesInitFragment extends InitFragment {
 		this.promises = promises;
 	}
 
+	/**
+	 * @param {AwaitDependenciesInitFragment} other other AwaitDependenciesInitFragment
+	 * @returns {AwaitDependenciesInitFragment} AwaitDependenciesInitFragment
+	 */
 	merge(other) {
 		const promises = new Set(other.promises);
 		for (const p of this.promises) {

package/lib/async-modules/InferAsyncModulesPlugin.js

@@ -42,7 +42,7 @@ class InferAsyncModulesPlugin {
 										c.isTargetActive(undefined)
 								)
 							) {
-								queue.add(originModule);
+								queue.add(/** @type {Module} */ (originModule));
 							}
 						}
 					}

package/lib/buildChunkGraph.js

@@ -16,6 +16,7 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Entrypoint")} Entrypoint */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
@@ -39,15 +40,15 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
  * @typedef {Object} ChunkGroupInfo
  * @property {ChunkGroup} chunkGroup the chunk group
  * @property {RuntimeSpec} runtime the runtimes
- * @property {ModuleSetPlus} minAvailableModules current minimal set of modules available at this point
- * @property {boolean} minAvailableModulesOwned true, if minAvailableModules is owned and can be modified
+ * @property {ModuleSetPlus | undefined} minAvailableModules current minimal set of modules available at this point
+ * @property {boolean | undefined} minAvailableModulesOwned true, if minAvailableModules is owned and can be modified
  * @property {ModuleSetPlus[]} availableModulesToBeMerged enqueued updates to the minimal set of available modules
  * @property {Set<Module>=} skippedItems modules that were skipped because module is already available in parent chunks (need to reconsider when minAvailableModules is shrinking)
  * @property {Set<[Module, ConnectionState]>=} skippedModuleConnections referenced modules that where skipped because they were not active in this runtime
- * @property {ModuleSetPlus} resultingAvailableModules set of modules available including modules from this chunk group
- * @property {Set<ChunkGroupInfo>} children set of children chunk groups, that will be revisited when availableModules shrink
- * @property {Set<ChunkGroupInfo>} availableSources set of chunk groups that are the source for minAvailableModules
- * @property {Set<ChunkGroupInfo>} availableChildren set of chunk groups which depend on the this chunk group as availableSource
+ * @property {ModuleSetPlus | undefined} resultingAvailableModules set of modules available including modules from this chunk group
+ * @property {Set<ChunkGroupInfo> | undefined} children set of children chunk groups, that will be revisited when availableModules shrink
+ * @property {Set<ChunkGroupInfo> | undefined} availableSources set of chunk groups that are the source for minAvailableModules
+ * @property {Set<ChunkGroupInfo> | undefined} availableChildren set of chunk groups which depend on the this chunk group as availableSource
  * @property {number} preOrderIndex next pre order index
  * @property {number} postOrderIndex next post order index
  * @property {boolean} chunkLoading has a chunk loading mechanism
@@ -199,6 +200,7 @@ const visitModules = (
 
 	/** @type {RuntimeSpec | false} */
 	let blockModulesMapRuntime = false;
+	/** @type {Map<DependenciesBlock, (Module | ConnectionState)[]>} */
 	let blockModulesMap;
 
 	/**
@@ -239,7 +241,7 @@ const visitModules = (
 			extractBlockModules(module, moduleGraph, runtime, blockModulesMap);
 			blockModules = blockModulesMap.get(block);
 			logger.timeAggregate("visitModules: prepare");
-			return blockModules;
+			return /** @type {(Module | ConnectionState)[]} */ (blockModules);
 		}
 	};
 
@@ -290,7 +292,7 @@ const visitModules = (
 	for (const [chunkGroup, modules] of inputEntrypointsAndModules) {
 		const runtime = getEntryRuntime(
 			compilation,
-			chunkGroup.name,
+			/** @type {string} */ (chunkGroup.name),
 			chunkGroup.options
 		);
 		/** @type {ChunkGroupInfo} */
@@ -352,7 +354,9 @@ const visitModules = (
 		const { chunkGroup } = chunkGroupInfo;
 		chunkGroupInfo.availableSources = new Set();
 		for (const parent of chunkGroup.parentsIterable) {
-			const parentChunkGroupInfo = chunkGroupInfoMap.get(parent);
+			const parentChunkGroupInfo =
+				/** @type {ChunkGroupInfo} */
+				(chunkGroupInfoMap.get(parent));
 			chunkGroupInfo.availableSources.add(parentChunkGroupInfo);
 			if (parentChunkGroupInfo.availableChildren === undefined) {
 				parentChunkGroupInfo.availableChildren = new Set();
@@ -399,15 +403,15 @@ const visitModules = (
 		// 1. We create a chunk group with single chunk in it for this Block
 		// but only once (blockChunkGroups map)
 		let cgi = blockChunkGroups.get(b);
-		/** @type {ChunkGroup} */
+		/** @type {ChunkGroup | undefined} */
 		let c;
-		/** @type {Entrypoint} */
+		/** @type {Entrypoint | undefined} */
 		let entrypoint;
 		const entryOptions = b.groupOptions && b.groupOptions.entryOptions;
 		if (cgi === undefined) {
 			const chunkName = (b.groupOptions && b.groupOptions.name) || b.chunkName;
 			if (entryOptions) {
-				cgi = namedAsyncEntrypoints.get(chunkName);
+				cgi = namedAsyncEntrypoints.get(/** @type {string} */ (chunkName));
 				if (!cgi) {
 					entrypoint = compilation.addAsyncEntrypoint(
 						entryOptions,
@@ -505,7 +509,11 @@ const visitModules = (
 					c = cgi.chunkGroup;
 					if (c.isInitial()) {
 						compilation.errors.push(
-							new AsyncDependencyToInitialChunkError(chunkName, module, b.loc)
+							new AsyncDependencyToInitialChunkError(
+								/** @type {string} */ (chunkName),
+								module,
+								b.loc
+							)
 						);
 						c = chunkGroup;
 					} else {
@@ -515,7 +523,7 @@ const visitModules = (
 				}
 				blockConnections.set(b, []);
 			}
-			blockChunkGroups.set(b, cgi);
+			blockChunkGroups.set(b, /** @type {ChunkGroupInfo} */ (cgi));
 		} else if (entryOptions) {
 			entrypoint = /** @type {Entrypoint} */ (cgi.chunkGroup);
 		} else {
@@ -536,7 +544,7 @@ const visitModules = (
 				connectList = new Set();
 				queueConnect.set(chunkGroupInfo, connectList);
 			}
-			connectList.add(cgi);
+			connectList.add(/** @type {ChunkGroupInfo} */ (cgi));
 
 			// TODO check if this really need to be done for each traversal
 			// or if it is enough when it's queued when created
@@ -547,7 +555,7 @@ const visitModules = (
 				module: module,
 				chunk: c.chunks[0],
 				chunkGroup: c,
-				chunkGroupInfo: cgi
+				chunkGroupInfo: /** @type {ChunkGroupInfo} */ (cgi)
 			});
 		} else if (entrypoint !== undefined) {
 			chunkGroupInfo.chunkGroup.addAsyncEntrypoint(entrypoint);
@@ -690,7 +698,7 @@ const visitModules = (
 	const processQueue = () => {
 		while (queue.length) {
 			statProcessedQueueItems++;
-			const queueItem = queue.pop();
+			const queueItem = /** @type {QueueItem} */ (queue.pop());
 			module = queueItem.module;
 			block = queueItem.block;
 			chunk = queueItem.chunk;
@@ -1087,7 +1095,9 @@ const visitModules = (
 
 	const processChunkGroupsForCombining = () => {
 		for (const info of chunkGroupsForCombining) {
-			for (const source of info.availableSources) {
+			for (const source of /** @type {Set<ChunkGroupInfo>} */ (
+				info.availableSources
+			)) {
 				if (!source.minAvailableModules) {
 					chunkGroupsForCombining.delete(info);
 					break;
@@ -1106,7 +1116,9 @@ const visitModules = (
 				}
 			};
 			// combine minAvailableModules from all resultingAvailableModules
-			for (const source of info.availableSources) {
+			for (const source of /** @type {Set<ChunkGroupInfo>} */ (
+				info.availableSources
+			)) {
 				const resultingAvailableModules =
 					calculateResultingAvailableModules(source);
 				mergeSet(resultingAvailableModules);
@@ -1126,7 +1138,9 @@ const visitModules = (
 		for (const info of outdatedChunkGroupInfo) {
 			// 1. Reconsider skipped items
 			if (info.skippedItems !== undefined) {
-				const { minAvailableModules } = info;
+				const minAvailableModules =
+					/** @type {ModuleSetPlus} */
+					(info.minAvailableModules);
 				for (const module of info.skippedItems) {
 					if (
 						!minAvailableModules.has(module) &&
@@ -1147,7 +1161,9 @@ const visitModules = (
 
 			// 2. Reconsider skipped connections
 			if (info.skippedModuleConnections !== undefined) {
-				const { minAvailableModules } = info;
+				const minAvailableModules =
+					/** @type {ModuleSetPlus} */
+					(info.minAvailableModules);
 				for (const entry of info.skippedModuleConnections) {
 					const [module, activeState] = entry;
 					if (activeState === false) continue;

package/lib/cache/IdleFileCachePlugin.js

@@ -50,7 +50,7 @@ class IdleFileCachePlugin {
 		let timeSpendInStore = 0;
 		let avgTimeSpendInStore = 0;
 
-		/** @type {Map<string | typeof BUILD_DEPENDENCIES_KEY, () => Promise>} */
+		/** @type {Map<string | typeof BUILD_DEPENDENCIES_KEY, () => Promise<void>>} */
 		const pendingIdleTasks = new Map();
 
 		compiler.cache.hooks.store.tap(
@@ -171,6 +171,7 @@ class IdleFileCachePlugin {
 				isInitialStore = false;
 			}
 		};
+		/** @type {ReturnType<typeof setTimeout> | undefined} */
 		let idleTimer = undefined;
 		compiler.cache.hooks.beginIdle.tap(
 			{ name: "IdleFileCachePlugin", stage: Cache.STAGE_DISK },

package/lib/cache/MemoryWithGcCachePlugin.js

@@ -34,6 +34,8 @@ class MemoryWithGcCachePlugin {
 			generation++;
 			let clearedEntries = 0;
 			let lastClearedIdentifier;
+			// Avoid coverage problems due indirect changes
+			/* istanbul ignore next */
 			for (const [identifier, entry] of oldCache) {
 				if (entry.until > generation) break;