webpack 5.97.1 → 5.104.1

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -22,12 +22,14 @@ const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
 /** @typedef {import("estree").Super} Super */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../javascript/JavascriptParser").Members} Members */
 /** @typedef {import("../javascript/JavascriptParser").StatementPath} StatementPath */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 
 /**
  * This function takes a generic expression and detects whether it is an ObjectExpression.
@@ -44,16 +46,16 @@ const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
  * exports.foo = void 0;
  * exports.foo = "bar";
  * ```
- * @param {TODO} expr expression
+ * @param {Expression} expr expression
  * @returns {Expression | undefined} returns the value of property descriptor
  */
-const getValueOfPropertyDescription = expr => {
+const getValueOfPropertyDescription = (expr) => {
 	if (expr.type !== "ObjectExpression") return;
 	for (const property of expr.properties) {
-		if (property.computed) continue;
+		if (property.type === "SpreadElement" || property.computed) continue;
 		const key = property.key;
 		if (key.type !== "Identifier" || key.name !== "value") continue;
-		return property.value;
+		return /** @type {Expression} */ (property.value);
 	}
 };
 
@@ -64,7 +66,7 @@ const getValueOfPropertyDescription = expr => {
  * @param {Expression} expr expression being checked
  * @returns {boolean} true, when the expression is a truthy literal
  */
-const isTruthyLiteral = expr => {
+const isTruthyLiteral = (expr) => {
 	switch (expr.type) {
 		case "Literal":
 			return Boolean(expr.value);
@@ -81,7 +83,7 @@ const isTruthyLiteral = expr => {
  * @param {Expression} expr expression being checked
  * @returns {boolean} true, when the expression is a falsy literal
  */
-const isFalsyLiteral = expr => {
+const isFalsyLiteral = (expr) => {
 	switch (expr.type) {
 		case "Literal":
 			return !expr.value;
@@ -94,9 +96,10 @@ const isFalsyLiteral = expr => {
 /**
  * @param {JavascriptParser} parser the parser
  * @param {Expression} expr expression
- * @returns {{ argument: BasicEvaluatedExpression, ids: string[] } | undefined} parsed call
+ * @returns {{ argument: BasicEvaluatedExpression, ids: ExportInfoName[] } | undefined} parsed call
  */
 const parseRequireCall = (parser, expr) => {
+	/** @type {ExportInfoName[]} */
 	const ids = [];
 	while (expr.type === "MemberExpression") {
 		if (expr.object.type === "Super") return;
@@ -125,6 +128,8 @@ const parseRequireCall = (parser, expr) => {
 	return { argument: argValue, ids: ids.reverse() };
 };
 
+const PLUGIN_NAME = "CommonJsExportsParserPlugin";
+
 class CommonJsExportsParserPlugin {
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
@@ -144,7 +149,7 @@ class CommonJsExportsParserPlugin {
 
 		/**
 		 * @param {boolean} topLevel true, when the export is on top level
-		 * @param {string[]} members members of the export
+		 * @param {Members} members members of the export
 		 * @param {Expression | undefined} valueExpr expression for the value
 		 * @returns {void}
 		 */
@@ -161,14 +166,14 @@ class CommonJsExportsParserPlugin {
 		/**
 		 * @param {string=} reason reason
 		 */
-		const bailout = reason => {
+		const bailout = (reason) => {
 			DynamicExports.bailout(parser.state);
 			if (reason) bailoutHint(reason);
 		};
 		/**
 		 * @param {string} reason reason
 		 */
-		const bailoutHint = reason => {
+		const bailoutHint = (reason) => {
 			this.moduleGraph
 				.getOptimizationBailout(parser.state.module)
 				.push(`CommonJS bailout: ${reason}`);
@@ -177,17 +182,17 @@ class CommonJsExportsParserPlugin {
 		// metadata //
 		parser.hooks.evaluateTypeof
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", evaluateToString("object"));
+			.tap(PLUGIN_NAME, evaluateToString("object"));
 		parser.hooks.evaluateTypeof
 			.for("exports")
-			.tap("CommonJsPlugin", evaluateToString("object"));
+			.tap(PLUGIN_NAME, evaluateToString("object"));
 
 		// exporting //
 
 		/**
 		 * @param {AssignmentExpression} expr expression
 		 * @param {CommonJSDependencyBaseKeywords} base commonjs base keywords
-		 * @param {string[]} members members of the export
+		 * @param {Members} members members of the export
 		 * @returns {boolean | undefined} true, when the expression was handled
 		 */
 		const handleAssignExport = (expr, base, members) => {
@@ -214,6 +219,10 @@ class CommonJsExportsParserPlugin {
 				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.module.addDependency(dep);
+				/** @type {BuildMeta} */ (
+					parser.state.module.buildMeta
+				).treatAsCommonJs = true;
+
 				return true;
 			}
 			if (members.length === 0) return;
@@ -234,29 +243,31 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addDependency(dep);
+			/** @type {BuildMeta} */ (parser.state.module.buildMeta).treatAsCommonJs =
+				true;
 			parser.walkExpression(expr.right);
 			return true;
 		};
 		parser.hooks.assignMemberChain
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", (expr, members) =>
+			.tap(PLUGIN_NAME, (expr, members) =>
 				handleAssignExport(expr, "exports", members)
 			);
 		parser.hooks.assignMemberChain
 			.for("this")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (!parser.scope.topLevelScope) return;
 				return handleAssignExport(expr, "this", members);
 			});
 		parser.hooks.assignMemberChain
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (members[0] !== "exports") return;
 				return handleAssignExport(expr, "module.exports", members.slice(1));
 			});
 		parser.hooks.call
 			.for("Object.defineProperty")
-			.tap("CommonJsExportsParserPlugin", expression => {
+			.tap(PLUGIN_NAME, (expression) => {
 				const expr = /** @type {CallExpression} */ (expression);
 				if (!parser.isStatementLevelExpression(expr)) return;
 				if (expr.arguments.length !== 3) return;
@@ -291,6 +302,9 @@ class CommonJsExportsParserPlugin {
 				);
 				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				parser.state.module.addDependency(dep);
+				/** @type {BuildMeta} */ (
+					parser.state.module.buildMeta
+				).treatAsCommonJs = true;
 
 				parser.walkExpression(expr.arguments[2]);
 				return true;
@@ -301,7 +315,7 @@ class CommonJsExportsParserPlugin {
 		/**
 		 * @param {Expression | Super} expr expression
 		 * @param {CommonJSDependencyBaseKeywords} base commonjs base keywords
-		 * @param {string[]} members members of the export
+		 * @param {Members} members members of the export
 		 * @param {CallExpression=} call call expression
 		 * @returns {boolean | void} true, when the expression was handled
 		 */
@@ -331,6 +345,9 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addDependency(dep);
+			/** @type {BuildMeta} */ (parser.state.module.buildMeta).treatAsCommonJs =
+				true;
+
 			if (call) {
 				parser.walkExpressions(call.arguments);
 			}
@@ -338,22 +355,20 @@ class CommonJsExportsParserPlugin {
 		};
 		parser.hooks.callMemberChain
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", (expr, members) =>
+			.tap(PLUGIN_NAME, (expr, members) =>
 				handleAccessExport(expr.callee, "exports", members, expr)
 			);
 		parser.hooks.expressionMemberChain
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", (expr, members) =>
+			.tap(PLUGIN_NAME, (expr, members) =>
 				handleAccessExport(expr, "exports", members)
 			);
 		parser.hooks.expression
 			.for("exports")
-			.tap("CommonJsExportsParserPlugin", expr =>
-				handleAccessExport(expr, "exports", [])
-			);
+			.tap(PLUGIN_NAME, (expr) => handleAccessExport(expr, "exports", []));
 		parser.hooks.callMemberChain
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (members[0] !== "exports") return;
 				return handleAccessExport(
 					expr.callee,
@@ -364,36 +379,34 @@ class CommonJsExportsParserPlugin {
 			});
 		parser.hooks.expressionMemberChain
 			.for("module")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (members[0] !== "exports") return;
 				return handleAccessExport(expr, "module.exports", members.slice(1));
 			});
 		parser.hooks.expression
 			.for("module.exports")
-			.tap("CommonJsExportsParserPlugin", expr =>
+			.tap(PLUGIN_NAME, (expr) =>
 				handleAccessExport(expr, "module.exports", [])
 			);
 		parser.hooks.callMemberChain
 			.for("this")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (!parser.scope.topLevelScope) return;
 				return handleAccessExport(expr.callee, "this", members, expr);
 			});
 		parser.hooks.expressionMemberChain
 			.for("this")
-			.tap("CommonJsExportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				if (!parser.scope.topLevelScope) return;
 				return handleAccessExport(expr, "this", members);
 			});
-		parser.hooks.expression
-			.for("this")
-			.tap("CommonJsExportsParserPlugin", expr => {
-				if (!parser.scope.topLevelScope) return;
-				return handleAccessExport(expr, "this", []);
-			});
+		parser.hooks.expression.for("this").tap(PLUGIN_NAME, (expr) => {
+			if (!parser.scope.topLevelScope) return;
+			return handleAccessExport(expr, "this", []);
+		});
 
 		// Bailouts //
-		parser.hooks.expression.for("module").tap("CommonJsPlugin", expr => {
+		parser.hooks.expression.for("module").tap(PLUGIN_NAME, (expr) => {
 			bailout();
 			const isHarmony = HarmonyExports.isEnabled(parser.state);
 			const dep = new ModuleDecoratorDependency(
@@ -408,4 +421,5 @@ class CommonJsExportsParserPlugin {
 		});
 	}
 }
+
 module.exports = CommonJsExportsParserPlugin;

package/lib/dependencies/CommonJsFullRequireDependency.js

@@ -14,20 +14,22 @@ const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("../util/chainedImports").IdRanges} IdRanges */
 
 class CommonJsFullRequireDependency extends ModuleDependency {
 	/**
 	 * @param {string} request the request string
 	 * @param {Range} range location in source code
-	 * @param {string[]} names accessed properties on module
-	 * @param {Range[]=} idRanges ranges for members of ids; the two arrays are right-aligned
+	 * @param {ExportInfoName[]} names accessed properties on module
+	 * @param {IdRanges=} idRanges ranges for members of ids; the two arrays are right-aligned
 	 */
 	constructor(
 		request,
@@ -47,7 +49,7 @@ class CommonJsFullRequireDependency extends ModuleDependency {
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		if (this.call) {
@@ -107,15 +109,7 @@ CommonJsFullRequireDependency.Template = class CommonJsFullRequireDependencyTemp
 	apply(
 		dependency,
 		source,
-		{
-			module,
-			runtimeTemplate,
-			moduleGraph,
-			chunkGraph,
-			runtimeRequirements,
-			runtime,
-			initFragments
-		}
+		{ runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements, runtime }
 	) {
 		const dep = /** @type {CommonJsFullRequireDependency} */ (dependency);
 		if (!dep.range) return;