webpack 5.90.0 → 5.90.2

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();

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -16,11 +16,20 @@ const DynamicExports = require("./DynamicExports");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 
+/** @typedef {import("estree").ArrowFunctionExpression} ArrowFunctionExpression */
 /** @typedef {import("estree").CallExpression} CallExpression */
+/** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("estree").FunctionExpression} FunctionExpression */
+/** @typedef {import("estree").Literal} Literal */
+/** @typedef {import("estree").SpreadElement} SpreadElement */
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 /**
- * @param {CallExpression} expr expression
+ * @param {Expression | SpreadElement} expr expression
  * @returns {boolean} true if it's a bound function expression
  */
 const isBoundFunctionExpression = expr => {
@@ -33,12 +42,22 @@ const isBoundFunctionExpression = expr => {
 	return true;
 };
 
+/** @typedef {FunctionExpression | ArrowFunctionExpression} UnboundFunctionExpression */
+
+/**
+ * @param {Expression | SpreadElement} expr expression
+ * @returns {boolean} true when unbound function expression
+ */
 const isUnboundFunctionExpression = expr => {
 	if (expr.type === "FunctionExpression") return true;
 	if (expr.type === "ArrowFunctionExpression") return true;
 	return false;
 };
 
+/**
+ * @param {Expression | SpreadElement} expr expression
+ * @returns {boolean} true when callable
+ */
 const isCallable = expr => {
 	if (isUnboundFunctionExpression(expr)) return true;
 	if (isBoundFunctionExpression(expr)) return true;
@@ -46,6 +65,9 @@ const isCallable = expr => {
 };
 
 class AMDDefineDependencyParserPlugin {
+	/**
+	 * @param {JavascriptParserOptions} options parserOptions
+	 */
 	constructor(options) {
 		this.options = options;
 	}
@@ -63,12 +85,23 @@ class AMDDefineDependencyParserPlugin {
 			);
 	}
 
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @param {CallExpression} expr call expression
+	 * @param {BasicEvaluatedExpression} param param
+	 * @param {Record<number, string>} identifiers identifiers
+	 * @param {string=} namedModule named module
+	 * @returns {boolean | undefined} result
+	 */
 	processArray(parser, expr, param, identifiers, namedModule) {
 		if (param.isArray()) {
-			param.items.forEach((param, idx) => {
+			/** @type {BasicEvaluatedExpression[]} */
+			(param.items).forEach((param, idx) => {
 				if (
 					param.isString() &&
-					["require", "module", "exports"].includes(param.string)
+					["require", "module", "exports"].includes(
+						/** @type {string} */ (param.string)
+					)
 				)
 					identifiers[idx] = param.string;
 				const result = this.processItem(parser, expr, param, namedModule);
@@ -78,6 +111,7 @@ class AMDDefineDependencyParserPlugin {
 			});
 			return true;
 		} else if (param.isConstArray()) {
+			/** @type {(string | LocalModuleDependency | AMDRequireItemDependency)[]} */
 			const deps = [];
 			param.array.forEach((request, idx) => {
 				let dep;
@@ -91,26 +125,38 @@ class AMDDefineDependencyParserPlugin {
 				} else if ((localModule = getLocalModule(parser.state, request))) {
 					localModule.flagUsed();
 					dep = new LocalModuleDependency(localModule, undefined, false);
-					dep.loc = expr.loc;
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addPresentationalDependency(dep);
 				} else {
 					dep = this.newRequireItemDependency(request);
-					dep.loc = expr.loc;
+					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					dep.optional = !!parser.scope.inTry;
 					parser.state.current.addDependency(dep);
 				}
 				deps.push(dep);
 			});
-			const dep = this.newRequireArrayDependency(deps, param.range);
-			dep.loc = expr.loc;
+			const dep = this.newRequireArrayDependency(
+				deps,
+				/** @type {Range} */ (param.range)
+			);
+			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			dep.optional = !!parser.scope.inTry;
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
 	}
+
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @param {CallExpression} expr call expression
+	 * @param {BasicEvaluatedExpression} param param
+	 * @param {string=} namedModule named module
+	 * @returns {boolean} result
+	 */
 	processItem(parser, expr, param, namedModule) {
 		if (param.isConditional()) {
-			param.options.forEach(param => {
+			/** @type {BasicEvaluatedExpression[]} */
+			(param.options).forEach(param => {
 				const result = this.processItem(parser, expr, param);
 				if (result === undefined) {
 					this.processContext(parser, expr, param);
@@ -120,19 +166,29 @@ class AMDDefineDependencyParserPlugin {
 		} else if (param.isString()) {
 			let dep, localModule;
 			if (param.string === "require") {
-				dep = new ConstDependency(RuntimeGlobals.require, param.range, [
-					RuntimeGlobals.require
-				]);
+				dep = new ConstDependency(
+					RuntimeGlobals.require,
+					/** @type {Range} */ (param.range),
+					[RuntimeGlobals.require]
+				);
 			} else if (param.string === "exports") {
-				dep = new ConstDependency("exports", param.range, [
-					RuntimeGlobals.exports
-				]);
+				dep = new ConstDependency(
+					"exports",
+					/** @type {Range} */ (param.range),
+					[RuntimeGlobals.exports]
+				);
 			} else if (param.string === "module") {
-				dep = new ConstDependency("module", param.range, [
-					RuntimeGlobals.module
-				]);
+				dep = new ConstDependency(
+					"module",
+					/** @type {Range} */ (param.range),
+					[RuntimeGlobals.module]
+				);
 			} else if (
-				(localModule = getLocalModule(parser.state, param.string, namedModule))
+				(localModule = getLocalModule(
+					parser.state,
+					/** @type {string} */ (param.string),
+					namedModule
+				))
 			) {
 				localModule.flagUsed();
 				dep = new LocalModuleDependency(localModule, param.range, false);
@@ -142,15 +198,22 @@ class AMDDefineDependencyParserPlugin {
 				parser.state.current.addDependency(dep);
 				return true;
 			}
-			dep.loc = expr.loc;
+			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
 	}
+
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @param {CallExpression} expr call expression
+	 * @param {BasicEvaluatedExpression} param param
+	 * @returns {boolean | undefined} result
+	 */
 	processContext(parser, expr, param) {
 		const dep = ContextDependencyHelpers.create(
 			AMDRequireContextDependency,
-			param.range,
+			/** @type {Range} */ (param.range),
 			param,
 			expr,
 			this.options,
@@ -160,12 +223,17 @@ class AMDDefineDependencyParserPlugin {
 			parser
 		);
 		if (!dep) return;
-		dep.loc = expr.loc;
+		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 		dep.optional = !!parser.scope.inTry;
 		parser.state.current.addDependency(dep);
 		return true;
 	}
 
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @param {CallExpression} expr call expression
+	 * @returns {boolean | undefined} result
+	 */
 	processCallDefine(parser, expr) {
 		let array, fn, obj, namedModule;
 		switch (expr.arguments.length) {
@@ -214,7 +282,7 @@ class AMDDefineDependencyParserPlugin {
 				break;
 			case 3:
 				// define("…", […], f() {…})
-				namedModule = expr.arguments[0].value;
+				namedModule = /** @type {TODO} */ (expr).arguments[0].value;
 				array = expr.arguments[1];
 				if (isCallable(expr.arguments[2])) {
 					// define("…", […], f() {})
@@ -236,10 +304,10 @@ class AMDDefineDependencyParserPlugin {
 		let fnParamsOffset = 0;
 		if (fn) {
 			if (isUnboundFunctionExpression(fn)) {
-				fnParams = fn.params;
+				fnParams = /** @type {UnboundFunctionExpression} */ (fn).params;
 			} else if (isBoundFunctionExpression(fn)) {
-				fnParams = fn.callee.object.params;
-				fnParamsOffset = fn.arguments.length - 1;
+				fnParams = /** @type {TODO} */ (fn).callee.object.params;
+				fnParamsOffset = /** @type {TODO} */ (fn).arguments.length - 1;
 				if (fnParamsOffset < 0) {
 					fnParamsOffset = 0;
 				}
@@ -247,6 +315,7 @@ class AMDDefineDependencyParserPlugin {
 		}
 		let fnRenames = new Map();
 		if (array) {
+			/** @type {Record<number, string>} */
 			const identifiers = {};
 			const param = parser.evaluateExpression(array);
 			const result = this.processArray(
@@ -278,6 +347,7 @@ class AMDDefineDependencyParserPlugin {
 				});
 			}
 		}
+		/** @type {boolean | undefined} */
 		let inTry;
 		if (fn && isUnboundFunctionExpression(fn)) {
 			inTry = parser.scope.inTry;
@@ -285,7 +355,7 @@ class AMDDefineDependencyParserPlugin {
 				for (const [name, varInfo] of fnRenames) {
 					parser.setVariable(name, varInfo);
 				}
-				parser.scope.inTry = inTry;
+				parser.scope.inTry = /** @type {boolean} */ (inTry);
 				if (fn.body.type === "BlockStatement") {
 					parser.detectMode(fn.body.body);
 					const prev = parser.prevStatement;
@@ -299,7 +369,8 @@ class AMDDefineDependencyParserPlugin {
 		} else if (fn && isBoundFunctionExpression(fn)) {
 			inTry = parser.scope.inTry;
 			parser.inScope(
-				fn.callee.object.params.filter(
+				/** @type {TODO} */
+				(fn).callee.object.params.filter(
 					i => !["require", "module", "exports"].includes(i.name)
 				),
 				() => {
@@ -318,21 +389,21 @@ class AMDDefineDependencyParserPlugin {
 					}
 				}
 			);
-			if (fn.arguments) {
-				parser.walkExpressions(fn.arguments);
+			if (/** @type {TODO} */ (fn).arguments) {
+				parser.walkExpressions(/** @type {TODO} */ (fn).arguments);
 			}
 		} else if (fn || obj) {
 			parser.walkExpression(fn || obj);
 		}
 
 		const dep = this.newDefineDependency(
-			expr.range,
-			array ? array.range : null,
-			fn ? fn.range : null,
-			obj ? obj.range : null,
+			/** @type {Range} */ (expr.range),
+			array ? /** @type {Range} */ (array.range) : null,
+			fn ? /** @type {Range} */ (fn.range) : null,
+			obj ? /** @type {Range} */ (obj.range) : null,
 			namedModule ? namedModule : null
 		);
-		dep.loc = expr.loc;
+		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 		if (namedModule) {
 			dep.localModule = addLocalModule(parser.state, namedModule);
 		}
@@ -340,6 +411,14 @@ class AMDDefineDependencyParserPlugin {
 		return true;
 	}
 
+	/**
+	 * @param {Range} range range
+	 * @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
+	 * @returns {AMDDefineDependency} AMDDefineDependency
+	 */
 	newDefineDependency(
 		range,
 		arrayRange,
@@ -355,11 +434,24 @@ class AMDDefineDependencyParserPlugin {
 			namedModule
 		);
 	}
+
+	/**
+	 * @param {TODO[]} depsArray deps array
+	 * @param {Range} range range
+	 * @returns {AMDRequireArrayDependency} AMDRequireArrayDependency
+	 */
 	newRequireArrayDependency(depsArray, range) {
 		return new AMDRequireArrayDependency(depsArray, range);
 	}
+
+	/**
+	 * @param {string} request request
+	 * @param {Range=} range range
+	 * @returns {AMDRequireItemDependency} AMDRequireItemDependency
+	 */
 	newRequireItemDependency(request, range) {
 		return new AMDRequireItemDependency(request, range);
 	}
 }
+
 module.exports = AMDDefineDependencyParserPlugin;

package/lib/dependencies/AMDPlugin.js

@@ -35,7 +35,9 @@ const UnsupportedDependency = require("./UnsupportedDependency");
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 const PLUGIN_NAME = "AMDPlugin";
 
@@ -135,6 +137,11 @@ class AMDPlugin {
 				const handler = (parser, parserOptions) => {
 					if (parserOptions.amd !== undefined && !parserOptions.amd) return;
 
+					/**
+					 * @param {string} optionExpr option expression
+					 * @param {string} rootName root name
+					 * @param {function(): TODO} getMembers callback
+					 */
 					const tapOptionsHooks = (optionExpr, rootName, getMembers) => {
 						parser.hooks.expression
 							.for(optionExpr)
@@ -177,10 +184,10 @@ class AMDPlugin {
 					parser.hooks.expression.for("define").tap(PLUGIN_NAME, expr => {
 						const dep = new ConstDependency(
 							RuntimeGlobals.amdDefine,
-							expr.range,
+							/** @type {Range} */ (expr.range),
 							[RuntimeGlobals.amdDefine]
 						);
-						dep.loc = expr.loc;
+						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 						parser.state.module.addPresentationalDependency(dep);
 						return true;
 					});
@@ -197,10 +204,10 @@ class AMDPlugin {
 					parser.hooks.rename.for("define").tap(PLUGIN_NAME, expr => {
 						const dep = new ConstDependency(
 							RuntimeGlobals.amdDefine,
-							expr.range,
+							/** @type {Range} */ (expr.range),
 							[RuntimeGlobals.amdDefine]
 						);
-						dep.loc = expr.loc;
+						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 						parser.state.module.addPresentationalDependency(dep);
 						return false;
 					});

package/lib/dependencies/AMDRequireArrayDependency.js

@@ -15,10 +15,12 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./AMDRequireItemDependency")} AMDRequireItemDependency */
+/** @typedef {import("./LocalModuleDependency")} LocalModuleDependency */
 
 class AMDRequireArrayDependency extends NullDependency {
 	/**
-	 * @param {TODO} depsArray deps array
+	 * @param {(string | LocalModuleDependency | AMDRequireItemDependency)[]} depsArray deps array
 	 * @param {Range} range range
 	 */
 	constructor(depsArray, range) {
@@ -81,6 +83,11 @@ AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate ext
 		source.replace(dep.range[0], dep.range[1] - 1, content);
 	}
 
+	/**
+	 * @param {AMDRequireArrayDependency} dep the dependency for which the template should be applied
+	 * @param {DependencyTemplateContext} templateContext the context object
+	 * @returns {string} content
+	 */
 	getContent(dep, templateContext) {
 		const requires = dep.depsArray.map(dependency => {
 			return this.contentForDependency(dependency, templateContext);
@@ -88,6 +95,11 @@ AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate ext
 		return `[${requires.join(", ")}]`;
 	}
 
+	/**
+	 * @param {TODO} dep the dependency for which the template should be applied
+	 * @param {DependencyTemplateContext} templateContext the context object
+	 * @returns {string} content
+	 */
 	contentForDependency(
 		dep,
 		{ runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements }