webpack 5.87.0 → 5.88.0

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/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/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/PackFileCacheStrategy.js

@@ -22,6 +22,8 @@ const {
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../FileSystemInfo").Snapshot} Snapshot */
 /** @typedef {import("../logging/Logger").Logger} Logger */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 class PackContainer {
@@ -58,6 +60,9 @@ class PackContainer {
 		writeLazy(this.data);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize({ read }) {
 		this.version = read();
 		this.buildSnapshot = read();
@@ -99,7 +104,7 @@ class Pack {
 	constructor(logger, maxAge) {
 		/** @type {Map<string, PackItemInfo>} */
 		this.itemInfo = new Map();
-		/** @type {string[]} */
+		/** @type {(string | undefined)[]} */
 		this.requests = [];
 		this.requestsTimeout = undefined;
 		/** @type {Map<string, PackItemInfo>} */
@@ -111,6 +116,9 @@ class Pack {
 		this.maxAge = maxAge;
 	}
 
+	/**
+	 * @param {string} identifier identifier
+	 */
 	_addRequest(identifier) {
 		this.requests.push(identifier);
 		if (this.requestsTimeout === undefined) {
@@ -149,7 +157,7 @@ class Pack {
 			if (!this.content[loc]) {
 				return undefined;
 			}
-			return this.content[loc].get(identifier);
+			return /** @type {PackContent} */ (this.content[loc]).get(identifier);
 		}
 	}
 
@@ -175,7 +183,7 @@ class Pack {
 			if (loc >= 0) {
 				this._addRequest(identifier);
 				this.freshContent.set(identifier, info);
-				const content = this.content[loc];
+				const content = /** @type {PackContent} */ (this.content[loc]);
 				content.delete(identifier);
 				if (content.items.size === 0) {
 					this.content[loc] = undefined;
@@ -351,11 +359,12 @@ class Pack {
 			mergedIndices = smallUnusedContents;
 		} else return;
 
+		/** @type {PackContent[] } */
 		const mergedContent = [];
 
 		// 3. Remove old content entries
 		for (const i of mergedIndices) {
-			mergedContent.push(this.content[i]);
+			mergedContent.push(/** @type {PackContent} */ (this.content[i]));
 			this.content[i] = undefined;
 		}
 
@@ -364,7 +373,7 @@ class Pack {
 		const mergedItems = new Set();
 		/** @type {Set<string>} */
 		const mergedUsedItems = new Set();
-		/** @type {(function(Map<string, any>): Promise)[]} */
+		/** @type {(function(Map<string, any>): Promise<void>)[]} */
 		const addToMergedMap = [];
 		for (const content of mergedContent) {
 			for (const identifier of content.items) {
@@ -498,17 +507,20 @@ class Pack {
 	 * Only runs for one content to avoid large invalidation.
 	 */
 	_gcOldestContent() {
-		/** @type {PackItemInfo} */
+		/** @type {PackItemInfo | undefined} */
 		let oldest = undefined;
 		for (const info of this.itemInfo.values()) {
 			if (oldest === undefined || info.lastAccess < oldest.lastAccess) {
 				oldest = info;
 			}
 		}
-		if (Date.now() - oldest.lastAccess > this.maxAge) {
-			const loc = oldest.location;
+		if (
+			Date.now() - /** @type {PackItemInfo} */ (oldest).lastAccess >
+			this.maxAge
+		) {
+			const loc = /** @type {PackItemInfo} */ (oldest).location;
 			if (loc < 0) return;
-			const content = this.content[loc];
+			const content = /** @type {PackContent} */ (this.content[loc]);
 			const items = new Set(content.items);
 			const usedItems = new Set(content.used);
 			this._gcAndUpdateLocation(items, usedItems, loc);
@@ -771,6 +783,7 @@ class PackContent {
 
 		// We are in state B
 		const { lazyName } = this;
+		/** @type {string | undefined} */
 		let timeMessage;
 		if (lazyName) {
 			// only log once
@@ -811,7 +824,7 @@ class PackContent {
 
 	/**
 	 * @param {string} reason explanation why unpack is necessary
-	 * @returns {void | Promise} maybe a promise if lazy
+	 * @returns {void | Promise<void>} maybe a promise if lazy
 	 */
 	unpack(reason) {
 		if (this.content) return;
@@ -819,6 +832,7 @@ class PackContent {
 		// Move from state B to C
 		if (this.lazy) {
 			const { lazyName } = this;
+			/** @type {string | undefined} */
 			let timeMessage;
 			if (lazyName) {
 				// only log once
@@ -862,6 +876,9 @@ class PackContent {
 		return size;
 	}
 
+	/**
+	 * @param {string} identifier identifier
+	 */
 	delete(identifier) {
 		this.items.delete(identifier);
 		this.used.delete(identifier);
@@ -906,6 +923,7 @@ class PackContent {
 		}
 		// State B2
 		const { lazyName } = this;
+		/** @type {string | undefined} */
 		let timeMessage;
 		if (lazyName) {
 			// only log once
@@ -1028,17 +1046,20 @@ class PackFileCacheStrategy {
 		this.buildDependencies = new Set();
 		/** @type {LazySet<string>} */
 		this.newBuildDependencies = new LazySet();
-		/** @type {Snapshot} */
+		/** @type {Snapshot | undefined} */
 		this.resolveBuildDependenciesSnapshot = undefined;
-		/** @type {Map<string, string | false>} */
+		/** @type {Map<string, string | false> | undefined} */
 		this.resolveResults = undefined;
-		/** @type {Snapshot} */
+		/** @type {Snapshot | undefined} */
 		this.buildSnapshot = undefined;
-		/** @type {Promise<Pack>} */
+		/** @type {Promise<Pack> | undefined} */
 		this.packPromise = this._openPack();
 		this.storePromise = Promise.resolve();
 	}
 
+	/**
+	 * @returns {Promise<Pack>} pack
+	 */
 	_getPack() {
 		if (this.packPromise === undefined) {
 			this.packPromise = this.storePromise.then(() => this._openPack());

package/lib/config/browserslistTargetHandler.js

@@ -120,7 +120,7 @@ const resolve = browsers => {
 		and_qq: [10, 4],
 		// baidu: Not supported
 		// and_uc: Not supported
-		// kaios: Not supported
+		kaios: [3, 0],
 		node: [12, 17]
 	});
 
@@ -187,7 +187,7 @@ const resolve = browsers => {
 			// and_qq: Unknown support
 			// baidu: Unknown support
 			// and_uc: Unknown support
-			// kaios: Unknown support
+			kaios: [3, 0],
 			node: [0, 12]
 		}),
 		destructuring: rawChecker({
@@ -206,7 +206,7 @@ const resolve = browsers => {
 			// and_qq: Unknown support
 			// baidu: Unknown support
 			// and_uc: Unknown support
-			// kaios: Unknown support
+			kaios: [2, 5],
 			node: [6, 0]
 		}),
 		bigIntLiteral: rawChecker({
@@ -225,7 +225,7 @@ const resolve = browsers => {
 			// and_qq: Not supported
 			// baidu: Not supported
 			// and_uc: Not supported
-			// kaios: Not supported
+			kaios: [3, 0],
 			node: [10, 4]
 		}),
 		// Support syntax `import` and `export` and no limitations and bugs on Node.js
@@ -246,7 +246,7 @@ const resolve = browsers => {
 			and_qq: [10, 4],
 			// baidu: Not supported
 			// and_uc: Not supported
-			// kaios: Not supported
+			kaios: [3, 0],
 			node: [12, 17]
 		}),
 		dynamicImport: es6DynamicImport,
@@ -269,7 +269,7 @@ const resolve = browsers => {
 			// and_qq: Unknown support
 			// baidu: Unknown support
 			// and_uc: Unknown support
-			// kaios: Unknown support
+			kaios: [3, 0],
 			node: 12
 		}),
 		optionalChaining: rawChecker({
@@ -288,7 +288,7 @@ const resolve = browsers => {
 			// and_qq: Not supported
 			// baidu: Not supported
 			// and_uc: Not supported
-			// kaios: Not supported
+			kaios: [3, 0],
 			node: 14
 		}),
 		templateLiteral: rawChecker({

package/lib/config/defaults.js

@@ -15,7 +15,9 @@ const {
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	WEBASSEMBLY_MODULE_TYPE_SYNC,
 	ASSET_MODULE_TYPE,
-	CSS_MODULE_TYPE
+	CSS_MODULE_TYPE_AUTO,
+	CSS_MODULE_TYPE,
+	CSS_MODULE_TYPE_MODULE
 } = require("../ModuleTypeConstants");
 const Template = require("../Template");
 const { cleverMerge } = require("../util/cleverMerge");
@@ -708,38 +710,24 @@ const applyModuleDefaults = (
 			});
 		}
 		if (css) {
-			const cssRule = {
-				type: CSS_MODULE_TYPE,
-				resolve: {
-					fullySpecified: true,
-					preferRelative: true
-				}
-			};
-			const cssModulesRule = {
-				type: "css/module",
-				resolve: {
-					fullySpecified: true
-				}
+			const resolve = {
+				fullySpecified: true,
+				preferRelative: true
 			};
 			rules.push({
 				test: /\.css$/i,
-				oneOf: [
-					{
-						test: /\.module\.css$/i,
-						...cssModulesRule
-					},
-					{
-						...cssRule
-					}
-				]
+				type: CSS_MODULE_TYPE_AUTO,
+				resolve
 			});
 			rules.push({
 				mimetype: "text/css+module",
-				...cssModulesRule
+				type: CSS_MODULE_TYPE_MODULE,
+				resolve
 			});
 			rules.push({
 				mimetype: "text/css",
-				...cssRule
+				type: CSS_MODULE_TYPE,
+				resolve
 			});
 		}
 		rules.push(

package/lib/container/RemoteRuntimeModule.js

@@ -18,7 +18,7 @@ class RemoteRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		const { compilation, chunkGraph } = this;

package/lib/css/CssLoadingRuntimeModule.js

@@ -56,7 +56,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		const { compilation, chunk, _runtimeRequirements } = this;
@@ -135,6 +135,14 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 
 		/** @type {(str: string) => number} */
 		const cc = str => str.charCodeAt(0);
+		const name = uniqueName
+			? runtimeTemplate.concatenation(
+					"--webpack-",
+					{ expr: "uniqueName" },
+					"-",
+					{ expr: "chunkId" }
+			  )
+			: runtimeTemplate.concatenation("--webpack-", { expr: "chunkId" });
 
 		return Template.asString([
 			"// object to store loaded and loading chunks",
@@ -157,18 +165,27 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 				[
 					`var data, token = "", token2, exports = {}, exportsWithId = [], exportsWithDashes = [], ${
 						withHmr ? "moduleIds = [], " : ""
-					}i = 0, cc = 1;`,
-					"try { if(!link) link = loadStylesheet(chunkId); data = link.sheet.cssRules; data = data[data.length - 1].style; } catch(e) { data = getComputedStyle(document.head); }",
-					`data = data.getPropertyValue(${
-						uniqueName
-							? runtimeTemplate.concatenation(
-									"--webpack-",
-									{ expr: "uniqueName" },
-									"-",
-									{ expr: "chunkId" }
-							  )
-							: runtimeTemplate.concatenation("--webpack-", { expr: "chunkId" })
-					});`,
+					}name = ${name}, i = 0, cc = 1;`,
+					"try {",
+					Template.indent([
+						"if(!link) link = loadStylesheet(chunkId);",
+						// `link.sheet.rules` for legacy browsers
+						"var cssRules = link.sheet.cssRules || link.sheet.rules;",
+						"var j = cssRules.length - 1;",
+						"while(j > -1 && !data) {",
+						Template.indent([
+							"var style = cssRules[j--].style;",
+							"if(!style) continue;",
+							`data = style.getPropertyValue(name);`
+						]),
+						"}"
+					]),
+					"}catch(e){}",
+					"if(!data) {",
+					Template.indent([
+						"data = getComputedStyle(document.head).getPropertyValue(name);"
+					]),
+					"}",
 					"if(!data) return [];",
 					"for(; cc; i++) {",
 					Template.indent([

package/lib/css/CssParser.js

@@ -39,7 +39,7 @@ const IMAGE_SET_FUNCTION = /^(-\w+-)?image-set$/i;
 const OPTIONALLY_VENDOR_PREFIXED_KEYFRAMES_AT_RULE = /^@(-\w+-)?keyframes$/;
 const OPTIONALLY_VENDOR_PREFIXED_ANIMATION_PROPERTY =
 	/^(-\w+-)?animation(-name)?$/i;
-const IS_MODULES = /\.module(s)?\.\w+$/i;
+const IS_MODULES = /\.module(s)?\.[^.]+$/i;
 
 /**
  * @param {string} str url string
@@ -172,12 +172,18 @@ class CssParser extends Parser {
 		}
 
 		const module = state.module;
+
+		/** @type {string | undefined} */
+		let oldDefaultMode;
+
 		if (
 			module.type === CSS_MODULE_TYPE_AUTO &&
 			IS_MODULES.test(
 				parseResource(module.matchResource || module.resource).path
 			)
 		) {
+			oldDefaultMode = this.defaultMode;
+
 			this.defaultMode = "local";
 		}
 
@@ -1013,6 +1019,10 @@ class CssParser extends Parser {
 			}
 		});
 
+		if (oldDefaultMode) {
+			this.defaultMode = oldDefaultMode;
+		}
+
 		module.buildInfo.strict = true;
 		module.buildMeta.exportsType = "namespace";
 		module.addDependency(new StaticExportsDependency([], true));

package/lib/dependencies/AMDDefineDependency.js

@@ -180,6 +180,10 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 		this.replace(dep, source, definition, content);
 	}
 
+	/**
+	 * @param {AMDDefineDependency} dependency dependency
+	 * @returns {string} variable name
+	 */
 	localModuleVar(dependency) {
 		return (
 			dependency.localModule &&
@@ -188,6 +192,10 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 		);
 	}
 
+	/**
+	 * @param {AMDDefineDependency} dependency dependency
+	 * @returns {string} branch
+	 */
 	branch(dependency) {
 		const localModuleVar = this.localModuleVar(dependency) ? "l" : "";
 		const arrayRange = dependency.arrayRange ? "a" : "";
@@ -196,6 +204,12 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 		return localModuleVar + arrayRange + objectRange + functionRange;
 	}
 
+	/**
+	 * @param {AMDDefineDependency} dependency dependency
+	 * @param {ReplaceSource} source source
+	 * @param {string} definition definition
+	 * @param {string} text text
+	 */
 	replace(dependency, source, definition, text) {
 		const localModuleVar = this.localModuleVar(dependency);
 		if (localModuleVar) {
@@ -216,18 +230,34 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 
 		let current = dependency.range[0];
 		if (dependency.arrayRange) {
-			source.replace(current, dependency.arrayRange[0] - 1, texts.shift());
+			source.replace(
+				current,
+				dependency.arrayRange[0] - 1,
+				/** @type {string} */ (texts.shift())
+			);
 			current = dependency.arrayRange[1];
 		}
 
 		if (dependency.objectRange) {
-			source.replace(current, dependency.objectRange[0] - 1, texts.shift());
+			source.replace(
+				current,
+				dependency.objectRange[0] - 1,
+				/** @type {string} */ (texts.shift())
+			);
 			current = dependency.objectRange[1];
 		} else if (dependency.functionRange) {
-			source.replace(current, dependency.functionRange[0] - 1, texts.shift());
+			source.replace(
+				current,
+				dependency.functionRange[0] - 1,
+				/** @type {string} */ (texts.shift())
+			);
 			current = dependency.functionRange[1];
 		}
-		source.replace(current, dependency.range[1] - 1, texts.shift());
+		source.replace(
+			current,
+			dependency.range[1] - 1,
+			/** @type {string} */ (texts.shift())
+		);
 		if (texts.length > 0) throw new Error("Implementation error");
 	}
 };

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -16,8 +16,13 @@ const DynamicExports = require("./DynamicExports");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 
+/** @typedef {import("estree").CallExpression} CallExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 
+/**
+ * @param {CallExpression} expr expression
+ * @returns {boolean} true if it's a bound function expression
+ */
 const isBoundFunctionExpression = expr => {
 	if (expr.type !== "CallExpression") return false;
 	if (expr.callee.type !== "MemberExpression") return false;

package/lib/dependencies/AMDRuntimeModules.js

@@ -14,7 +14,7 @@ class AMDDefineRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		return Template.asString([
@@ -35,7 +35,7 @@ class AMDOptionsRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
 		return Template.asString([

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -21,6 +21,7 @@ const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
 /** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("estree").Super} Super */
 
+/** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
@@ -43,7 +44,7 @@ const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
  * ```
  *
  * @param {TODO} expr expression
- * @returns {Expression} returns the value of property descriptor
+ * @returns {Expression | undefined} returns the value of property descriptor
  */
 const getValueOfPropertyDescription = expr => {
 	if (expr.type !== "ObjectExpression") return;
@@ -127,6 +128,9 @@ const parseRequireCall = (parser, expr) => {
 };
 
 class CommonJsExportsParserPlugin {
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 */
 	constructor(moduleGraph) {
 		this.moduleGraph = moduleGraph;
 	}
@@ -143,7 +147,7 @@ class CommonJsExportsParserPlugin {
 		/**
 		 * @param {boolean} topLevel true, when the export is on top level
 		 * @param {string[]} members members of the export
-		 * @param {Expression} valueExpr expression for the value
+		 * @param {Expression | undefined} valueExpr expression for the value
 		 * @returns {void}
 		 */
 		const checkNamespace = (topLevel, members, valueExpr) => {
@@ -156,10 +160,16 @@ class CommonJsExportsParserPlugin {
 				}
 			}
 		};
+		/**
+		 * @param {string=} reason reason
+		 */
 		const bailout = reason => {
 			DynamicExports.bailout(parser.state);
 			if (reason) bailoutHint(reason);
 		};
+		/**
+		 * @param {string} reason reason
+		 */
 		const bailoutHint = reason => {
 			this.moduleGraph
 				.getOptimizationBailout(parser.state.module)
@@ -292,8 +302,8 @@ class CommonJsExportsParserPlugin {
 		 * @param {Expression | Super} expr expression
 		 * @param {CommonJSDependencyBaseKeywords} base commonjs base keywords
 		 * @param {string[]} members members of the export
-		 * @param {CallExpression} call call expression
-		 * @returns {boolean} true, when the expression was handled
+		 * @param {CallExpression=} call call expression
+		 * @returns {boolean | void} true, when the expression was handled
 		 */
 		const handleAccessExport = (expr, base, members, call = undefined) => {
 			if (HarmonyExports.isEnabled(parser.state)) return;