webpack 5.108.3 → 5.109.0

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -145,11 +145,11 @@ class AMDDefineDependencyParserPlugin {
 				} else if ((localModule = getLocalModule(parser.state, request))) {
 					localModule.flagUsed();
 					dep = new LocalModuleDependency(localModule, undefined, false);
-					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+					dep.loc = parser.getLocation(expr);
 					parser.state.module.addPresentationalDependency(dep);
 				} else {
 					dep = this.newRequireItemDependency(request);
-					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+					dep.loc = parser.getLocation(expr);
 					dep.optional = Boolean(parser.scope.inTry);
 					parser.state.current.addDependency(dep);
 				}
@@ -159,7 +159,7 @@ class AMDDefineDependencyParserPlugin {
 				deps,
 				/** @type {Range} */ (param.range)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
@@ -227,7 +227,7 @@ class AMDDefineDependencyParserPlugin {
 				parser.state.current.addDependency(dep);
 				return true;
 			}
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
@@ -253,7 +253,7 @@ class AMDDefineDependencyParserPlugin {
 			parser
 		);
 		if (!dep) return;
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
@@ -465,7 +465,7 @@ class AMDDefineDependencyParserPlugin {
 			obj ? /** @type {Range} */ (obj.range) : null,
 			namedModule || null
 		);
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		if (namedModule) {
 			dep.localModule = addLocalModule(parser.state, namedModule);
 		}

package/lib/dependencies/AMDPlugin.js

@@ -197,7 +197,7 @@ class AMDPlugin {
 							/** @type {Range} */ (expr.range),
 							[RuntimeGlobals.amdDefine]
 						);
-						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+						dep.loc = parser.getLocation(expr);
 						parser.state.module.addPresentationalDependency(dep);
 						return true;
 					});
@@ -217,7 +217,7 @@ class AMDPlugin {
 							/** @type {Range} */ (expr.range),
 							[RuntimeGlobals.amdDefine]
 						);
-						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+						dep.loc = parser.getLocation(expr);
 						parser.state.module.addPresentationalDependency(dep);
 						return false;
 					});

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -122,11 +122,11 @@ class AMDRequireDependenciesBlockParserPlugin {
 				} else if ((localModule = getLocalModule(parser.state, request))) {
 					localModule.flagUsed();
 					dep = new LocalModuleDependency(localModule, undefined, false);
-					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+					dep.loc = parser.getLocation(expr);
 					parser.state.module.addPresentationalDependency(dep);
 				} else {
 					dep = this.newRequireItemDependency(request);
-					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+					dep.loc = parser.getLocation(expr);
 					dep.optional = Boolean(parser.scope.inTry);
 					parser.state.current.addDependency(dep);
 				}
@@ -137,7 +137,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 				/** @type {Range} */
 				(param.range)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
