webpack 5.104.1 → 5.105.0

package/lib/optimize/RealContentHashPlugin.js

@@ -20,6 +20,12 @@ const createHash = require("../util/createHash");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {typeof import("../util/Hash")} Hash */
 
+/**
+ * @template T
+ * @typedef {import("../util/comparators").Comparator<T>} Comparator
+ */
+
+/** @type {Hashes} */
 const EMPTY_SET = new Set();
 
 /**
@@ -47,6 +53,7 @@ const mapAndDeduplicateBuffers = (input, fn) => {
 	// Buffer.equals compares size first so this should be efficient enough
 	// If it becomes a performance problem we can use a map and group by size
 	// instead of looping over all assets.
+	/** @type {Buffer[]} */
 	const result = [];
 	outer: for (const value of input) {
 		const buf = fn(value);
@@ -65,6 +72,7 @@ const mapAndDeduplicateBuffers = (input, fn) => {
  */
 const quoteMeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
 
+/** @type {WeakMap<Source, CachedSource>} */
 const cachedSourceMap = new WeakMap();
 
 /**
@@ -82,8 +90,6 @@ const toCachedSource = (source) => {
 	return newSource;
 };
 
-/** @typedef {Set<string>} OwnHashes */
-/** @typedef {Set<string>} ReferencedHashes */
 /** @typedef {Set<string>} Hashes */
 
 /**
@@ -94,10 +100,10 @@ const toCachedSource = (source) => {
  * @property {RawSource | undefined} newSource
  * @property {RawSource | undefined} newSourceWithoutOwn
  * @property {string} content
- * @property {OwnHashes | undefined} ownHashes
+ * @property {Hashes | undefined} ownHashes
  * @property {Promise<void> | undefined} contentComputePromise
  * @property {Promise<void> | undefined} contentComputeWithoutOwnPromise
- * @property {ReferencedHashes | undefined} referencedHashes
+ * @property {Hashes | undefined} referencedHashes
  * @property {Hashes} hashes
  */
 
@@ -220,7 +226,9 @@ class RealContentHashPlugin {
 							);
 							[asset.referencedHashes, asset.ownHashes] =
 								await cacheAnalyse.providePromise(name, etag, () => {
+									/** @type {Hashes} */
 									const referencedHashes = new Set();
+									/** @type {Hashes} */
 									const ownHashes = new Set();
 									const inContent = content.match(hashRegExp);
 									if (inContent) {
@@ -238,15 +246,13 @@ class RealContentHashPlugin {
 					);
 					/**
 					 * @param {string} hash the hash
-					 * @returns {undefined | ReferencedHashes} the referenced hashes
+					 * @returns {undefined | Hashes} the referenced hashes
 					 */
 					const getDependencies = (hash) => {
 						const assets = hashToAssets.get(hash);
 						if (!assets) {
 							const referencingAssets = assetsWithInfo.filter((asset) =>
-								/** @type {ReferencedHashes} */ (asset.referencedHashes).has(
-									hash
-								)
+								/** @type {Hashes} */ (asset.referencedHashes).has(hash)
 							);
 							const err = new WebpackError(`RealContentHashPlugin
 Some kind of unexpected caching problem occurred.
@@ -264,16 +270,15 @@ ${referencingAssets
 							compilation.errors.push(err);
 							return;
 						}
+						/** @type {Hashes} */
 						const hashes = new Set();
 						for (const { referencedHashes, ownHashes } of assets) {
-							if (!(/** @type {OwnHashes} */ (ownHashes).has(hash))) {
-								for (const hash of /** @type {OwnHashes} */ (ownHashes)) {
+							if (!(/** @type {Hashes} */ (ownHashes).has(hash))) {
+								for (const hash of /** @type {Hashes} */ (ownHashes)) {
 									hashes.add(hash);
 								}
 							}
-							for (const hash of /** @type {ReferencedHashes} */ (
-								referencedHashes
-							)) {
+							for (const hash of /** @type {Hashes} */ (referencedHashes)) {
 								hashes.add(hash);
 							}
 						}
@@ -290,7 +295,7 @@ ${referencingAssets
 							(a) => a.name
 						)})`;
 					};
-					/** @type {Set<string>} */
+					/** @type {Hashes} */
 					const hashesInOrder = new Set();
 					for (const hash of hashToAssets.keys()) {
 						/**
@@ -329,7 +334,7 @@ ${referencingAssets
 						cacheGenerate.mergeEtags(
 							cacheGenerate.getLazyHashedEtag(asset.source),
 							Array.from(
-								/** @type {ReferencedHashes} */ (asset.referencedHashes),
+								/** @type {Hashes} */ (asset.referencedHashes),
 								(hash) => hashToNewHash.get(hash)
 							).join("|")
 						);
@@ -341,10 +346,10 @@ ${referencingAssets
 						if (asset.contentComputePromise) return asset.contentComputePromise;
 						return (asset.contentComputePromise = (async () => {
 							if (
-								/** @type {OwnHashes} */ (asset.ownHashes).size > 0 ||
-								[
-									.../** @type {ReferencedHashes} */ (asset.referencedHashes)
-								].some((hash) => hashToNewHash.get(hash) !== hash)
+								/** @type {Hashes} */ (asset.ownHashes).size > 0 ||
+								[.../** @type {Hashes} */ (asset.referencedHashes)].some(
+									(hash) => hashToNewHash.get(hash) !== hash
+								)
 							) {
 								const identifier = asset.name;
 								const etag = getEtag(asset);
@@ -372,10 +377,10 @@ ${referencingAssets
 						}
 						return (asset.contentComputeWithoutOwnPromise = (async () => {
 							if (
-								/** @type {OwnHashes} */ (asset.ownHashes).size > 0 ||
-								[
-									.../** @type {ReferencedHashes} */ (asset.referencedHashes)
-								].some((hash) => hashToNewHash.get(hash) !== hash)
+								/** @type {Hashes} */ (asset.ownHashes).size > 0 ||
+								[.../** @type {Hashes} */ (asset.referencedHashes)].some(
+									(hash) => hashToNewHash.get(hash) !== hash
+								)
 							) {
 								const identifier = `${asset.name}|without-own`;
 								const etag = getEtag(asset);
@@ -387,7 +392,7 @@ ${referencingAssets
 											hashRegExp,
 											(hash) => {
 												if (
-													/** @type {OwnHashes} */
+													/** @type {Hashes} */
 													(asset.ownHashes).has(hash)
 												) {
 													return "";
@@ -401,6 +406,7 @@ ${referencingAssets
 							}
 						})());
 					};
+					/** @type {Comparator<AssetInfoForRealContentHash>} */
 					const comparator = compareSelect((a) => a.name, compareStrings);
 					for (const oldHash of hashesInOrder) {
 						const assets =
@@ -409,13 +415,13 @@ ${referencingAssets
 						assets.sort(comparator);
 						await Promise.all(
 							assets.map((asset) =>
-								/** @type {OwnHashes} */ (asset.ownHashes).has(oldHash)
+								/** @type {Hashes} */ (asset.ownHashes).has(oldHash)
 									? computeNewContentWithoutOwn(asset)
 									: computeNewContent(asset)
 							)
 						);
 						const assetsContent = mapAndDeduplicateBuffers(assets, (asset) => {
-							if (/** @type {OwnHashes} */ (asset.ownHashes).has(oldHash)) {
+							if (/** @type {Hashes} */ (asset.ownHashes).has(oldHash)) {
 								return asset.newSourceWithoutOwn
 									? asset.newSourceWithoutOwn.buffer()
 									: asset.source.buffer();
@@ -447,7 +453,9 @@ ${referencingAssets
 							);
 
 							const infoUpdate = {};
-							const hash = /** @type {string} */ (asset.info.contenthash);
+							const hash =
+								/** @type {Exclude<AssetInfo["contenthash"], undefined>} */
+								(asset.info.contenthash);
 							infoUpdate.contenthash = Array.isArray(hash)
 								? hash.map(
 										(hash) => /** @type {string} */ (hashToNewHash.get(hash))

package/lib/optimize/RemoveParentModulesPlugin.js

@@ -33,7 +33,7 @@ const THIRTY_TWO_BIGINT = BigInt(32);
  * Parses the module mask and returns the modules represented by it
  * @param {bigint} mask the module mask
  * @param {Module[]} ordinalModules the modules in the order they were added to the mask (LSB is index 0)
- * @returns {Generator<Module>} the modules represented by the mask
+ * @returns {Generator<Module, undefined, undefined>} the modules represented by the mask
  */
 function* getModulesFromMask(mask, ordinalModules) {
 	let offset = 31;
@@ -74,10 +74,13 @@ class RemoveParentModulesPlugin {
 			 */
 			const handler = (chunks, chunkGroups) => {
 				const chunkGraph = compilation.chunkGraph;
+				/** @type {Set<ChunkGroup>} */
 				const queue = new Set();
+				/** @type {WeakMap<ChunkGroup, bigint | undefined>} */
 				const availableModulesMap = new WeakMap();
 
 				let nextModuleMask = ONE_BIGINT;
+				/** @type {WeakMap<Module, bigint>} */
 				const maskByModule = new WeakMap();
 				/** @type {Module[]} */
 				const ordinalModules = [];
@@ -99,6 +102,7 @@ class RemoveParentModulesPlugin {
 				};
 
 				// Initialize masks by chunk and by chunk group for quicker comparisons
+				/** @type {WeakMap<Chunk, bigint>} */
 				const chunkMasks = new WeakMap();
 				for (const chunk of chunks) {
 					let mask = ZERO_BIGINT;
@@ -109,6 +113,7 @@ class RemoveParentModulesPlugin {
 					chunkMasks.set(chunk, mask);
 				}
 
+				/** @type {WeakMap<ChunkGroup, bigint>} */
 				const chunkGroupMasks = new WeakMap();
 				for (const chunkGroup of chunkGroups) {
 					let mask = ZERO_BIGINT;
@@ -143,7 +148,8 @@ class RemoveParentModulesPlugin {
 						const availableModulesInParent = availableModulesMap.get(parent);
 						if (availableModulesInParent !== undefined) {
 							const parentMask =
-								availableModulesInParent | chunkGroupMasks.get(parent);
+								availableModulesInParent |
+								/** @type {bigint} */ (chunkGroupMasks.get(parent));
 							// If we know the available modules in parent: process these
 							if (availableModulesMask === undefined) {
 								// if we have not own info yet: create new entry
@@ -181,7 +187,10 @@ class RemoveParentModulesPlugin {
 					);
 					if (availableModulesSets.includes(undefined)) continue; // No info about this chunk group
 
-					const availableModulesMask = intersectMasks(availableModulesSets);
+					const availableModulesMask = intersectMasks(
+						/** @type {bigint[]} */
+						(availableModulesSets)
+					);
 					const toRemoveMask = chunkMask & availableModulesMask;
 					if (toRemoveMask !== ZERO_BIGINT) {
 						for (const module of getModulesFromMask(

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -68,6 +68,7 @@ class SideEffectsFlagPlugin {
 	 * @param {boolean} analyseSource analyse source code for side effects
 	 */
 	constructor(analyseSource = true) {
+		/** @type {boolean} */
 		this._analyseSource = analyseSource;
 	}
 
@@ -277,6 +278,7 @@ class SideEffectsFlagPlugin {
 
 						logger.time("update dependencies");
 
+						/** @type {Set<Module>} */
 						const optimizedModules = new Set();
 
 						/**
@@ -291,6 +293,7 @@ class SideEffectsFlagPlugin {
 									module
 								)) {
 									const dep = connection.dependency;
+									/** @type {boolean} */
 									let isReexport;
 									if (
 										(isReexport =

package/lib/optimize/SplitChunksPlugin.js

@@ -36,6 +36,7 @@ const MinMaxSizeWarning = require("./MinMaxSizeWarning");
 /** @typedef {import("../TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("../util/deterministicGrouping").GroupedItems<Module>} DeterministicGroupingGroupedItemsForModule */
 /** @typedef {import("../util/deterministicGrouping").Options<Module>} DeterministicGroupingOptionsForModule */
+/** @typedef {import("../util/deterministicGrouping").Sizes} Sizes */
 
 /**
  * @callback ChunkFilterFn
@@ -220,9 +221,10 @@ const getRequests = (chunk) => {
  * @returns {T} result
  */
 const mapObject = (obj, fn) => {
+	/** @type {T} */
 	const newObj = Object.create(null);
 	for (const key of Object.keys(obj)) {
-		newObj[key] = fn(
+		newObj[/** @type {keyof T} */ (key)] = fn(
 			obj[/** @type {keyof T} */ (key)],
 			/** @type {keyof T} */
 			(key)
@@ -478,6 +480,7 @@ const normalizeCacheGroups = (cacheGroups, defaultSizeTypes) => {
 					}
 				});
 			} else if (typeof option === "function") {
+				/** @type {WeakMap<OptimizationSplitChunksCacheGroup, CacheGroupSource>} */
 				const cache = new WeakMap();
 				handlers.push((module, context, results) => {
 					const result = option(module);
@@ -868,7 +871,7 @@ module.exports = class SplitChunksPlugin {
 						index <<= ONE;
 					}
 					/**
-					 * @param {Iterable<Chunk>} chunks list of chunks
+					 * @param {Iterable<Chunk, undefined, undefined>} chunks list of chunks
 					 * @returns {bigint | Chunk} key of the chunks
 					 */
 					const getKey = (chunks) => {
@@ -921,6 +924,7 @@ module.exports = class SplitChunksPlugin {
 					 */
 					const groupChunksByExports = (module) => {
 						const exportsInfo = moduleGraph.getExportsInfo(module);
+						/** @type {Map<string, Chunk[]>} */
 						const groupedByUsedExports = new Map();
 						for (const chunk of chunkGraph.getModuleChunksIterable(module)) {
 							const key = exportsInfo.getUsageKey(chunk.runtime);
@@ -1082,7 +1086,8 @@ module.exports = class SplitChunksPlugin {
 					 * @property {bigint | Chunk} key a key of the list
 					 */
 
-					/** @type {WeakMap<ChunkSet | Chunk, WeakMap<ChunkFilterFn, SelectedChunksResult>>} */
+					/** @typedef {WeakMap<ChunkFilterFn, SelectedChunksResult>} ChunkMap */
+					/** @type {WeakMap<ChunkSet | Chunk, ChunkMap>} */
 					const selectedChunksCacheByChunksSet = new WeakMap();
 
 					/**
@@ -1095,6 +1100,7 @@ module.exports = class SplitChunksPlugin {
 					const getSelectedChunks = (chunks, chunkFilter) => {
 						let entry = selectedChunksCacheByChunksSet.get(chunks);
 						if (entry === undefined) {
+							/** @type {ChunkMap} */
 							entry = new WeakMap();
 							selectedChunksCacheByChunksSet.set(chunks, entry);
 						}
@@ -1392,7 +1398,9 @@ module.exports = class SplitChunksPlugin {
 
 					while (chunksInfoMap.size > 0) {
 						// Find best matching entry
+						/** @type {undefined | string} */
 						let bestEntryKey;
+						/** @type {undefined | ChunksInfoItem} */
 						let bestEntry;
 						for (const pair of chunksInfoMap) {
 							const key = pair[0];
@@ -1471,6 +1479,7 @@ module.exports = class SplitChunksPlugin {
 							item.cacheGroup._conditionalEnforce &&
 							checkMinSize(item.sizes, item.cacheGroup.enforceSizeThreshold);
 
+						/** @type {Set<Chunk>} */
 						const usedChunks = new Set(item.chunks);
 
 						// Check if maxRequests condition can be fulfilled
@@ -1533,6 +1542,7 @@ module.exports = class SplitChunksPlugin {
 							usedChunks.size === 1
 						) {
 							const [chunk] = usedChunks;
+							/** @type {SplitChunksSizes} */
 							const chunkSizes = Object.create(null);
 							for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
 								if (!item.modules.has(module)) {
@@ -1763,6 +1773,7 @@ module.exports = class SplitChunksPlugin {
 								return key;
 							},
 							getSize(module) {
+								/** @type {Sizes} */
 								const size = Object.create(null);
 								for (const key of module.getSourceTypes()) {
 									size[key] = module.size(key);

package/lib/performance/AssetsOverSizeLimitWarning.js

@@ -10,7 +10,7 @@ const WebpackError = require("../WebpackError");
 
 /** @typedef {import("./SizeLimitsPlugin").AssetDetails} AssetDetails */
 
-module.exports = class AssetsOverSizeLimitWarning extends WebpackError {
+class AssetsOverSizeLimitWarning extends WebpackError {
 	/**
 	 * @param {AssetDetails[]} assetsOverSizeLimit the assets
 	 * @param {number} assetLimit the size limit
@@ -26,7 +26,11 @@ module.exports = class AssetsOverSizeLimitWarning extends WebpackError {
 This can impact web performance.
 Assets: ${assetLists}`);
 
+		/** @type {string} */
 		this.name = "AssetsOverSizeLimitWarning";
 		this.assets = assetsOverSizeLimit;
 	}
-};
+}
+
+/** @type {typeof AssetsOverSizeLimitWarning} */
+module.exports = AssetsOverSizeLimitWarning;

package/lib/performance/EntrypointsOverSizeLimitWarning.js

@@ -10,7 +10,7 @@ const WebpackError = require("../WebpackError");
 
 /** @typedef {import("./SizeLimitsPlugin").EntrypointDetails} EntrypointDetails */
 
-module.exports = class EntrypointsOverSizeLimitWarning extends WebpackError {
+class EntrypointsOverSizeLimitWarning extends WebpackError {
 	/**
 	 * @param {EntrypointDetails[]} entrypoints the entrypoints
 	 * @param {number} entrypointLimit the size limit
@@ -29,7 +29,11 @@ module.exports = class EntrypointsOverSizeLimitWarning extends WebpackError {
 		)}). This can impact web performance.
 Entrypoints:${entrypointList}\n`);
 
+		/** @type {string} */
 		this.name = "EntrypointsOverSizeLimitWarning";
 		this.entrypoints = entrypoints;
 	}
-};
+}
+
+/** @type {typeof EntrypointsOverSizeLimitWarning} */
+module.exports = EntrypointsOverSizeLimitWarning;

package/lib/performance/NoAsyncChunksWarning.js

@@ -15,6 +15,7 @@ module.exports = class NoAsyncChunksWarning extends WebpackError {
 				"For more info visit https://webpack.js.org/guides/code-splitting/"
 		);
 
+		/** @type {string} */
 		this.name = "NoAsyncChunksWarning";
 	}
 };

package/lib/rules/BasicEffectRulePlugin.js

@@ -24,7 +24,9 @@ class BasicEffectRulePlugin {
 	 * @param {string=} effectType the effect type
 	 */
 	constructor(ruleProperty, effectType) {
+		/** @type {BasicEffectRuleKeys} */
 		this.ruleProperty = ruleProperty;
+		/** @type {string | BasicEffectRuleKeys} */
 		this.effectType = effectType || ruleProperty;
 	}
 

package/lib/rules/BasicMatcherRulePlugin.js

@@ -27,8 +27,11 @@ class BasicMatcherRulePlugin {
 	 * @param {boolean=} invert if true, inverts the condition
 	 */
 	constructor(ruleProperty, dataProperty, invert) {
+		/** @type {BasicMatcherRuleKeys} */
 		this.ruleProperty = ruleProperty;
+		/** @type {string | BasicMatcherRuleKeys} */
 		this.dataProperty = dataProperty || ruleProperty;
+		/** @type {boolean} */
 		this.invert = invert || false;
 	}
 

package/lib/rules/ObjectMatcherRulePlugin.js

@@ -18,18 +18,22 @@
  */
 
 /** @typedef {KeysOfTypes<RuleSetRule, { [k: string]: RuleSetConditionOrConditions }>} ObjectMatcherRuleKeys */
+/** @typedef {keyof EffectData} DataProperty */
 
 const PLUGIN_NAME = "ObjectMatcherRulePlugin";
 
 class ObjectMatcherRulePlugin {
 	/**
 	 * @param {ObjectMatcherRuleKeys} ruleProperty the rule property
-	 * @param {keyof EffectData=} dataProperty the data property
+	 * @param {DataProperty=} dataProperty the data property
 	 * @param {RuleConditionFunction=} additionalConditionFunction need to check
 	 */
 	constructor(ruleProperty, dataProperty, additionalConditionFunction) {
+		/** @type {ObjectMatcherRuleKeys} */
 		this.ruleProperty = ruleProperty;
+		/** @type {DataProperty | ObjectMatcherRuleKeys} */
 		this.dataProperty = dataProperty || ruleProperty;
+		/** @type {RuleConditionFunction | undefined} */
 		this.additionalConditionFunction = additionalConditionFunction;
 	}
 

package/lib/rules/RuleSetCompiler.js

@@ -116,6 +116,7 @@ class RuleSetCompiler {
 	 * @returns {RuleSet} compiled RuleSet
 	 */
 	compile(ruleSet) {
+		/** @type {References} */
 		const refs = new Map();
 		const rules = this.compileRules("ruleSet", ruleSet, refs);
 
@@ -327,6 +328,7 @@ class RuleSetCompiler {
 			);
 		}
 
+		/** @type {Condition[]} */
 		const conditions = [];
 		for (const key of Object.keys(condition)) {
 			const value = condition[key];

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -16,6 +16,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 	 */
 	constructor(deferInterop = false) {
 		super("async module");
+		/** @type {boolean} */
 		this._deferInterop = deferInterop;
 	}
 

package/lib/runtime/ChunkNameRuntimeModule.js

@@ -13,6 +13,7 @@ class ChunkNameRuntimeModule extends RuntimeModule {
 	 */
 	constructor(chunkName) {
 		super("chunkName");
+		/** @type {string} */
 		this.chunkName = chunkName;
 	}
 

package/lib/runtime/CompatRuntimeModule.js

@@ -14,6 +14,7 @@ const RuntimeModule = require("../RuntimeModule");
 class CompatRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("compat", RuntimeModule.STAGE_ATTACH);
+		/** @type {boolean} */
 		this.fullHash = true;
 	}
 

package/lib/runtime/EnsureChunkRuntimeModule.js

@@ -17,6 +17,7 @@ class EnsureChunkRuntimeModule extends RuntimeModule {
 	 */
 	constructor(runtimeRequirements) {
 		super("ensure chunk");
+		/** @type {ReadOnlyRuntimeRequirements} */
 		this.runtimeRequirements = runtimeRequirements;
 	}
 

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -26,10 +26,14 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 	 */
 	constructor(contentType, name, global, getFilenameForChunk, allChunks) {
 		super(`get ${name} chunk filename`);
+		/** @type {string} */
 		this.contentType = contentType;
+		/** @type {string} */
 		this.global = global;
 		this.getFilenameForChunk = getFilenameForChunk;
+		/** @type {boolean} */
 		this.allChunks = allChunks;
+		/** @type {boolean} */
 		this.dependentHash = true;
 	}
 

package/lib/runtime/GetMainFilenameRuntimeModule.js

@@ -19,7 +19,9 @@ class GetMainFilenameRuntimeModule extends RuntimeModule {
 	 */
 	constructor(name, global, filename) {
 		super(`get ${name} filename`);
+		/** @type {string} */
 		this.global = global;
+		/** @type {string} */
 		this.filename = filename;
 	}
 

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js

@@ -17,6 +17,7 @@ class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	 */
 	constructor(runtimeRequirements) {
 		super("trusted types policy");
+		/** @type {ReadOnlyRuntimeRequirements} */
 		this.runtimeRequirements = runtimeRequirements;
 	}
 

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -47,7 +47,9 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 	 */
 	constructor(withCreateScriptUrl, withFetchPriority) {
 		super("load script");
+		/** @type {boolean | undefined} */
 		this._withCreateScriptUrl = withCreateScriptUrl;
+		/** @type {boolean | undefined} */
 		this._withFetchPriority = withFetchPriority;
 	}