webpack 5.93.0 → 5.95.0

package/lib/cache/mergeEtags.js

@@ -34,27 +34,23 @@ const mergeEtags = (a, b) => {
 	if (typeof a === "string") {
 		if (typeof b === "string") {
 			return `${a}|${b}`;
-		} else {
-			const temp = b;
-			b = a;
-			a = temp;
 		}
-	} else {
-		if (typeof b !== "string") {
-			// both a and b are objects
-			let map = dualObjectMap.get(a);
-			if (map === undefined) {
-				dualObjectMap.set(a, (map = new WeakMap()));
-			}
-			const mergedEtag = map.get(b);
-			if (mergedEtag === undefined) {
-				const newMergedEtag = new MergedEtag(a, b);
-				map.set(b, newMergedEtag);
-				return newMergedEtag;
-			} else {
-				return mergedEtag;
-			}
+		const temp = b;
+		b = a;
+		a = temp;
+	} else if (typeof b !== "string") {
+		// both a and b are objects
+		let map = dualObjectMap.get(a);
+		if (map === undefined) {
+			dualObjectMap.set(a, (map = new WeakMap()));
 		}
+		const mergedEtag = map.get(b);
+		if (mergedEtag === undefined) {
+			const newMergedEtag = new MergedEtag(a, b);
+			map.set(b, newMergedEtag);
+			return newMergedEtag;
+		}
+		return mergedEtag;
 	}
 	// a is object, b is string
 	let map = objectStringMap.get(a);
@@ -66,9 +62,8 @@ const mergeEtags = (a, b) => {
 		const newMergedEtag = new MergedEtag(a, b);
 		map.set(b, newMergedEtag);
 		return newMergedEtag;
-	} else {
-		return mergedEtag;
 	}
+	return mergedEtag;
 };
 
 module.exports = mergeEtags;

package/lib/cli.js

@@ -8,6 +8,8 @@
 const path = require("path");
 const webpackSchema = require("../schemas/WebpackOptions.json");
 
+/** @typedef {TODO & { absolutePath: boolean, instanceof: string, cli: { helper?: boolean, exclude?: boolean } }} Schema */
+
 // TODO add originPath to PathItem for better errors
 /**
  * @typedef {object} PathItem
@@ -36,7 +38,7 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
 
 /**
  * @typedef {object} ArgumentConfig
- * @property {string} description
+ * @property {string | undefined} description
  * @property {string} [negatedDescription]
  * @property {string} path
  * @property {boolean} multiple
@@ -44,24 +46,34 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
  * @property {any[]=} values
  */
 
+/** @typedef {"string" | "number" | "boolean"} SimpleType */
+
 /**
  * @typedef {object} Argument
- * @property {string} description
- * @property {"string"|"number"|"boolean"} simpleType
+ * @property {string | undefined} description
+ * @property {SimpleType} simpleType
  * @property {boolean} multiple
  * @property {ArgumentConfig[]} configs
  */
 
+/** @typedef {string | number | boolean | RegExp | (string | number | boolean | RegExp)} Value */
+
+/** @typedef {Record<string, Argument>} Flags */
+
 /**
- * @param {any=} schema a json schema to create arguments for (by default webpack schema is used)
- * @returns {Record<string, Argument>} object of arguments
+ * @param {Schema=} schema a json schema to create arguments for (by default webpack schema is used)
+ * @returns {Flags} object of arguments
  */
 const getArguments = (schema = webpackSchema) => {
-	/** @type {Record<string, Argument>} */
+	/** @type {Flags} */
 	const flags = {};
 
-	const pathToArgumentName = input => {
-		return input
+	/**
+	 * @param {string} input input
+	 * @returns {string} result
+	 */
+	const pathToArgumentName = input =>
+		input
 			.replace(/\./g, "-")
 			.replace(/\[\]/g, "")
 			.replace(
@@ -70,8 +82,11 @@ const getArguments = (schema = webpackSchema) => {
 			)
 			.replace(/-?[^\p{Uppercase_Letter}\p{Lowercase_Letter}\d]+/gu, "-")
 			.toLowerCase();
-	};
 
+	/**
+	 * @param {string} path path
+	 * @returns {Schema} schema part
+	 */
 	const getSchemaPart = path => {
 		const newPath = path.split("/");
 
@@ -91,7 +106,6 @@ const getArguments = (schema = webpackSchema) => {
 	};
 
 	/**
-	 *
 	 * @param {PathItem[]} path path in the schema
 	 * @returns {string | undefined} description
 	 */
@@ -106,7 +120,6 @@ const getArguments = (schema = webpackSchema) => {
 	};
 
 	/**
-	 *
 	 * @param {PathItem[]} path path in the schema
 	 * @returns {string | undefined} negative description
 	 */
@@ -120,7 +133,6 @@ const getArguments = (schema = webpackSchema) => {
 	};
 
 	/**
-	 *
 	 * @param {PathItem[]} path path in the schema
 	 * @returns {string | undefined} reset description
 	 */
@@ -134,9 +146,8 @@ const getArguments = (schema = webpackSchema) => {
 	};
 
 	/**
-	 *
-	 * @param {any} schemaPart schema
-	 * @returns {Pick<ArgumentConfig, "type"|"values">} partial argument config
+	 * @param {Schema} schemaPart schema
+	 * @returns {Pick<ArgumentConfig, "type"|"values"> | undefined} partial argument config
 	 */
 	const schemaToArgumentConfig = schemaPart => {
 		if (schemaPart.enum) {
@@ -189,8 +200,10 @@ const getArguments = (schema = webpackSchema) => {
 				}
 			],
 			description: undefined,
-			simpleType: undefined,
-			multiple: undefined
+			simpleType:
+				/** @type {SimpleType} */
+				(/** @type {unknown} */ (undefined)),
+			multiple: /** @type {boolean} */ (/** @type {unknown} */ (undefined))
 		};
 	};
 
@@ -221,8 +234,10 @@ const getArguments = (schema = webpackSchema) => {
 			flags[name] = {
 				configs: [],
 				description: undefined,
-				simpleType: undefined,
-				multiple: undefined
+				simpleType:
+					/** @type {SimpleType} */
+					(/** @type {unknown} */ (undefined)),
+				multiple: /** @type {boolean} */ (/** @type {unknown} */ (undefined))
 			};
 		}
 
@@ -255,8 +270,7 @@ const getArguments = (schema = webpackSchema) => {
 	// TODO support `not` and `if/then/else`
 	// TODO support `const`, but we don't use it on our schema
 	/**
-	 *
-	 * @param {object} schemaPart the current schema
+	 * @param {Schema} schemaPart the current schema
 	 * @param {string} schemaPath the current path in the schema
 	 * @param {{schema: object, path: string}[]} path all previous visited schemaParts
 	 * @param {string | null} inArray if inside of an array, the path to the array
@@ -281,13 +295,14 @@ const getArguments = (schema = webpackSchema) => {
 
 		let addedArguments = 0;
 
-		addedArguments += addFlag(fullPath, !!inArray);
+		addedArguments += addFlag(fullPath, Boolean(inArray));
 
 		if (schemaPart.type === "object") {
 			if (schemaPart.properties) {
 				for (const property of Object.keys(schemaPart.properties)) {
 					addedArguments += traverse(
-						schemaPart.properties[property],
+						/** @type {Schema} */
+						(schemaPart.properties[property]),
 						schemaPath ? `${schemaPath}.${property}` : property,
 						fullPath,
 						inArray
@@ -303,10 +318,11 @@ const getArguments = (schema = webpackSchema) => {
 				return 0;
 			}
 			if (Array.isArray(schemaPart.items)) {
-				let i = 0;
+				const i = 0;
 				for (const item of schemaPart.items) {
 					addedArguments += traverse(
-						item,
+						/** @type {Schema} */
+						(item),
 						`${schemaPath}.${i}`,
 						fullPath,
 						schemaPath
@@ -317,7 +333,8 @@ const getArguments = (schema = webpackSchema) => {
 			}
 
 			addedArguments += traverse(
-				schemaPart.items,
+				/** @type {Schema} */
+				(schemaPart.items),
 				`${schemaPath}[]`,
 				fullPath,
 				schemaPath
@@ -337,7 +354,13 @@ const getArguments = (schema = webpackSchema) => {
 			const items = maybeOf;
 
 			for (let i = 0; i < items.length; i++) {
-				addedArguments += traverse(items[i], schemaPath, fullPath, inArray);
+				addedArguments += traverse(
+					/** @type {Schema} */
+					(items[i]),
+					schemaPath,
+					fullPath,
+					inArray
+				);
 			}
 
 			return addedArguments;
@@ -350,6 +373,7 @@ const getArguments = (schema = webpackSchema) => {
 
 	// Summarize flags
 	for (const name of Object.keys(flags)) {
+		/** @type {Argument} */
 		const argument = flags[name];
 		argument.description = argument.configs.reduce((desc, { description }) => {
 			if (!desc) return description;
@@ -357,27 +381,34 @@ const getArguments = (schema = webpackSchema) => {
 			if (desc.includes(description)) return desc;
 			return `${desc} ${description}`;
 		}, /** @type {string | undefined} */ (undefined));
-		argument.simpleType = argument.configs.reduce((t, argConfig) => {
-			/** @type {"string" | "number" | "boolean"} */
-			let type = "string";
-			switch (argConfig.type) {
-				case "number":
-					type = "number";
-					break;
-				case "reset":
-				case "boolean":
-					type = "boolean";
-					break;
-				case "enum":
-					if (argConfig.values.every(v => typeof v === "boolean"))
-						type = "boolean";
-					if (argConfig.values.every(v => typeof v === "number"))
-						type = "number";
-					break;
-			}
-			if (t === undefined) return type;
-			return t === type ? t : "string";
-		}, /** @type {"string" | "number" | "boolean" | undefined} */ (undefined));
+		argument.simpleType =
+			/** @type {SimpleType} */
+			(
+				argument.configs.reduce((t, argConfig) => {
+					/** @type {SimpleType} */
+					let type = "string";
+					switch (argConfig.type) {
+						case "number":
+							type = "number";
+							break;
+						case "reset":
+						case "boolean":
+							type = "boolean";
+							break;
+						case "enum": {
+							const values =
+								/** @type {NonNullable<ArgumentConfig["values"]>} */
+								(argConfig.values);
+
+							if (values.every(v => typeof v === "boolean")) type = "boolean";
+							if (values.every(v => typeof v === "number")) type = "number";
+							break;
+						}
+					}
+					if (t === undefined) return type;
+					return t === type ? t : "string";
+				}, /** @type {SimpleType | undefined} */ (undefined))
+			);
 		argument.multiple = argument.configs.some(c => c.multiple);
 	}
 
@@ -386,16 +417,18 @@ const getArguments = (schema = webpackSchema) => {
 
 const cliAddedItems = new WeakMap();
 
+/** @typedef {string | number} Property */
+
 /**
- * @param {any} config configuration
+ * @param {Configuration} config configuration
  * @param {string} schemaPath path in the config
  * @param {number | undefined} index index of value when multiple values are provided, otherwise undefined
- * @returns {{ problem?: LocalProblem, object?: any, property?: string | number, value?: any }} problem or object with property and value
+ * @returns {{ problem?: LocalProblem, object?: any, property?: Property, value?: any }} problem or object with property and value
  */
 const getObjectAndProperty = (config, schemaPath, index = 0) => {
 	if (!schemaPath) return { value: config };
 	const parts = schemaPath.split(".");
-	let property = parts.pop();
+	const property = /** @type {string} */ (parts.pop());
 	let current = config;
 	let i = 0;
 	for (const part of parts) {
@@ -434,22 +467,20 @@ const getObjectAndProperty = (config, schemaPath, index = 0) => {
 				}
 				value = value[x];
 			}
-		} else {
-			if (value === undefined) {
-				value = current[name] = {};
-			} else if (value === null || typeof value !== "object") {
-				return {
-					problem: {
-						type: "unexpected-non-object-in-path",
-						path: parts.slice(0, i).join(".")
-					}
-				};
-			}
+		} else if (value === undefined) {
+			value = current[name] = {};
+		} else if (value === null || typeof value !== "object") {
+			return {
+				problem: {
+					type: "unexpected-non-object-in-path",
+					path: parts.slice(0, i).join(".")
+				}
+			};
 		}
 		current = value;
 		i++;
 	}
-	let value = current[property];
+	const value = current[property];
 	if (property.endsWith("[]")) {
 		const name = property.slice(0, -2);
 		const value = current[name];
@@ -461,36 +492,35 @@ const getObjectAndProperty = (config, schemaPath, index = 0) => {
 			current[name] = [value, ...Array.from({ length: index }), undefined];
 			cliAddedItems.set(current[name], index + 1);
 			return { object: current[name], property: index + 1, value: undefined };
-		} else {
-			let addedItems = cliAddedItems.get(value) || 0;
-			while (addedItems <= index) {
-				value.push(undefined);
-				addedItems++;
-			}
-			cliAddedItems.set(value, addedItems);
-			const x = value.length - addedItems + index;
-			if (value[x] === undefined) {
-				value[x] = {};
-			} else if (value[x] === null || typeof value[x] !== "object") {
-				return {
-					problem: {
-						type: "unexpected-non-object-in-path",
-						path: schemaPath
-					}
-				};
-			}
+		}
+		let addedItems = cliAddedItems.get(value) || 0;
+		while (addedItems <= index) {
+			value.push(undefined);
+			addedItems++;
+		}
+		cliAddedItems.set(value, addedItems);
+		const x = value.length - addedItems + index;
+		if (value[x] === undefined) {
+			value[x] = {};
+		} else if (value[x] === null || typeof value[x] !== "object") {
 			return {
-				object: value,
-				property: x,
-				value: value[x]
+				problem: {
+					type: "unexpected-non-object-in-path",
+					path: schemaPath
+				}
 			};
 		}
+		return {
+			object: value,
+			property: x,
+			value: value[x]
+		};
 	}
 	return { object: current, property, value };
 };
 
 /**
- * @param {any} config configuration
+ * @param {Configuration} config configuration
  * @param {string} schemaPath path in the config
  * @param {any} value parsed value
  * @param {number | undefined} index index of value when multiple values are provided, otherwise undefined
@@ -503,14 +533,14 @@ const setValue = (config, schemaPath, value, index) => {
 		index
 	);
 	if (problem) return problem;
-	object[property] = value;
+	object[/** @type {Property} */ (property)] = value;
 	return null;
 };
 
 /**
  * @param {ArgumentConfig} argConfig processing instructions
- * @param {any} config configuration
- * @param {any} value the value
+ * @param {Configuration} config configuration
+ * @param {Value} value the value
  * @param {number | undefined} index the index if multiple values provided
  * @returns {LocalProblem | null} a problem if any
  */
@@ -540,22 +570,26 @@ const processArgumentConfig = (argConfig, config, value, index) => {
  */
 const getExpectedValue = argConfig => {
 	switch (argConfig.type) {
-		default:
-			return argConfig.type;
 		case "boolean":
 			return "true | false";
 		case "RegExp":
 			return "regular expression (example: /ab?c*/)";
 		case "enum":
-			return argConfig.values.map(v => `${v}`).join(" | ");
+			return /** @type {NonNullable<ArgumentConfig["values"]>} */ (
+				argConfig.values
+			)
+				.map(v => `${v}`)
+				.join(" | ");
 		case "reset":
 			return "true (will reset the previous value to an empty array)";
+		default:
+			return argConfig.type;
 	}
 };
 
 /**
  * @param {ArgumentConfig} argConfig processing instructions
- * @param {any} value the value
+ * @param {Value} value the value
  * @returns {any | undefined} parsed value
  */
 const parseValueForArgumentConfig = (argConfig, value) => {
@@ -573,8 +607,8 @@ const parseValueForArgumentConfig = (argConfig, value) => {
 		case "number":
 			if (typeof value === "number") return value;
 			if (typeof value === "string" && /^[+-]?\d*(\.\d*)[eE]\d+$/) {
-				const n = +value;
-				if (!isNaN(n)) return n;
+				const n = Number(value);
+				if (!Number.isNaN(n)) return n;
 			}
 			break;
 		case "boolean":
@@ -591,22 +625,28 @@ const parseValueForArgumentConfig = (argConfig, value) => {
 					return new RegExp(match[1], match[2]);
 			}
 			break;
-		case "enum":
-			if (argConfig.values.includes(value)) return value;
-			for (const item of argConfig.values) {
+		case "enum": {
+			const values =
+				/** @type {NonNullable<ArgumentConfig["values"]>} */
+				(argConfig.values);
+			if (values.includes(value)) return value;
+			for (const item of values) {
 				if (`${item}` === value) return item;
 			}
 			break;
+		}
 		case "reset":
 			if (value === true) return [];
 			break;
 	}
 };
 
+/** @typedef {any} Configuration */
+
 /**
- * @param {Record<string, Argument>} args object of arguments
- * @param {any} config configuration
- * @param {Record<string, string | number | boolean | RegExp | (string | number | boolean | RegExp)[]>} values object with values
+ * @param {Flags} args object of arguments
+ * @param {Configuration} config configuration
+ * @param {Record<string, Value[]>} values object with values
  * @returns {Problem[] | null} problems or null for success
  */
 const processArguments = (args, config, values) => {
@@ -622,6 +662,10 @@ const processArguments = (args, config, values) => {
 			});
 			continue;
 		}
+		/**
+		 * @param {Value} value value
+		 * @param {number | undefined} i index
+		 */
 		const processValue = (value, i) => {
 			const currentProblems = [];
 			for (const argConfig of arg.configs) {
@@ -632,13 +676,13 @@ const processArguments = (args, config, values) => {
 				currentProblems.push({
 					...problem,
 					argument: key,
-					value: value,
+					value,
 					index: i
 				});
 			}
 			problems.push(...currentProblems);
 		};
-		let value = values[key];
+		const value = values[key];
 		if (Array.isArray(value)) {
 			for (let i = 0; i < value.length; i++) {
 				processValue(value[i], i);
@@ -651,5 +695,5 @@ const processArguments = (args, config, values) => {
 	return problems;
 };
 
-exports.getArguments = getArguments;
-exports.processArguments = processArguments;
+module.exports.getArguments = getArguments;
+module.exports.processArguments = processArguments;

package/lib/config/browserslistTargetHandler.js

@@ -57,14 +57,14 @@ const load = (input, context) => {
 	// if a query is specified, then use it, else
 	// if a path to a config is specified then load it, else
 	// find a nearest config
-	const config = query
-		? query
-		: configPath
+	const config =
+		query ||
+		(configPath
 			? browserslist.loadConfig({
 					config: configPath,
 					env
 				})
-			: browserslist.loadConfig({ path: context, env });
+			: browserslist.loadConfig({ path: context, env }));
 
 	if (!config) return;
 	return browserslist(config);
@@ -80,8 +80,8 @@ const resolve = browsers => {
 	 * @param {Record<string, number | [number, number]>} versions first supported version
 	 * @returns {boolean} true if supports
 	 */
-	const rawChecker = versions => {
-		return browsers.every(v => {
+	const rawChecker = versions =>
+		browsers.every(v => {
 			const [name, parsedVersion] = v.split(" ");
 			if (!name) return false;
 			const requiredVersion = versions[name];
@@ -94,19 +94,19 @@ const resolve = browsers => {
 						? parsedVersion.split("-")[0].split(".")
 						: parsedVersion.split(".");
 			if (typeof requiredVersion === "number") {
-				return +parsedMajor >= requiredVersion;
+				return Number(parsedMajor) >= requiredVersion;
 			}
-			return requiredVersion[0] === +parsedMajor
-				? +parserMinor >= requiredVersion[1]
-				: +parsedMajor > requiredVersion[0];
+			return requiredVersion[0] === Number(parsedMajor)
+				? Number(parserMinor) >= requiredVersion[1]
+				: Number(parsedMajor) > requiredVersion[0];
 		});
-	};
-	const anyNode = browsers.some(b => /^node /.test(b));
+	const anyNode = browsers.some(b => b.startsWith("node "));
 	const anyBrowser = browsers.some(b => /^(?!node)/.test(b));
 	const browserProperty = !anyBrowser ? false : anyNode ? null : true;
 	const nodeProperty = !anyNode ? false : anyBrowser ? null : true;
 	// Internet Explorer Mobile, Blackberry browser and Opera Mini are very old browsers, they do not support new features
 	const es6DynamicImport = rawChecker({
+		/* eslint-disable camelcase */
 		chrome: 63,
 		and_chr: 63,
 		edge: 79,
@@ -124,9 +124,11 @@ const resolve = browsers => {
 		and_uc: [15, 5],
 		kaios: [3, 0],
 		node: [12, 17]
+		/* eslint-enable camelcase */
 	});
 
 	return {
+		/* eslint-disable camelcase */
 		const: rawChecker({
 			chrome: 49,
 			and_chr: 49,
@@ -331,6 +333,7 @@ const resolve = browsers => {
 			kaios: 3,
 			node: [7, 6]
 		}),
+		/* eslint-enable camelcase */
 		browser: browserProperty,
 		electron: false,
 		node: nodeProperty,
@@ -346,7 +349,7 @@ const resolve = browsers => {
 		nodeBuiltins: nodeProperty,
 		nodePrefixForCoreModules:
 			nodeProperty &&
-			!browsers.some(b => /^node 15/.test(b)) &&
+			!browsers.some(b => b.startsWith("node 15")) &&
 			rawChecker({
 				node: [14, 18]
 			}),