@@ -203,12 +203,12 @@ class AMDRequireDependenciesBlockParserPlugin {
 					(param.string),
 					param.range
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.current.addDependency(dep);
 				return true;
 			}
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
@@ -235,7 +235,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 			parser
 		);
 		if (!dep) return;
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
@@ -296,7 +296,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 				/** @type {Expression} */ (expr.arguments[0])
 			);
 			depBlock = this.newRequireDependenciesBlock(
-				/** @type {DependencyLocation} */ (expr.loc),
+				parser.getLocation(expr),
 				this.processArrayForRequestString(param)
 			);
 			dep = this.newRequireDependency(
@@ -309,7 +309,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 					? /** @type {Range} */ (expr.arguments[2].range)
 					: null
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			depBlock.addDependency(dep);
 
 			parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
@@ -351,13 +351,13 @@ class AMDRequireDependenciesBlockParserPlugin {
 					);
 					old.addPresentationalDependency(dep);
 					if (parser.state.module) {
+						const loc = /** @type {SourceLocation} */ (
+							parser.getLocation(expr)
+						);
 						parser.state.module.addError(
 							new UnsupportedFeatureWarning(
-								`Cannot statically analyse 'require(…, …)' in line ${
-									/** @type {SourceLocation} */ (expr.loc).start.line
-								}`,
-								/** @type {DependencyLocation} */
-								(expr.loc)
+								`Cannot statically analyse 'require(…, …)' in line ${loc.start.line}`,
+								loc
 							)
 						);
 					}

package/lib/dependencies/CommonJsDependencyHelpers.js

@@ -5,9 +5,13 @@
 
 "use strict";
 
+const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
 const { propertyAccess } = require("../util/property");
 
+/** @typedef {import("../ConcatenationScope")} ConcatenationScope */
+/** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
@@ -70,6 +74,41 @@ const getRequireEsmModuleExportsAccess = (
 };
 
 module.exports.ESM_MODULE_EXPORTS_NAME = ESM_MODULE_EXPORTS_NAME;
+
+/**
+ * Rewrites an `exports.<names>` reference of a concatenated CommonJS module to
+ * a hoisted module-scope variable and registers that variable as the export's
+ * symbol, so other concatenated modules bind to it directly.
+ * @param {ConcatenationScope} concatenationScope the concatenation scope
+ * @param {InitFragment<GenerateContext>[]} initFragments init fragments (receives the `var` declaration)
+ * @param {string[]} names full member chain of the reference (at least one entry)
+ * @returns {string} replacement expression for the whole reference
+ */
+module.exports.getConcatenatedExportAccess = (
+	concatenationScope,
+	initFragments,
+	names
+) => {
+	const name = names[0];
+	const identifier = Template.toIdentifier(name);
+	// A sanitized name could collide with another export ("a-b" vs "a_b"),
+	// so non-identifier names get a hex suffix of the raw name.
+	const symbol = `__WEBPACK_CJS_EXPORT_${
+		identifier === name
+			? name
+			: `${identifier}_${Buffer.from(name, "utf8").toString("hex")}`
+	}__`;
+	initFragments.push(
+		new InitFragment(
+			`var ${symbol};\n`,
+			InitFragment.STAGE_CONSTANTS,
+			0,
+			`cjs concatenated export ${name}`
+		)
+	);
+	concatenationScope.registerExport(name, symbol);
+	return `${symbol}${propertyAccess(names, 1)}`;
+};
 module.exports.getRequireEsmModuleExportsAccess =
 	getRequireEsmModuleExportsAccess;
 

package/lib/dependencies/CommonJsExportsDependency.js

@@ -8,7 +8,10 @@
 const InitFragment = require("../InitFragment");
 const makeSerializable = require("../util/makeSerializable");
 const { propertyAccess } = require("../util/property");
-const { handleDependencyBase } = require("./CommonJsDependencyHelpers");
+const {
+	getConcatenatedExportAccess,
+	handleDependencyBase
+} = require("./CommonJsDependencyHelpers");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -114,7 +117,14 @@ CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate ext
 	apply(
 		dependency,
 		source,
-		{ module, moduleGraph, initFragments, runtimeRequirements, runtime }
+		{
+			module,
+			moduleGraph,
+			initFragments,
+			runtimeRequirements,
+			runtime,
+			concatenationScope
+		}
 	) {
 		const dep = /** @type {CommonJsExportsDependency} */ (dependency);
 		// CJS exports are never inlined
@@ -122,6 +132,41 @@ CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate ext
 			moduleGraph.getExportsInfo(module).getUsedName(dep.names, runtime)
 		);
 
+		if (concatenationScope) {
+			// eligibility is enforced by JavascriptGenerator.getConcatenationBailoutReason
+			if (dep.base !== "exports" && dep.base !== "module.exports") {
+				throw new Error(
+					`Unsupported base ${dep.base} in concatenated CommonJS module`
+				);
+			}
+			if (!used) {
+				initFragments.push(
+					new InitFragment(
+						"var __webpack_unused_export__;\n",
+						InitFragment.STAGE_CONSTANTS,
+						0,
+						"__webpack_unused_export__"
+					)
+				);
+				source.replace(
+					dep.range[0],
+					dep.range[1] - 1,
+					"__webpack_unused_export__"
+				);
+				return;
+			}
+			source.replace(
+				dep.range[0],
+				dep.range[1] - 1,
+				getConcatenatedExportAccess(
+					concatenationScope,
+					initFragments,
+					dep.names
+				)
+			);
+			return;
+		}
+
 		const [type, base] = handleDependencyBase(
 			dep.base,
 			module,

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -353,7 +353,7 @@ class CommonJsExportsParserPlugin {
 			keptAllExportsForState = parser.state;
 			bailoutHint(
 				`this in exported function may access any export, so all exports are kept, at ${formatLocation(
-					/** @type {DependencyLocation} */ (thisExpr.loc)
+					parser.getLocation(thisExpr)
 				)}`
 			);
 			const dep = new CommonJsSelfReferenceDependency(
@@ -362,7 +362,7 @@ class CommonJsExportsParserPlugin {
 				[],
 				false
 			);
-			dep.loc = /** @type {DependencyLocation} */ (thisExpr.loc);
+			dep.loc = parser.getLocation(thisExpr);
 			parser.state.module.addDependency(dep);
 		};
 
@@ -404,7 +404,7 @@ class CommonJsExportsParserPlugin {
 					requireCall.ids,
 					!parser.isStatementLevelExpression(expr)
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.module.addDependency(dep);
 				/** @type {JavascriptModuleBuildMeta} */ (
@@ -429,7 +429,7 @@ class CommonJsExportsParserPlugin {
 				base,
 				remainingMembers
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addDependency(dep);
 			/** @type {JavascriptModuleBuildMeta} */ (
 				parser.state.module.buildMeta
@@ -495,7 +495,7 @@ class CommonJsExportsParserPlugin {
 							false
 						);
 						dep.getter = reexport.getter;
-						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+						dep.loc = parser.getLocation(expr);
 						dep.optional = Boolean(parser.scope.inTry);
 						parser.state.module.addDependency(dep);
 						/** @type {JavascriptModuleBuildMeta} */ (
@@ -517,7 +517,7 @@ class CommonJsExportsParserPlugin {
 					`Object.defineProperty(${exportsArg.identifier})`,
 					[property]
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addDependency(dep);
 				/** @type {JavascriptModuleBuildMeta} */ (
 					parser.state.module.buildMeta
@@ -554,7 +554,7 @@ class CommonJsExportsParserPlugin {
 			if (members.length === 0) {
 				bailout(
 					`${base} is used directly at ${formatLocation(
-						/** @type {DependencyLocation} */ (expr.loc)
+						parser.getLocation(expr)
 					)}`
 				);
 			}
@@ -563,7 +563,7 @@ class CommonJsExportsParserPlugin {
 					`${base}${propertyAccess(
 						members
 					)}(...) prevents optimization as ${base} is passed as call context at ${formatLocation(
-						/** @type {DependencyLocation} */ (expr.loc)
+						parser.getLocation(expr)
 					)}`
 				);
 			}
@@ -573,7 +573,7 @@ class CommonJsExportsParserPlugin {
 				members,
 				Boolean(call)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addDependency(dep);
 			/** @type {JavascriptModuleBuildMeta} */ (
 				parser.state.module.buildMeta
@@ -646,7 +646,7 @@ class CommonJsExportsParserPlugin {
 					: RuntimeGlobals.nodeModuleDecorator,
 				!isHarmony
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addDependency(dep);
 			return true;
 		});

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -146,7 +146,7 @@ const createRequireAsExpressionHandler =
 		dep.critical =
 			options.unknownContextCritical &&
 			"require function is used in a way in which dependencies cannot be statically extracted";
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
@@ -194,7 +194,7 @@ const createRequireCallHandler = (
 				/** @type {Range} */ (expr.range)
 			);
 			if (binding) binding.dep = dep;
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.current.addDependency(dep);
 			getHarmonyImportGuard().attachDependencyGuards(parser, dep);
@@ -227,7 +227,7 @@ const createRequireCallHandler = (
 			getContext()
 		);
 		if (!dep) return;
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
@@ -244,7 +244,7 @@ const createRequireCallHandler = (
 					parser.state.module.addWarning(
 						new CommentCompilationWarning(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-							/** @type {DependencyLocation} */ (comment.loc)
+							parser.getLocation(comment)
 						)
 					);
 				}
@@ -254,7 +254,7 @@ const createRequireCallHandler = (
 					parser.state.module.addWarning(
 						new UnsupportedFeatureWarning(
 							`\`webpackIgnore\` expected a boolean, but received: ${requireOptions.webpackIgnore}.`,
-							/** @type {DependencyLocation} */ (expr.loc)
+							parser.getLocation(expr)
 						)
 					);
 				} else if (requireOptions.webpackIgnore) {
@@ -282,7 +282,7 @@ const createRequireCallHandler = (
 				const dep = new RequireHeaderDependency(
 					/** @type {Range} */ (expr.callee.range)
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addPresentationalDependency(dep);
 				return true;
 			}
@@ -300,7 +300,7 @@ const createRequireCallHandler = (
 				/** @type {Range} */ (expr.range),
 				callNew
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 		} else {
 			const result = processRequireItem(expr, param);
@@ -310,7 +310,7 @@ const createRequireCallHandler = (
 				const dep = new RequireHeaderDependency(
 					/** @type {Range} */ (expr.callee.range)
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addPresentationalDependency(dep);
 			}
 		}
@@ -340,7 +340,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 				/** @type {Range} */ (param.range),
 				getContext()
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			dep.weak = weak;
 			parser.state.current.addDependency(dep);
@@ -369,7 +369,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 			getContext()
 		);
 		if (!dep) return;
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		dep.optional = Boolean(parser.scope.inTry);
 		parser.state.current.addDependency(dep);
 		return true;
@@ -386,7 +386,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 					parser.state.module.addWarning(
 						new CommentCompilationWarning(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-							/** @type {DependencyLocation} */ (comment.loc)
+							parser.getLocation(comment)
 						)
 					);
 				}
@@ -396,7 +396,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 					parser.state.module.addWarning(
 						new UnsupportedFeatureWarning(
 							`\`webpackIgnore\` expected a boolean, but received: ${requireOptions.webpackIgnore}.`,
-							/** @type {DependencyLocation} */ (expr.loc)
+							parser.getLocation(expr)
 						)
 					);
 				} else if (requireOptions.webpackIgnore) {
@@ -420,7 +420,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 			const dep = new RequireResolveHeaderDependency(
 				/** @type {Range} */ (expr.callee.range)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
@@ -431,7 +431,7 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 		const dep = new RequireResolveHeaderDependency(
 			/** @type {Range} */ (expr.callee.range)
 		);
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		parser.state.module.addPresentationalDependency(dep);
 		return true;
 	};
@@ -502,7 +502,7 @@ class CommonJsImportsParserPlugin {
 		parser.hooks.assign.for("require").tap(PLUGIN_NAME, (expr) => {
 			// to not leak to global "require", we need to define a local require here.
 			const dep = new ConstDependency("var require;", 0);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		});
@@ -549,7 +549,7 @@ class CommonJsImportsParserPlugin {
 				"undefined",
 				/** @type {Range} */ (expr.range)
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			parser.state.module.addPresentationalDependency(dep);
 			return false;
 		};
@@ -640,7 +640,7 @@ class CommonJsImportsParserPlugin {
 					/** @type {Range} */ (expr.range)[0]
 				);
 				dep.optional = Boolean(parser.scope.inTry);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.current.addDependency(dep);
 				return true;
 			}
@@ -678,7 +678,7 @@ class CommonJsImportsParserPlugin {
 					/** @type {Range} */ (expr.range)[0]
 				);
 				dep.optional = Boolean(parser.scope.inTry);
-				dep.loc = /** @type {DependencyLocation} */ (expr.callee.loc);
+				dep.loc = parser.getLocation(expr.callee);
 				parser.state.current.addDependency(dep);
 				parser.walkExpressions(expr.arguments);
 				return true;

package/lib/dependencies/CommonJsPlugin.js

@@ -220,7 +220,7 @@ class CommonJsPlugin {
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleLoaded
 							]);
-							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							dep.loc = parser.getLocation(expr);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
@@ -234,7 +234,7 @@ class CommonJsPlugin {
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleId
 							]);
-							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							dep.loc = parser.getLocation(expr);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});

package/lib/dependencies/CommonJsRequireDependency.js

@@ -30,6 +30,28 @@ const ModuleDependency = require("./ModuleDependency");
 
 const getHarmonyImportGuard = memoize(() => require("./HarmonyImportGuard"));
 
+/**
+ * Trims a member-access path at the first segment that is definitively not a
+ * provided export of the module. Such a segment is a runtime property (e.g. an
+ * array/object prototype method like `arr.includes`), so only the value up to
+ * that point is observed; referencing the whole value keeps its data intact
+ * instead of tree-shaking it away. Real named exports (`utils.foo`) are kept.
+ * @param {import("../ExportsInfo")} exportsInfo module exports info
+ * @param {string[]} name member-access path
+ * @returns {string[]} the provided prefix of the path
+ */
+const trimToProvidedPrefix = (exportsInfo, name) => {
+	let current = exportsInfo;
+	for (let i = 0; i < name.length; i++) {
+		const exportInfo = current.getReadOnlyExportInfo(name[i]);
+		if (exportInfo.provided === false) return name.slice(0, i);
+		const nested = exportInfo.exportsInfo;
+		if (!nested) return name;
+		current = nested;
+	}
+	return name;
+};
+
 class CommonJsRequireDependency extends ModuleDependency {
 	/**
 	 * Creates an instance of CommonJsRequireDependency.
@@ -94,8 +116,11 @@ class CommonJsRequireDependency extends ModuleDependency {
 			return [{ name: [ESM_MODULE_EXPORTS_NAME], canInline: false }];
 		}
 		if (!this.referencedExports) return Dependency.EXPORTS_OBJECT_REFERENCED;
+		const exportsInfo = importedModule
+			? moduleGraph.getExportsInfo(importedModule)
+			: undefined;
 		return this.referencedExports.map((name) => ({
-			name,
+			name: exportsInfo ? trimToProvidedPrefix(exportsInfo, name) : name,
 			canMangle: false,
 			canInline: false
 		}));

package/lib/dependencies/CommonJsSelfReferenceDependency.js

@@ -9,6 +9,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const { equals } = require("../util/ArrayHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const { propertyAccess } = require("../util/property");
+const { getConcatenatedExportAccess } = require("./CommonJsDependencyHelpers");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -115,7 +116,14 @@ CommonJsSelfReferenceDependency.Template = class CommonJsSelfReferenceDependency
 	apply(
 		dependency,
 		source,
-		{ module, moduleGraph, runtime, runtimeRequirements }
+		{
+			module,
+			moduleGraph,
+			runtime,
+			runtimeRequirements,
+			initFragments,
+			concatenationScope
+		}
 	) {
 		const dep = /** @type {CommonJsSelfReferenceDependency} */ (dependency);
 		// CJS exports are never inlined
@@ -131,6 +139,29 @@ CommonJsSelfReferenceDependency.Template = class CommonJsSelfReferenceDependency
 			);
 		}
 
+		if (concatenationScope) {
+			// eligibility (non-empty names, exports/module.exports base) is enforced
+			// by JavascriptGenerator.getConcatenationBailoutReason
+			if (
+				dep.names.length === 0 ||
+				(dep.base !== "exports" && dep.base !== "module.exports")
+			) {
+				throw new Error(
+					`Unsupported self-reference ${dep.base} in concatenated CommonJS module`
+				);
+			}
+			source.replace(
+				dep.range[0],
+				dep.range[1] - 1,
+				getConcatenatedExportAccess(
+					concatenationScope,
+					initFragments,
+					dep.names
+				)
+			);
+			return;
+		}
+
 		/** @type {string} */
 		let base;
 		switch (dep.base) {

package/lib/dependencies/ContextDependencyHelpers.js

@@ -126,7 +126,7 @@ module.exports.create = (
 			valueRange,
 			...depArgs
 		);
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 
 		/** @type {Replaces} */
 		const replaces = [];
@@ -224,7 +224,7 @@ module.exports.create = (
 			valueRange,
 			...depArgs
 		);
-		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		dep.loc = parser.getLocation(expr);
 		/** @type {Replaces} */
 		const replaces = [];
 		if (prefixRange) {
@@ -269,7 +269,7 @@ module.exports.create = (
 		/** @type {Range} */ (param.range),
 		...depArgs
 	);
-	dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+	dep.loc = parser.getLocation(expr);
 	dep.critical =
 		options.exprContextCritical &&
 		"the request of a dependency is an expression";