webpack 5.59.0 → 5.94.0

package/lib/ConcatenationScope.js

@@ -14,13 +14,13 @@ const DEFAULT_EXPORT = "__WEBPACK_DEFAULT_EXPORT__";
 const NAMESPACE_OBJECT_EXPORT = "__WEBPACK_NAMESPACE_OBJECT__";
 
 /**
- * @typedef {Object} ExternalModuleInfo
+ * @typedef {object} ExternalModuleInfo
  * @property {number} index
  * @property {Module} module
  */
 
 /**
- * @typedef {Object} ConcatenatedModuleInfo
+ * @typedef {object} ConcatenatedModuleInfo
  * @property {number} index
  * @property {Module} module
  * @property {Map<string, string>} exportMap mapping from export name to symbol
@@ -31,7 +31,7 @@ const NAMESPACE_OBJECT_EXPORT = "__WEBPACK_NAMESPACE_OBJECT__";
 /** @typedef {ConcatenatedModuleInfo | ExternalModuleInfo} ModuleInfo */
 
 /**
- * @typedef {Object} ModuleReferenceOptions
+ * @typedef {object} ModuleReferenceOptions
  * @property {string[]} ids the properties/exports of the module
  * @property {boolean} call true, when this referenced export is called
  * @property {boolean} directImport true, when this referenced export is directly imported (not via property access)
@@ -64,7 +64,6 @@ class ConcatenationScope {
 	}
 
 	/**
-	 *
 	 * @param {string} exportName name of the export
 	 * @param {string} symbol identifier of the export in source code
 	 */
@@ -78,7 +77,6 @@ class ConcatenationScope {
 	}
 
 	/**
-	 *
 	 * @param {string} exportName name of the export
 	 * @param {string} expression expression to be used
 	 */
@@ -99,7 +97,6 @@ class ConcatenationScope {
 	}
 
 	/**
-	 *
 	 * @param {Module} module the referenced module
 	 * @param {Partial<ModuleReferenceOptions>} options options
 	 * @returns {string} the reference as identifier
@@ -108,14 +105,14 @@ class ConcatenationScope {
 		module,
 		{ ids = undefined, call = false, directImport = false, asiSafe = false }
 	) {
-		const info = this._modulesMap.get(module);
+		const info = /** @type {ModuleInfo} */ (this._modulesMap.get(module));
 		const callFlag = call ? "_call" : "";
 		const directImportFlag = directImport ? "_directImport" : "";
 		const asiSafeFlag = asiSafe
 			? "_asiSafe1"
 			: asiSafe === false
-			? "_asiSafe0"
-			: "";
+				? "_asiSafe0"
+				: "";
 		const exportData = ids
 			? Buffer.from(JSON.stringify(ids), "utf-8").toString("hex")
 			: "ns";
