webpack 5.90.0 → 5.90.1

package/lib/APIPlugin.js

@@ -24,10 +24,12 @@ const ChunkNameRuntimeModule = require("./runtime/ChunkNameRuntimeModule");
 const GetFullHashRuntimeModule = require("./runtime/GetFullHashRuntimeModule");
 
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
 /**
- * @param {boolean} module true if ES module
+ * @param {boolean | undefined} module true if ES module
  * @param {string} importMetaName `import.meta` name
  * @returns {Record<string, {expr: string, req: string[] | null, type?: string, assign: boolean}>} replacements
  */
@@ -150,7 +152,9 @@ class APIPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
-				const { importMetaName } = compilation.outputOptions;
+				const importMetaName = /** @type {string} */ (
+					compilation.outputOptions.importMetaName
+				);
 				const REPLACEMENTS = getReplacements(
 					this.options.module,
 					importMetaName
@@ -166,7 +170,7 @@ class APIPlugin {
 					.tap(PLUGIN_NAME, chunk => {
 						compilation.addRuntimeModule(
 							chunk,
-							new ChunkNameRuntimeModule(chunk.name)
+							new ChunkNameRuntimeModule(/** @type {string} */ (chunk.name))
 						);
 						return true;
 					});
@@ -218,7 +222,7 @@ class APIPlugin {
 						if (info.assign === false) {
 							parser.hooks.assign.for(key).tap(PLUGIN_NAME, expr => {
 								const err = new WebpackError(`${key} must not be assigned`);
-								err.loc = expr.loc;
+								err.loc = /** @type {DependencyLocation} */ (expr.loc);
 								throw err;
 							});
 						}
@@ -234,9 +238,9 @@ class APIPlugin {
 						.tap(PLUGIN_NAME, expr => {
 							const dep = new ConstDependency(
 								JSON.stringify(parser.state.module.layer),
-								expr.range
+								/** @type {Range} */ (expr.range)
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
@@ -248,7 +252,7 @@ class APIPlugin {
 								: new BasicEvaluatedExpression().setString(
 										parser.state.module.layer
 									)
-							).setRange(expr.range)
+							).setRange(/** @type {Range} */ (expr.range))
 						);
 					parser.hooks.evaluateTypeof
 						.for("__webpack_layer__")
@@ -257,7 +261,7 @@ class APIPlugin {
 								.setString(
 									parser.state.module.layer === null ? "object" : "string"
 								)
-								.setRange(expr.range)
+								.setRange(/** @type {Range} */ (expr.range))
 						);
 
 					parser.hooks.expression
@@ -267,10 +271,10 @@ class APIPlugin {
 								"__webpack_module__.id";
 							const dep = new ConstDependency(
 								parser.state.module.moduleArgument + ".id",
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								[RuntimeGlobals.moduleId]
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
@@ -282,10 +286,10 @@ class APIPlugin {
 								"__webpack_module__";
 							const dep = new ConstDependency(
 								parser.state.module.moduleArgument,
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								[RuntimeGlobals.module]
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});

package/lib/Compilation.js

@@ -1087,7 +1087,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 	}
 
 	/**
-	 * @param {StatsOptions | string} optionsOrPreset stats option value
+	 * @param {StatsOptions | string | undefined} optionsOrPreset stats option value
 	 * @param {CreateStatsOptionsContext} context context
 	 * @returns {NormalizedStatsOptions} normalized options
 	 */

package/lib/ConditionalInitFragment.js

@@ -62,8 +62,8 @@ class ConditionalInitFragment extends InitFragment {
 	}
 
 	/**
-	 * @param {Context} context context
-	 * @returns {string|Source} the source code that will be included as initialization code
+	 * @param {GenerateContext} context context
+	 * @returns {string | Source} the source code that will be included as initialization code
 	 */
 	getContent(context) {
 		if (this.runtimeCondition === false || !this.content) return "";
@@ -79,7 +79,7 @@ class ConditionalInitFragment extends InitFragment {
 	}
 
 	/**
-	 * @param {Context} context context
+	 * @param {GenerateContext} context context
 	 * @returns {string|Source=} the source code that will be included at the end of the module
 	 */
 	getEndContent(context) {

package/lib/DefinePlugin.js

@@ -23,9 +23,11 @@ const createHash = require("./util/createHash");
 
 /** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./NormalModule")} NormalModule */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("./javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 
 /** @typedef {null|undefined|RegExp|Function|string|number|boolean|bigint|undefined} CodeValuePrimitive */
@@ -66,7 +68,7 @@ class RuntimeValue {
 	 * @returns {CodeValuePrimitive} code
 	 */
 	exec(parser, valueCacheVersions, key) {
-		const buildInfo = parser.state.module.buildInfo;
+		const buildInfo = /** @type {BuildInfo} */ (parser.state.module.buildInfo);
 		if (this.options === true) {
 			buildInfo.cacheable = false;
 		} else {
@@ -136,19 +138,21 @@ const stringifyObj = (
 	let code;
 	let arr = Array.isArray(obj);
 	if (arr) {
-		code = `[${obj
-			.map(code =>
-				toCode(
-					code,
-					parser,
-					valueCacheVersions,
-					key,
-					runtimeTemplate,
-					logger,
-					null
+		code = `[${
+			/** @type {any[]} */ (obj)
+				.map(code =>
+					toCode(
+						code,
+						parser,
+						valueCacheVersions,
+						key,
+						runtimeTemplate,
+						logger,
+						null
+					)
 				)
-			)
-			.join(",")}]`;
+				.join(",")
+		}]`;
 	} else {
 		let keys = Object.keys(obj);
 		if (objKeys) {
@@ -157,7 +161,7 @@ const stringifyObj = (
 		}
 		code = `{${keys
 			.map(key => {
-				const code = obj[key];
+				const code = /** @type {{[k: string]: any}} */ (obj)[key];
 				return (
 					JSON.stringify(key) +
 					":" +
@@ -263,6 +267,10 @@ const toCode = (
 	return strCode;
 };
 
+/**
+ * @param {CodeValue} code code
+ * @returns {string | undefined} result
+ */
 const toCacheVersion = code => {
 	if (code === null) {
 		return "null";
@@ -285,7 +293,7 @@ const toCacheVersion = code => {
 	if (typeof code === "object") {
 		const items = Object.keys(code).map(key => ({
 			key,
-			value: toCacheVersion(code[key])
+			value: toCacheVersion(/** @type {Record<string, any>} */ (code)[key])
 		}));
 		if (items.some(({ value }) => value === undefined)) return undefined;
 		return `{${items.map(({ key, value }) => `${key}: ${value}`).join(", ")}}`;
@@ -353,14 +361,21 @@ class DefinePlugin {
 				const handler = parser => {
 					const mainValue = compilation.valueCacheVersions.get(VALUE_DEP_MAIN);
 					parser.hooks.program.tap(PLUGIN_NAME, () => {
-						const { buildInfo } = parser.state.module;
+						const buildInfo = /** @type {BuildInfo} */ (
+							parser.state.module.buildInfo
+						);
 						if (!buildInfo.valueDependencies)
 							buildInfo.valueDependencies = new Map();
 						buildInfo.valueDependencies.set(VALUE_DEP_MAIN, mainValue);
 					});
 
+					/**
+					 * @param {string} key key
+					 */
 					const addValueDependency = key => {
-						const { buildInfo } = parser.state.module;
+						const buildInfo = /** @type {BuildInfo} */ (
+							parser.state.module.buildInfo
+						);
 						buildInfo.valueDependencies.set(
 							VALUE_DEP_PREFIX + key,
 							compilation.valueCacheVersions.get(VALUE_DEP_PREFIX + key)
@@ -376,7 +391,7 @@ class DefinePlugin {
 
 					/**
 					 * Walk definitions
-					 * @param {Object} definitions Definitions map
+					 * @param {Record<string, CodeValue>} definitions Definitions map
 					 * @param {string} prefix Prefix string
 					 * @returns {void}
 					 */
@@ -389,7 +404,10 @@ class DefinePlugin {
 								!(code instanceof RuntimeValue) &&
 								!(code instanceof RegExp)
 							) {
-								walkDefinitions(code, prefix + key + ".");
+								walkDefinitions(
+									/** @type {Record<string, CodeValue>} */ (code),
+									prefix + key + "."
+								);
 								applyObjectDefine(prefix + key, code);
 								return;
 							}
@@ -458,7 +476,7 @@ class DefinePlugin {
 										)
 									);
 									recurse = false;
-									res.setRange(expr.range);
+									res.setRange(/** @type {Range} */ (expr.range));
 									return res;
 								});
 							parser.hooks.expression.for(key).tap(PLUGIN_NAME, expr => {
@@ -470,7 +488,7 @@ class DefinePlugin {
 									originalKey,
 									runtimeTemplate,
 									logger,
-									!parser.isAsiPosition(expr.range[0]),
+									!parser.isAsiPosition(/** @type {Range} */ (expr.range)[0]),
 									parser.destructuringAssignmentPropertiesFor(expr)
 								);
 
@@ -517,7 +535,7 @@ class DefinePlugin {
 								: "typeof (" + codeCode + ")";
 							const res = parser.evaluate(typeofCode);
 							recurseTypeof = false;
-							res.setRange(expr.range);
+							res.setRange(/** @type {Range} */ (expr.range));
 							return res;
 						});
 						parser.hooks.typeof.for(key).tap(PLUGIN_NAME, expr => {
@@ -559,7 +577,7 @@ class DefinePlugin {
 							return new BasicEvaluatedExpression()
 								.setTruthy()
 								.setSideEffects(false)
-								.setRange(expr.range);
+								.setRange(/** @type {Range} */ (expr.range));
 						});
 						parser.hooks.evaluateTypeof
 							.for(key)
@@ -576,7 +594,7 @@ class DefinePlugin {
 								key,
 								runtimeTemplate,
 								logger,
-								!parser.isAsiPosition(expr.range[0]),
+								!parser.isAsiPosition(/** @type {Range} */ (expr.range)[0]),
 								parser.destructuringAssignmentPropertiesFor(expr)
 							);
 
@@ -622,7 +640,7 @@ class DefinePlugin {
 
 				/**
 				 * Walk definitions
-				 * @param {Object} definitions Definitions map
+				 * @param {Record<string, CodeValue>} definitions Definitions map
 				 * @param {string} prefix Prefix string
 				 * @returns {void}
 				 */
@@ -649,7 +667,10 @@ class DefinePlugin {
 							!(code instanceof RuntimeValue) &&
 							!(code instanceof RegExp)
 						) {
-							walkDefinitionsForValues(code, prefix + key + ".");
+							walkDefinitionsForValues(
+								/** @type {Record<string, CodeValue>} */ (code),
+								prefix + key + "."
+							);
 						}
 					});
 				};

package/lib/EvalSourceMapDevToolPlugin.js

@@ -129,7 +129,7 @@ class EvalSourceMapDevToolPlugin {
 
 						// Clone (flat) the sourcemap to ensure that the mutations below do not persist.
 						sourceMap = { ...sourceMap };
-						const context = compiler.options.context;
+						const context = /** @type {string} */ (compiler.options.context);
 						const root = compiler.root;
 						const modules = sourceMap.sources.map(source => {
 							if (!source.startsWith("webpack://")) return source;

package/lib/InitFragment.js

@@ -36,15 +36,15 @@ const sortFragmentWithIndex = ([a, i], [b, j]) => {
 };
 
 /**
- * @template Context
+ * @template GenerateContext
  */
 class InitFragment {
 	/**
-	 * @param {string|Source} content the source code that will be included as initialization code
+	 * @param {string | Source} content the source code that will be included as initialization code
 	 * @param {number} stage category of initialization code (contribute to order)
 	 * @param {number} position position in the category (contribute to order)
 	 * @param {string=} key unique key to avoid emitting the same initialization code twice
-	 * @param {string|Source=} endContent the source code that will be included at the end of the module
+	 * @param {string | Source=} endContent the source code that will be included at the end of the module
 	 */
 	constructor(content, stage, position, key, endContent) {
 		this.content = content;
@@ -55,15 +55,15 @@ class InitFragment {
 	}
 
 	/**
-	 * @param {Context} context context
-	 * @returns {string|Source} the source code that will be included as initialization code
+	 * @param {GenerateContext} context context
+	 * @returns {string | Source} the source code that will be included as initialization code
 	 */
 	getContent(context) {
 		return this.content;
 	}
 
 	/**
-	 * @param {Context} context context
+	 * @param {GenerateContext} context context
 	 * @returns {string|Source=} the source code that will be included at the end of the module
 	 */
 	getEndContent(context) {
@@ -91,7 +91,7 @@ class InitFragment {
 			for (const [fragment] of sortedFragments) {
 				if (
 					typeof (
-						/** @type {InitFragment<T> & { mergeAll?: (fragments: InitFragment[]) => InitFragment[] }} */
+						/** @type {InitFragment<T> & { mergeAll?: (fragments: InitFragment<Context>[]) => InitFragment<Context>[] }} */
 						(fragment).mergeAll
 					) === "function"
 				) {

package/lib/NodeStuffPlugin.js

@@ -136,7 +136,7 @@ class NodeStuffPlugin {
 
 					/**
 					 * @param {string} expressionName expression name
-					 * @param {(value: string) => void} fn function
+					 * @param {(value: string) => string} fn function
 					 * @returns {void}
 					 */
 					const setUrlModuleConstant = (expressionName, fn) => {
@@ -153,10 +153,10 @@ class NodeStuffPlugin {
 									],
 									undefined,
 									fn("__webpack_fileURLToPath__"),
-									expr.range,
+									/** @type {Range} */ (expr.range),
 									expressionName
 								);
-								dep.loc = expr.loc;
+								dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 								parser.state.module.addPresentationalDependency(dep);
 
 								return true;

package/lib/Stats.js

@@ -65,6 +65,10 @@ class Stats {
 		});
 	}
 
+	/**
+	 * @param {(string|StatsOptions)=} options stats options
+	 * @returns {string} string output
+	 */
 	toString(options) {
 		options = this.compilation.createStatsOptions(options, {
 			forToString: true

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -42,8 +42,8 @@ class AwaitDependenciesInitFragment extends InitFragment {
 	}
 
 	/**
-	 * @param {Context} context context
-	 * @returns {string|Source} the source code that will be included as initialization code
+	 * @param {GenerateContext} context context
+	 * @returns {string | Source} the source code that will be included as initialization code
 	 */
 	getContent({ runtimeRequirements }) {
 		runtimeRequirements.add(RuntimeGlobals.module);

package/lib/buildChunkGraph.js

@@ -266,12 +266,18 @@ const visitModules = (
 	/** @type {Map<DependenciesBlock, ChunkGroupInfo>} */
 	const blockChunkGroups = new Map();
 
+	/** @type {Map<ChunkGroupInfo, DependenciesBlock>} */
+	const blockByChunkGroups = new Map();
+
 	/** @type {Map<string, ChunkGroupInfo>} */
 	const namedChunkGroups = new Map();
 
 	/** @type {Map<string, ChunkGroupInfo>} */
 	const namedAsyncEntrypoints = new Map();
 
+	/** @type {Set<ChunkGroupInfo>} */
+	const outdatedOrderIndexChunkGroups = new Set();
+
 	const ADD_AND_ENTER_ENTRY_MODULE = 0;
 	const ADD_AND_ENTER_MODULE = 1;
 	const ENTER_MODULE = 2;
@@ -524,6 +530,7 @@ const visitModules = (
 				blockConnections.set(b, []);
 			}
 			blockChunkGroups.set(b, /** @type {ChunkGroupInfo} */ (cgi));
+			blockByChunkGroups.set(cgi, b);
 		} else if (entryOptions) {
 			entrypoint = /** @type {Entrypoint} */ (cgi.chunkGroup);
 		} else {
@@ -1208,6 +1215,7 @@ const visitModules = (
 					chunkGroupsForCombining.add(cgi);
 				}
 			}
+			outdatedOrderIndexChunkGroups.add(info);
 		}
 		outdatedChunkGroupInfo.clear();
 	};
@@ -1254,6 +1262,51 @@ const visitModules = (
 		}
 	}
 
+	for (const info of outdatedOrderIndexChunkGroups) {
+		const { chunkGroup, runtime } = info;
+
+		const block = blockByChunkGroups.get(info);
+
+		if (!block) {
+			continue;
+		}
+
+		let preOrderIndex = 0;
+		let postOrderIndex = 0;
+
+		const process = (current, visited = new Set()) => {
+			if (visited.has(current)) {
+				return;
+			}
+
+			visited.add(current);
+
+			const blockModules = getBlockModules(current, runtime);
+			if (blockModules === undefined) {
+				return;
+			}
+
+			for (let i = 0; i < blockModules.length; i += 2) {
+				const refModule = /** @type {Module} */ (blockModules[i]);
+				const activeState = /** @type {ConnectionState} */ (
+					blockModules[i + 1]
+				);
+				if (activeState === false) {
+					continue;
+				}
+
+				if (refModule) {
+					chunkGroup.setModulePreOrderIndex(refModule, preOrderIndex++);
+					process(refModule, visited);
+					chunkGroup.setModulePostOrderIndex(refModule, postOrderIndex++);
+				}
+			}
+		};
+
+		process(block);
+	}
+	outdatedOrderIndexChunkGroups.clear();
+
 	logger.log(
 		`${statProcessedQueueItems} queue items processed (${statProcessedBlocks} blocks)`
 	);

package/lib/config/browserslistTargetHandler.js

@@ -90,7 +90,9 @@ const resolve = browsers => {
 				// safari TP supports all features for normal safari
 				parsedVersion === "TP"
 					? [Infinity, Infinity]
-					: parsedVersion.split(".");
+					: parsedVersion.includes("-")
+						? parsedVersion.split("-")[0].split(".")
+						: parsedVersion.split(".");
 			if (typeof requiredVersion === "number") {
 				return +parsedMajor >= requiredVersion;
 			}
@@ -118,8 +120,8 @@ const resolve = browsers => {
 		samsung: [8, 2],
 		android: 63,
 		and_qq: [10, 4],
-		// baidu: Not supported
-		// and_uc: Not supported
+		baidu: [13, 18],
+		and_uc: [15, 5],
 		kaios: [3, 0],
 		node: [12, 17]
 	});
@@ -144,7 +146,7 @@ const resolve = browsers => {
 			android: 37,
 			and_qq: [10, 4],
 			// Supported correctly in strict mode, otherwise supported without block scope
-			// baidu: Not supported
+			baidu: [13, 18],
 			and_uc: [12, 12],
 			kaios: [2, 5],
 			node: [6, 0]
@@ -222,9 +224,9 @@ const resolve = browsers => {
 			ios_saf: 14,
 			samsung: [9, 2],
 			android: 67,
-			// and_qq: Not supported
-			// baidu: Not supported
-			// and_uc: Not supported
+			and_qq: [13, 1],
+			baidu: [13, 18],
+			and_uc: [15, 5],
 			kaios: [3, 0],
 			node: [10, 4]
 		}),
@@ -244,8 +246,8 @@ const resolve = browsers => {
 			samsung: [8, 0],
 			android: 61,
 			and_qq: [10, 4],
-			// baidu: Not supported
-			// and_uc: Not supported
+			baidu: [13, 18],
+			and_uc: [15, 5],
 			kaios: [3, 0],
 			node: [12, 17]
 		}),
@@ -319,14 +321,14 @@ const resolve = browsers => {
 			// ie: Not supported,
 			opera: 42,
 			op_mob: 42,
-			safari: [10, 1],
-			ios_saf: [10, 3],
-			samsung: 6,
+			safari: 11,
+			ios_saf: 11,
+			samsung: [6, 2],
 			android: 55,
-			// and_qq: Unknown support
-			// baidu: Unknown support
-			// and_uc: Unknown support
-			// kaios: Unknown support
+			and_qq: [13, 1],
+			baidu: [13, 18],
+			and_uc: [15, 5],
+			kaios: 3,
 			node: [7, 6]
 		}),
 		browser: browserProperty,

package/lib/config/defaults.js

@@ -472,6 +472,7 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
 			}
 			return [];
 		});
+		F(snapshot, "unmanagedPaths", () => []);
 		A(snapshot, "immutablePaths", () => {
 			if (process.versions.pnp === "1") {
 				const match =

package/lib/dependencies/AMDDefineDependency.js

@@ -108,10 +108,10 @@ const DEFINITIONS = {
 class AMDDefineDependency extends NullDependency {
 	/**
 	 * @param {Range} range range
-	 * @param {Range} arrayRange array range
-	 * @param {Range} functionRange function range
-	 * @param {Range} objectRange object range
-	 * @param {boolean} namedModule true, when define is called with a name
+	 * @param {Range | null} arrayRange array range
+	 * @param {Range | null} functionRange function range
+	 * @param {Range | null} objectRange object range
+	 * @param {boolean | null} namedModule true, when define is called with a name
 	 */
 	constructor(range, arrayRange, functionRange, objectRange, namedModule) {
 		super();