@depup/webpack 5.111.1-depup.2 → 5.112.0-depup.1

package/lib/dependencies/{CommonJsExportsParserPlugin.js → commonjs/CommonJsExportsParserPlugin.js}

@@ -5,21 +5,28 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { evaluateToString } = require("../javascript/JavascriptParserHelpers");
-const { recordOptimizationBailout } = require("../util/buildDiagnostics");
-const formatLocation = require("../util/formatLocation");
-const { propertyAccess } = require("../util/property");
+const isDependencyKind = require("../../graph/isDependencyKind");
+const {
+	evaluateToString
+} = require("../../javascript/JavascriptParserHelpers");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const { recordOptimizationBailout } = require("../../util/buildDiagnostics");
+const formatLocation = require("../../util/formatLocation");
+const memoize = require("../../util/memoize");
+const { propertyAccess } = require("../../util/property");
+
+const RuntimeRequirementsDependency = require("../core/RuntimeRequirementsDependency");
+const ESMExports = require("../esm/ESMExports");
+const DynamicExports = require("../helpers/DynamicExports");
 const CommonJsExportRequireDependency = require("./CommonJsExportRequireDependency");
 const CommonJsExportsDependency = require("./CommonJsExportsDependency");
-const CommonJsFullRequireDependency = require("./CommonJsFullRequireDependency");
 const CommonJsObjectExportDependency = require("./CommonJsObjectExportDependency");
-const CommonJsRequireDependency = require("./CommonJsRequireDependency");
 const CommonJsSelfReferenceDependency = require("./CommonJsSelfReferenceDependency");
-const DynamicExports = require("./DynamicExports");
-const HarmonyExports = require("./HarmonyExports");
 const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
-const RuntimeRequirementsDependency = require("./RuntimeRequirementsDependency");
+
+const getRequireBindingTag = memoize(
+	() => require("./CommonJsImportsParserPlugin").REQUIRE_BINDING_TAG
+);
 
 const FUNCTION_PROPERTY_DROP_HEAD =
 	CommonJsObjectExportDependency.FUNCTION_PROPERTY_DROP_HEAD;
@@ -38,15 +45,21 @@ const FUNCTION_PROPERTY_DROP_HEAD =
  * 	ThisExpression
  * } from "estree"
  */
-/** @import { ExportInfoName } from "../Dependency" */
-/** @import { BuildInfo } from "../Module" */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../../declarations/WebpackOptions"
+ */
+/** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
+/** @import { ExportInfoName } from "../../graph/Dependency" */
+/** @import { BuildInfo } from "../../module/Module" */
+
 /**
  * @import JavascriptParser, {
  * 	Range,
  * 	Members,
  * 	StatementPath
- * } from "../javascript/JavascriptParser"
+ * } from "../../javascript/JavascriptParser"
  */
 /**
  * @import {
@@ -58,10 +71,11 @@ const FUNCTION_PROPERTY_DROP_HEAD =
  * 	CommonJsObjectExportKind
  * } from "./CommonJsObjectExportDependency"
  */
+/** @import { RequireBindingData } from "./CommonJsImportsParserPlugin" */
 /**
  * @import {
  * 	JavascriptModuleBuildMeta
- * } from "../javascript/JavascriptModule"
+ * } from "../../javascript/JavascriptModule"
  */
 
 /**
@@ -92,13 +106,27 @@ const getValueOfPropertyDescription = (expr) => {
 	}
 };
 
+const DESCRIPTOR_ATTRIBUTES = new Set([
+	"enumerable",
+	"configurable",
+	"writable"
+]);
+
+/**
+ * Whether an attribute value names no binding, like `true` or a minifier's `!0`.
+ * @param {Expression} expr attribute value
+ * @returns {boolean} true, when the value is a literal, possibly under a unary operator
+ */
+const isConstantAttribute = (expr) =>
+	expr.type === "Literal" ||
+	(expr.type === "UnaryExpression" && expr.argument.type === "Literal");
+
 /**
  * Extracts the re-exportable expression from a property descriptor, handling
  * both the eager `{ value: <expr> }` form and the lazy
  * `{ get: () => <expr> }` / `{ get() { return <expr>; } }` accessor form used
- * by barrel files (e.g. webpack's own `lib/index.js`). A `set` accessor cannot
- * be reproduced by the rewritten descriptor, so descriptors with a setter are
- * left to the generic handler (which keeps the descriptor verbatim).
+ * by barrel files (e.g. webpack's own `lib/index.js`). Any other property must
+ * be a literal attribute, since the descriptor is kept as written but not walked.
  * @param {Expression} expr property descriptor expression
  * @returns {{ expr: Expression, getter: boolean } | undefined} the value expression and whether it is a lazy getter
  */