@@ -133,12 +130,12 @@ class ConcatenationScope {
 
 	/**
 	 * @param {string} name the identifier
-	 * @returns {ModuleReferenceOptions & { index: number }} parsed options and index
+	 * @returns {ModuleReferenceOptions & { index: number } | null} parsed options and index
 	 */
 	static matchModuleReference(name) {
 		const match = MODULE_REFERENCE_REGEXP.exec(name);
 		if (!match) return null;
-		const index = +match[1];
+		const index = Number(match[1]);
 		const asiSafe = match[5];
 		return {
 			index,
@@ -146,8 +143,8 @@ class ConcatenationScope {
 				match[2] === "ns"
 					? []
 					: JSON.parse(Buffer.from(match[2], "hex").toString("utf-8")),
-			call: !!match[3],
-			directImport: !!match[4],
+			call: Boolean(match[3]),
+			directImport: Boolean(match[4]),
 			asiSafe: asiSafe ? asiSafe === "1" : undefined
 		};
 	}

package/lib/ConditionalInitFragment.js

@@ -14,6 +14,11 @@ const { mergeRuntime } = require("./util/runtime");
 /** @typedef {import("./Generator").GenerateContext} GenerateContext */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
+/**
+ * @param {string} condition condition
+ * @param {string | Source} source source
+ * @returns {string | Source} wrapped source
+ */
 const wrapInCondition = (condition, source) => {
 	if (typeof source === "string") {
 		return Template.asString([
@@ -22,26 +27,25 @@ const wrapInCondition = (condition, source) => {
 			"}",
 			""
 		]);
-	} else {
-		return new ConcatSource(
-			`if (${condition}) {\n`,
-			new PrefixSource("\t", source),
-			"}\n"
-		);
 	}
+	return new ConcatSource(
+		`if (${condition}) {\n`,
+		new PrefixSource("\t", source),
+		"}\n"
+	);
 };
 
 /**
- * @typedef {GenerateContext} Context
+ * @extends {InitFragment<GenerateContext>}
  */
 class ConditionalInitFragment extends InitFragment {
 	/**
-	 * @param {string|Source} content the source code that will be included as initialization code
+	 * @param {string | Source | undefined} 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 | undefined} key unique key to avoid emitting the same initialization code twice
 	 * @param {RuntimeSpec | boolean} runtimeCondition in which runtime this fragment should be executed
-	 * @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,
@@ -49,15 +53,15 @@ class ConditionalInitFragment extends InitFragment {
 		position,
 		key,
 		runtimeCondition = true,
-		endContent
+		endContent = undefined
 	) {
 		super(content, stage, position, key, endContent);
 		this.runtimeCondition = runtimeCondition;
 	}
 
 	/**
-	 * @param {Context} context context
-	 * @returns {string|Source} the source code that will be included as initialization code
+	 * @param {GenerateContext} context context
+	 * @returns {string | Source | undefined} the source code that will be included as initialization code
 	 */
 	getContent(context) {
 		if (this.runtimeCondition === false || !this.content) return "";
@@ -73,7 +77,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) {
@@ -89,6 +93,10 @@ class ConditionalInitFragment extends InitFragment {
 		return wrapInCondition(expr, this.endContent);
 	}
 
+	/**
+	 * @param {ConditionalInitFragment} other fragment to merge with
+	 * @returns {ConditionalInitFragment} merged fragment
+	 */
 	merge(other) {
 		if (this.runtimeCondition === true) return this;
 		if (other.runtimeCondition === true) return other;

package/lib/ConstPlugin.js

@@ -5,19 +5,36 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const CachedConstDependency = require("./dependencies/CachedConstDependency");
 const ConstDependency = require("./dependencies/ConstDependency");
 const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
 const { parseResource } = require("./util/identifier");
 
-/** @typedef {import("estree").Expression} ExpressionNode */
-/** @typedef {import("estree").Super} SuperNode */
+/** @typedef {import("estree").AssignmentProperty} AssignmentProperty */
+/** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("estree").Identifier} Identifier */
+/** @typedef {import("estree").Pattern} Pattern */
+/** @typedef {import("estree").SourceLocation} SourceLocation */
+/** @typedef {import("estree").Statement} Statement */
+/** @typedef {import("estree").Super} Super */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
+/**
+ * @param {Set<string>} declarations set of declarations
+ * @param {Identifier | Pattern} pattern pattern to collect declarations from
+ */
 const collectDeclaration = (declarations, pattern) => {
 	const stack = [pattern];
 	while (stack.length > 0) {
-		const node = stack.pop();
+		const node = /** @type {Pattern} */ (stack.pop());
 		switch (node.type) {
 			case "Identifier":
 				declarations.add(node.name);
@@ -34,7 +51,7 @@ const collectDeclaration = (declarations, pattern) => {
 				break;
 			case "ObjectPattern":
 				for (const property of node.properties) {
-					stack.push(property.value);
+					stack.push(/** @type {AssignmentProperty} */ (property).value);
 				}
 				break;
 			case "RestElement":
@@ -44,8 +61,14 @@ const collectDeclaration = (declarations, pattern) => {
 	}
 };
 
+/**
+ * @param {Statement} branch branch to get hoisted declarations from
+ * @param {boolean} includeFunctionDeclarations whether to include function declarations
+ * @returns {Array<string>} hoisted declarations
+ */
 const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 	const declarations = new Set();
+	/** @type {Array<TODO | null | undefined>} */
 	const stack = [branch];
 	while (stack.length > 0) {
 		const node = stack.pop();
@@ -93,7 +116,7 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 				break;
 			case "FunctionDeclaration":
 				if (includeFunctionDeclarations) {
-					collectDeclaration(declarations, node.id);
+					collectDeclaration(declarations, /** @type {Identifier} */ (node.id));
 				}
 				break;
 			case "VariableDeclaration":
@@ -108,6 +131,8 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 	return Array.from(declarations);
 };
 
+const PLUGIN_NAME = "ConstPlugin";
+
 class ConstPlugin {
 	/**
 	 * Apply the plugin
@@ -117,7 +142,7 @@ class ConstPlugin {
 	apply(compiler) {
 		const cachedParseResource = parseResource.bindCache(compiler.root);
 		compiler.hooks.compilation.tap(
-			"ConstPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -129,15 +154,21 @@ class ConstPlugin {
 					new CachedConstDependency.Template()
 				);
 
+				/**
+				 * @param {JavascriptParser} parser the parser
+				 */
 				const handler = parser => {
-					parser.hooks.statementIf.tap("ConstPlugin", statement => {
+					parser.hooks.statementIf.tap(PLUGIN_NAME, statement => {
 						if (parser.scope.isAsmJs) return;
 						const param = parser.evaluateExpression(statement.test);
 						const bool = param.asBool();
 						if (typeof bool === "boolean") {
 							if (!param.couldHaveSideEffects()) {
-								const dep = new ConstDependency(`${bool}`, param.range);
-								dep.loc = statement.loc;
+								const dep = new ConstDependency(
+									`${bool}`,
+									/** @type {Range} */ (param.range)
+								);
+								dep.loc = /** @type {SourceLocation} */ (statement.loc);
 								parser.state.module.addPresentationalDependency(dep);
 							} else {
 								parser.walkExpression(statement.test);
@@ -176,41 +207,36 @@ class ConstPlugin {
 								// NOTE: When code runs in strict mode, `var` declarations
 								// are hoisted but `function` declarations don't.
 								//
-								let declarations;
-								if (parser.scope.isStrict) {
-									// If the code runs in strict mode, variable declarations
-									// using `var` must be hoisted.
-									declarations = getHoistedDeclarations(branchToRemove, false);
-								} else {
-									// Otherwise, collect all hoisted declaration.
-									declarations = getHoistedDeclarations(branchToRemove, true);
-								}
-								let replacement;
-								if (declarations.length > 0) {
-									replacement = `{ var ${declarations.join(", ")}; }`;
-								} else {
-									replacement = "{}";
-								}
+								const declarations = parser.scope.isStrict
+									? getHoistedDeclarations(branchToRemove, false)
+									: getHoistedDeclarations(branchToRemove, true);
+								const replacement =
+									declarations.length > 0
+										? `{ var ${declarations.join(", ")}; }`
+										: "{}";
 								const dep = new ConstDependency(
 									replacement,
-									branchToRemove.range
+									/** @type {Range} */ (branchToRemove.range)
 								);
-								dep.loc = branchToRemove.loc;
+								dep.loc = /** @type {SourceLocation} */ (branchToRemove.loc);
 								parser.state.module.addPresentationalDependency(dep);
 							}
 							return bool;
 						}
 					});
 					parser.hooks.expressionConditionalOperator.tap(
-						"ConstPlugin",
+						PLUGIN_NAME,
 						expression => {
 							if (parser.scope.isAsmJs) return;
 							const param = parser.evaluateExpression(expression.test);
 							const bool = param.asBool();
 							if (typeof bool === "boolean") {
 								if (!param.couldHaveSideEffects()) {
-									const dep = new ConstDependency(` ${bool}`, param.range);
-									dep.loc = expression.loc;
+									const dep = new ConstDependency(
+										` ${bool}`,
+										/** @type {Range} */ (param.range)
+									);
+									dep.loc = /** @type {SourceLocation} */ (expression.loc);
 									parser.state.module.addPresentationalDependency(dep);
 								} else {
 									parser.walkExpression(expression.test);
@@ -229,15 +255,18 @@ class ConstPlugin {
 								const branchToRemove = bool
 									? expression.alternate
 									: expression.consequent;
-								const dep = new ConstDependency("0", branchToRemove.range);
-								dep.loc = branchToRemove.loc;
+								const dep = new ConstDependency(
+									"0",
+									/** @type {Range} */ (branchToRemove.range)
+								);
+								dep.loc = /** @type {SourceLocation} */ (branchToRemove.loc);
 								parser.state.module.addPresentationalDependency(dep);
 								return bool;
 							}
 						}
 					);
 					parser.hooks.expressionLogicalOperator.tap(
-						"ConstPlugin",
+						PLUGIN_NAME,
 						expression => {
 							if (parser.scope.isAsmJs) return;
 							if (
@@ -306,8 +335,11 @@ class ConstPlugin {
 										//
 										//   returnfalse&&'foo'
 										//
-										const dep = new ConstDependency(` ${bool}`, param.range);
-										dep.loc = expression.loc;
+										const dep = new ConstDependency(
+											` ${bool}`,
+											/** @type {Range} */ (param.range)
+										);
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 									} else {
 										parser.walkExpression(expression.left);
@@ -315,16 +347,16 @@ class ConstPlugin {
 									if (!keepRight) {
 										const dep = new ConstDependency(
 											"0",
-											expression.right.range
+											/** @type {Range} */ (expression.right.range)
 										);
-										dep.loc = expression.loc;
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 									}
 									return keepRight;
 								}
 							} else if (expression.operator === "??") {
 								const param = parser.evaluateExpression(expression.left);
-								const keepRight = param && param.asNullish();
+								const keepRight = param.asNullish();
 								if (typeof keepRight === "boolean") {
 									// ------------------------------------------
 									//
@@ -356,15 +388,18 @@ class ConstPlugin {
 										//
 										//   returnnull??'foo'
 										//
-										const dep = new ConstDependency(" null", param.range);
-										dep.loc = expression.loc;
+										const dep = new ConstDependency(
+											" null",
+											/** @type {Range} */ (param.range)
+										);
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 									} else {
 										const dep = new ConstDependency(
 											"0",
-											expression.right.range
+											/** @type {Range} */ (expression.right.range)
 										);
-										dep.loc = expression.loc;
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 										parser.walkExpression(expression.left);
 									}
@@ -374,10 +409,10 @@ class ConstPlugin {
 							}
 						}
 					);
-					parser.hooks.optionalChaining.tap("ConstPlugin", expr => {
-						/** @type {ExpressionNode[]} */
+					parser.hooks.optionalChaining.tap(PLUGIN_NAME, expr => {
+						/** @type {Expression[]} */
 						const optionalExpressionsStack = [];
-						/** @type {ExpressionNode|SuperNode} */
+						/** @type {Expression | Super} */
 						let next = expr.expression;
 
 						while (
@@ -388,7 +423,7 @@ class ConstPlugin {
 								if (next.optional) {
 									// SuperNode can not be optional
 									optionalExpressionsStack.push(
-										/** @type {ExpressionNode} */ (next.object)
+										/** @type {Expression} */ (next.object)
 									);
 								}
 								next = next.object;
@@ -396,7 +431,7 @@ class ConstPlugin {
 								if (next.optional) {
 									// SuperNode can not be optional
 									optionalExpressionsStack.push(
-										/** @type {ExpressionNode} */ (next.callee)
+										/** @type {Expression} */ (next.callee)
 									);
 								}
 								next = next.callee;
@@ -405,9 +440,11 @@ class ConstPlugin {
 
 						while (optionalExpressionsStack.length) {
 							const expression = optionalExpressionsStack.pop();
-							const evaluated = parser.evaluateExpression(expression);
+							const evaluated = parser.evaluateExpression(
+								/** @type {Expression} */ (expression)
+							);
 
-							if (evaluated && evaluated.asNullish()) {
+							if (evaluated.asNullish()) {
 								// ------------------------------------------
 								//
 								// Given the following code:
@@ -420,8 +457,11 @@ class ConstPlugin {
 								//
 								// ------------------------------------------
 								//
-								const dep = new ConstDependency(" undefined", expr.range);
-								dep.loc = expr.loc;
+								const dep = new ConstDependency(
+									" undefined",
+									/** @type {Range} */ (expr.range)
+								);
+								dep.loc = /** @type {SourceLocation} */ (expr.loc);
 								parser.state.module.addPresentationalDependency(dep);
 								return true;
 							}
@@ -429,7 +469,7 @@ class ConstPlugin {
 					});
 					parser.hooks.evaluateIdentifier
 						.for("__resourceQuery")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							return evaluateToString(
@@ -438,24 +478,24 @@ class ConstPlugin {
 						});
 					parser.hooks.expression
 						.for("__resourceQuery")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							const dep = new CachedConstDependency(
 								JSON.stringify(
 									cachedParseResource(parser.state.module.resource).query
 								),
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								"__resourceQuery"
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {SourceLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
 
 					parser.hooks.evaluateIdentifier
 						.for("__resourceFragment")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							return evaluateToString(
@@ -464,31 +504,31 @@ class ConstPlugin {
 						});
 					parser.hooks.expression
 						.for("__resourceFragment")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							const dep = new CachedConstDependency(
 								JSON.stringify(
 									cachedParseResource(parser.state.module.resource).fragment
 								),
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								"__resourceFragment"
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {SourceLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("ConstPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("ConstPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("ConstPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/ContextExclusionPlugin.js

@@ -22,9 +22,9 @@ class ContextExclusionPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.contextModuleFactory.tap("ContextExclusionPlugin", cmf => {
-			cmf.hooks.contextModuleFiles.tap("ContextExclusionPlugin", files => {
-				return files.filter(filePath => !this.negativeMatcher.test(filePath));
-			});
+			cmf.hooks.contextModuleFiles.tap("ContextExclusionPlugin", files =>
+				files.filter(filePath => !this.negativeMatcher.test(filePath))
+			);
 		});
 	}
 }