@@ -109,15 +137,19 @@ const getReexportOfPropertyDescriptor = (expr) => {
 	/** @type {Expression | undefined} */
 	let getFn;
 	for (const property of expr.properties) {
-		if (property.type === "SpreadElement" || property.computed) continue;
+		if (property.type === "SpreadElement" || property.computed) return;
 		const key = property.key;
-		if (key.type !== "Identifier") continue;
-		// A setter would be silently dropped by the rewrite — bail out.
-		if (key.name === "set") return;
+		if (key.type !== "Identifier") return;
 		if (key.name === "value") {
 			valueExpr = /** @type {Expression} */ (property.value);
 		} else if (key.name === "get") {
 			getFn = /** @type {Expression} */ (property.value);
+		} else if (
+			!DESCRIPTOR_ATTRIBUTES.has(key.name) ||
+			!isConstantAttribute(/** @type {Expression} */ (property.value))
+		) {
+			// a setter, an unknown key or a computed attribute: not a plain re-export
+			return;
 		}
 	}
 	if (valueExpr) return { expr: valueExpr, getter: false };
@@ -126,6 +158,11 @@ const getReexportOfPropertyDescriptor = (expr) => {
 		(getFn.type === "FunctionExpression" ||
 			getFn.type === "ArrowFunctionExpression")
 	) {
+		// A parameter or the function's own name would shadow a `const` binding the body names.
+		if (getFn.params.length > 0) return;
+		if (getFn.type === "FunctionExpression" && getFn.id) return;
+		// An async or generator getter returns a wrapper, not the re-exported value.
+		if (getFn.async || getFn.generator) return;
 		// Arrow with expression body: `() => require("./x")`.
 		if (getFn.body.type !== "BlockStatement") {
 			return { expr: /** @type {Expression} */ (getFn.body), getter: true };
@@ -176,10 +213,10 @@ const isFalsyLiteral = (expr) => {
 };
 
 /**
- * Parses require call.
+ * Parses a `require()` call, or a `const` binding of one, under a static member chain.
  * @param {JavascriptParser} parser the parser
  * @param {Expression} expr expression
- * @returns {{ argument: BasicEvaluatedExpression, ids: ExportInfoName[] } | undefined} parsed call
+ * @returns {{ request: string, ids: ExportInfoName[], binding?: { range: Range, dep: CommonJsRequireDependency } } | undefined} parsed call, with the binding it reads
  */
 const parseRequireCall = (parser, expr) => {
 	/** @type {ExportInfoName[]} */
@@ -197,6 +234,18 @@ const parseRequireCall = (parser, expr) => {
 		}
 		expr = expr.object;
 	}
+	if (expr.type === "Identifier") {
+		const binding =
+			/** @type {RequireBindingData | undefined} */
+			(parser.getTagData(expr.name, getRequireBindingTag()));
+		// No dependency: `webpackIgnore`, a local module, or not walked yet.
+		if (!binding || !binding.dep) return;
+		return {
+			request: binding.request,
+			ids: ids.reverse(),
+			binding: { range: /** @type {Range} */ (expr.range), dep: binding.dep }
+		};
+	}
 	if (expr.type !== "CallExpression" || expr.arguments.length !== 1) return;
 	const callee = expr.callee;
 	if (
@@ -208,7 +257,11 @@ const parseRequireCall = (parser, expr) => {
 	const arg = expr.arguments[0];
 	if (arg.type === "SpreadElement") return;
 	const argValue = parser.evaluateExpression(arg);
-	return { argument: argValue, ids: ids.reverse() };
+	if (!argValue.isString()) return;
+	return {
+		request: /** @type {string} */ (argValue.string),
+		ids: ids.reverse()
+	};
 };
 
 /**
@@ -358,12 +411,22 @@ const getObjectExportKind = (property) => {
 const PLUGIN_NAME = "CommonJsExportsParserPlugin";
 
 class CommonJsExportsParserPlugin {
+	/**
+	 * Creates an instance of CommonJsExportsParserPlugin.
+	 * @param {JavascriptParserOptions["topLevelThis"]} topLevelThis what top-level `this` refers to
+	 */
+	constructor(topLevelThis) {
+		/** @type {boolean} */
+		this.thisAsExports = topLevelThis !== "global";
+	}
+
 	/**
 	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {JavascriptParser} parser the parser
 	 * @returns {void}
 	 */
 	apply(parser) {
+		const { thisAsExports } = this;
 		const enableStructuredExports = () => {
 			DynamicExports.enable(parser.state);
 		};
@@ -452,12 +515,14 @@ class CommonJsExportsParserPlugin {
 		 * @returns {boolean | undefined} true, when the expression was handled
 		 */
 		const handleAssignExport = (expr, base, members) => {
-			if (HarmonyExports.isEnabled(parser.state)) return;
-			// Handle reexporting
-			const requireCall = parseRequireCall(parser, expr.right);
+			if (ESMExports.isEnabled(parser.state)) return;
+			// Handle reexporting; `+=` and the like combine with the current value
+			const requireCall =
+				expr.operator === "="
+					? parseRequireCall(parser, expr.right)
+					: undefined;
 			if (
 				requireCall &&
-				requireCall.argument.isString() &&
 				(members.length === 0 || members[0] !== "__esModule")
 			) {
 				enableStructuredExports();
@@ -468,10 +533,14 @@ class CommonJsExportsParserPlugin {
 					null,
 					base,
 					members,
-					/** @type {string} */ (requireCall.argument.string),
+					requireCall.request,
 					requireCall.ids,
 					!parser.isStatementLevelExpression(expr)
 				);
+				if (requireCall.binding) {
+					dep.bindingRange = requireCall.binding.range;
+					dep.bindingDependency = requireCall.binding.dep;
+				}
 				dep.asiSafe = !parser.isAsiPosition(
 					/** @type {Range} */ (expr.range)[0]
 				);
@@ -598,10 +667,7 @@ class CommonJsExportsParserPlugin {
 					const usedByExports = new Set([name]);
 					for (let j = start; j < module.dependencies.length; j++) {
 						const nested = module.dependencies[j];
-						if (
-							nested instanceof CommonJsRequireDependency ||
-							nested instanceof CommonJsFullRequireDependency
-						) {
+						if (isDependencyKind(nested, "commonjs-require")) {
 							nested.usedByExports = usedByExports;
 						}
 					}
@@ -614,12 +680,14 @@ class CommonJsExportsParserPlugin {
 			.tap(PLUGIN_NAME, (expr, members) =>
 				handleAssignExport(expr, "exports", members)
 			);
-		parser.hooks.assignMemberChain
-			.for("this")
-			.tap(PLUGIN_NAME, (expr, members) => {
-				if (!parser.scope.topLevelScope) return;
-				return handleAssignExport(expr, "this", members);
-			});
+		if (thisAsExports) {
+			parser.hooks.assignMemberChain
+				.for("this")
+				.tap(PLUGIN_NAME, (expr, members) => {
+					if (!parser.scope.topLevelScope) return;
+					return handleAssignExport(expr, "this", members);
+				});
+		}
 		parser.hooks.assignMemberChain
 			.for("module")
 			.tap(PLUGIN_NAME, (expr, members) => {
@@ -640,7 +708,9 @@ class CommonJsExportsParserPlugin {
 				if (
 					exportsArg.identifier !== "exports" &&
 					exportsArg.identifier !== "module.exports" &&
-					(exportsArg.identifier !== "this" || !parser.scope.topLevelScope)
+					(exportsArg.identifier !== "this" ||
+						!thisAsExports ||
+						!parser.scope.topLevelScope)
 				) {
 					return;
 				}
@@ -655,17 +725,22 @@ class CommonJsExportsParserPlugin {
 					const reexport = getReexportOfPropertyDescriptor(descArg);
 					const requireCall =
 						reexport && parseRequireCall(parser, reexport.expr);
-					if (reexport && requireCall && requireCall.argument.isString()) {
+					if (reexport && requireCall) {
 						const dep = new CommonJsExportRequireDependency(
 							/** @type {Range} */ (expr.range),
 							/** @type {Range} */ (reexport.expr.range),
 							`Object.defineProperty(${exportsArg.identifier})`,
 							[property],
-							/** @type {string} */ (requireCall.argument.string),
+							requireCall.request,
 							requireCall.ids,
 							false
 						);
 						dep.getter = reexport.getter;
+						dep.descriptorStart = /** @type {Range} */ (descArg.range)[0];
+						if (requireCall.binding) {
+							dep.bindingRange = requireCall.binding.range;
+							dep.bindingDependency = requireCall.binding.dep;
+						}
 						dep.asiSafe = !parser.isAsiPosition(
 							/** @type {Range} */ (expr.range)[0]
 						);
@@ -724,7 +799,7 @@ class CommonJsExportsParserPlugin {
 		 * @returns {boolean | void} true, when the expression was handled
 		 */
 		const handleAccessExport = (expr, base, members, call) => {
-			if (HarmonyExports.isEnabled(parser.state)) return;
+			if (ESMExports.isEnabled(parser.state)) return;
 			if (members.length === 0) {
 				bailout(
 					`${base} is used directly at ${formatLocation(
@@ -793,27 +868,29 @@ class CommonJsExportsParserPlugin {
 			.tap(PLUGIN_NAME, (expr) =>
 				handleAccessExport(expr, "module.exports", [])
 			);
-		parser.hooks.callMemberChain
-			.for("this")
-			.tap(PLUGIN_NAME, (expr, members) => {
-				if (!parser.scope.topLevelScope) return;
-				return handleAccessExport(expr.callee, "this", members, expr);
-			});
-		parser.hooks.expressionMemberChain
-			.for("this")
-			.tap(PLUGIN_NAME, (expr, members) => {
+		if (thisAsExports) {
+			parser.hooks.callMemberChain
+				.for("this")
+				.tap(PLUGIN_NAME, (expr, members) => {
+					if (!parser.scope.topLevelScope) return;
+					return handleAccessExport(expr.callee, "this", members, expr);
+				});
+			parser.hooks.expressionMemberChain
+				.for("this")
+				.tap(PLUGIN_NAME, (expr, members) => {
+					if (!parser.scope.topLevelScope) return;
+					return handleAccessExport(expr, "this", members);
+				});
+			parser.hooks.expression.for("this").tap(PLUGIN_NAME, (expr) => {
 				if (!parser.scope.topLevelScope) return;
-				return handleAccessExport(expr, "this", members);
+				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(PLUGIN_NAME, (expr) => {
-			const isHarmony = HarmonyExports.isEnabled(parser.state);
-			// Silent under ESM, where `HarmonyExports` governs and nothing was lost.
+			const isHarmony = ESMExports.isEnabled(parser.state);
+			// Silent under ESM, where `ESMExports` governs and nothing was lost.
 			bailout(
 				isHarmony
 					? undefined
@@ -823,7 +900,7 @@ class CommonJsExportsParserPlugin {
 			);
 			const dep = new ModuleDecoratorDependency(
 				isHarmony
-					? RuntimeGlobals.harmonyModuleDecorator
+					? RuntimeGlobals.esmModuleDecorator
 					: RuntimeGlobals.nodeModuleDecorator,
 				!isHarmony
 			);

package/lib/dependencies/{CommonJsFullRequireDependency.js → commonjs/CommonJsFullRequireDependency.js}

@@ -5,39 +5,40 @@
 
 "use strict";
 
-const Template = require("../Template");
 const {
 	getDependencyUsedByExportsCondition
-} = require("../optimize/InnerGraph");
-const { equals } = require("../util/ArrayHelpers");
-const { getTrimmedIdsAndRange } = require("../util/chainedImports");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess } = require("../util/property");
+} = require("../../optimize/InnerGraph");
+const Template = require("../../template/Template");
+const { equals } = require("../../util/ArrayHelpers");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyAccess } = require("../../util/property");
+const ModuleDependency = require("../core/ModuleDependency");
+const ESMImportGuard = require("../esm/ESMImportGuard");
+const { getTrimmedIdsAndRange } = require("../helpers/chainedImports");
 const {
 	ESM_MODULE_EXPORTS_NAME,
 	getRequireEsmModuleExportsAccess,
 	isRequireEsmModuleExportsModule
 } = require("./CommonJsDependencyHelpers");
-const HarmonyImportGuard = require("./HarmonyImportGuard");
-const ModuleDependency = require("./ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
 /**
  * @import Dependency, {
  * 	GetConditionFn,
  * 	ReferencedExports,
- * 	ExportInfoName
- * } from "../Dependency"
+ * 	ExportInfoName,
+ * 	DependencyKinds
+ * } from "../../graph/Dependency"
  */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { UsedByExports } from "../optimize/InnerGraph" */
-/** @import { RuntimeSpec } from "../util/runtime" */
-/** @import { IdRanges } from "../util/chainedImports" */
-/** @import { DependencyGuard } from "./HarmonyImportGuard" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExportInfoName[], IdRanges | undefined, boolean, undefined | boolean, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ExportInfoName[], IdRanges | undefined, boolean, undefined | boolean, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectSerializerContext */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { UsedByExports } from "../../optimize/InnerGraph" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import { IdRanges } from "../helpers/chainedImports" */
+/** @import { DependencyGuard } from "../esm/ESMImportGuard" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExportInfoName[], IdRanges | undefined, boolean, undefined | boolean, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[ExportInfoName[], IdRanges | undefined, boolean, undefined | boolean, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectSerializerContext */
 
 class CommonJsFullRequireDependency extends ModuleDependency {
 	/**
@@ -51,7 +52,7 @@ class CommonJsFullRequireDependency extends ModuleDependency {
 		request,
 		range,
 		names,
-		idRanges /* TODO webpack 6 make this non-optional. It must always be set to properly trim ids. */
+		idRanges /* TODO in the next major release: make this non-optional. It must always be set to properly trim ids. */
 	) {
 		super(request);
 		this.range = range;
@@ -95,7 +96,7 @@ class CommonJsFullRequireDependency extends ModuleDependency {
 			}
 			return !(
 				guards !== undefined &&
-				HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
+				ESMImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
 			);
 		};
 	}
@@ -303,9 +304,16 @@ CommonJsFullRequireDependency.Template = class CommonJsFullRequireDependencyTemp
 	}
 };
 
-makeSerializable(
-	CommonJsFullRequireDependency,
+makeSerializable(CommonJsFullRequireDependency, [
+	"webpack/lib/dependencies/commonjs/CommonJsFullRequireDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CommonJsFullRequireDependency"
-);
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+CommonJsFullRequireDependency.KINDS = new Set([
+	...ModuleDependency.KINDS,
+	"commonjs-require"
+]);
 
 module.exports = CommonJsFullRequireDependency;

package/lib/dependencies/{CommonJsImportsParserPlugin.js → commonjs/CommonJsImportsParserPlugin.js}

@@ -5,53 +5,53 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-
 const {
 	evaluateToIdentifier,
 	evaluateToString,
 	expressionIsUnsupported,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
-const memoize = require("../util/memoize");
-const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
+} = require("../../javascript/JavascriptParserHelpers");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+
+const memoize = require("../../util/memoize");
+const LocalModuleDependency = require("../amd/LocalModuleDependency");
+const { getLocalModule } = require("../amd/LocalModulesHelpers");
+const ContextDependencyHelpers = require("../context/ContextDependencyHelpers");
+const ConstDependency = require("../core/ConstDependency");
+const ESMImportGuard = require("../esm/ESMImportGuard");
+const traverseDestructuringAssignmentProperties = require("../helpers/traverseDestructuringAssignmentProperties");
 const CommonJsFullRequireDependency = require("./CommonJsFullRequireDependency");
 const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
 const CommonJsRequireDependency = require("./CommonJsRequireDependency");
-const ConstDependency = require("./ConstDependency");
-const ContextDependencyHelpers = require("./ContextDependencyHelpers");
-const HarmonyImportGuard = require("./HarmonyImportGuard");
-const LocalModuleDependency = require("./LocalModuleDependency");
-const { getLocalModule } = require("./LocalModulesHelpers");
 const RequireHeaderDependency = require("./RequireHeaderDependency");
 const RequireResolveContextDependency = require("./RequireResolveContextDependency");
 const RequireResolveDependency = require("./RequireResolveDependency");
 const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency");
 
 const getUnsupportedFeatureWarning = memoize(() =>
-	require("../errors/UnsupportedFeatureWarning")
+	require("../../errors/UnsupportedFeatureWarning")
 );
 
 const getCommentCompilationWarning = memoize(() =>
-	require("../errors/CommentCompilationWarning")
+	require("../../errors/CommentCompilationWarning")
 );
 
 /** @import { CallExpression, Expression, NewExpression } from "estree" */
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import { RawReferencedExports } from "../Dependency" */
+/** @import { RawReferencedExports } from "../../graph/Dependency" */
 /**
  * @import JavascriptParser, {
  * 	Range,
  * 	Members,
  * 	CalleeMembers
- * } from "../javascript/JavascriptParser"
+ * } from "../../javascript/JavascriptParser"
  */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
-/** @import LocalModule from "./LocalModule" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
+/** @import LocalModule from "../amd/LocalModule" */
 
 /**
  * Defines the common js import settings type used by this module.
@@ -65,6 +65,7 @@ const getCommentCompilationWarning = memoize(() =>
  * member-access references on `NAME` to the `CommonJsRequireDependency`
  * created for the `require()` call.
  * @typedef {object} RequireBindingData
+ * @property {string} request request passed to `require()`
  * @property {RawReferencedExports | null} referencedExports mutable list, pushed to as `NAME.x.y` accesses are walked; null means the whole namespace is used. Separate from `dep` so a deferred require (walked after accesses on `NAME`) still collects them; becomes the dep's shared list on creation.
  * @property {InstanceType<typeof import("./CommonJsRequireDependency")> | null} dep dependency for the `require()` call, null until the `require()` is walked; kept so a later whole-namespace use can null its list directly
  */
@@ -216,7 +217,7 @@ const createRequireCallHandler = (
 			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.current.addDependency(dep);
-			HarmonyImportGuard.attachDependencyGuards(parser, dep);
+			ESMImportGuard.attachDependencyGuards(parser, dep);
 			return dep;
 		}
 	};
@@ -433,6 +434,18 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 
 		if (expr.arguments.length !== 1) return;
 		const param = parser.evaluateExpression(expr.arguments[0]);
+		const range = /** @type {Range} */ (expr.range);
+		const argumentRange = /** @type {Range} */ (expr.arguments[0].range);
+		const header = new RequireResolveHeaderDependency([
+			range[0],
+			argumentRange[0]
+		]);
+		header.loc = parser.getLocation(expr);
+		parser.state.module.addPresentationalDependency(header);
+		// A parenthesized expression cannot retain the call's trailing comma.
+		const closing = new ConstDependency(")", [argumentRange[1], range[1]]);
+		closing.loc = parser.getLocation(expr);
+		parser.state.module.addPresentationalDependency(closing);
 		if (param.isConditional()) {
 			for (const option of /** @type {BasicEvaluatedExpression[]} */ (
 				param.options
@@ -442,22 +455,12 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 					processResolveContext(expr, option, weak);
 				}
 			}
-			const dep = new RequireResolveHeaderDependency(
-				/** @type {Range} */ (expr.callee.range)
-			);
-			dep.loc = parser.getLocation(expr);
-			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
 		const result = processResolveItem(expr, param, weak);
 		if (result === undefined) {
 			processResolveContext(expr, param, weak);
 		}
-		const dep = new RequireResolveHeaderDependency(
-			/** @type {Range} */ (expr.callee.range)
-		);
-		dep.loc = parser.getLocation(expr);
-		parser.state.module.addPresentationalDependency(dep);
 		return true;
 	};
 };
@@ -675,7 +678,7 @@ class CommonJsImportsParserPlugin {
 				dep._canConcatenate = true;
 				dep.loc = parser.getLocation(expr);
 				parser.state.current.addDependency(dep);
-				HarmonyImportGuard.attachDependencyGuards(parser, dep);
+				ESMImportGuard.attachDependencyGuards(parser, dep);
 				return true;
 			}
 		};
@@ -718,7 +721,7 @@ class CommonJsImportsParserPlugin {
 				dep._canConcatenate = true;
 				dep.loc = parser.getLocation(expr.callee);
 				parser.state.current.addDependency(dep);
-				HarmonyImportGuard.attachDependencyGuards(parser, dep);
+				ESMImportGuard.attachDependencyGuards(parser, dep);
 				parser.walkExpressions(expr.arguments);
 				return true;
 			}
@@ -764,6 +767,7 @@ class CommonJsImportsParserPlugin {
 			if (!requireInfo || requireInfo.name !== "require") return;
 			/** @type {RequireBindingData} */
 			const binding = {
+				request: arg.value,
 				referencedExports: [],
 				dep: null
 			};
@@ -883,5 +887,6 @@ CommonJsImportsParserPlugin.createRequireAsExpressionHandler =
 CommonJsImportsParserPlugin.createRequireCacheDependency =
 	createRequireCacheDependency;
 CommonJsImportsParserPlugin.createRequireHandler = createRequireCallHandler;
+CommonJsImportsParserPlugin.REQUIRE_BINDING_TAG = REQUIRE_BINDING_TAG;
 
 module.exports = CommonJsImportsParserPlugin;