webpack 5.111.1 → 5.112.1

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

@@ -5,20 +5,20 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const { UsageState } = require("../ExportsInfo");
-const Template = require("../Template");
-const { equals } = require("../util/ArrayHelpers");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess } = require("../util/property");
+const Dependency = require("../../graph/Dependency");
+const { UsageState } = require("../../graph/ExportsInfo");
+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 processExportInfo = require("../helpers/processExportInfo");
 const {
 	ESM_MODULE_EXPORTS_NAME,
 	getRequireEsmModuleExportsAccess,
 	handleDependencyBase,
 	isRequireEsmModuleExportsModule
 } = require("./CommonJsDependencyHelpers");
-const ModuleDependency = require("./ModuleDependency");
-const processExportInfo = require("./processExportInfo");
 
 /** @import { ReplaceSource } from "webpack-sources" */
 /**
@@ -28,23 +28,24 @@ const processExportInfo = require("./processExportInfo");
  * 	RawReferencedExports,
  * 	ReferencedExports,
  * 	TRANSITIVE,
- * 	ExportInfoName
- * } from "../Dependency"
+ * 	ExportInfoName,
+ * 	DependencyKinds
+ * } from "../../graph/Dependency"
  */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ExportsInfo, { ExportInfo } from "../ExportsInfo" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import ModuleGraphConnection from "../ModuleGraphConnection" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ExportsInfo, { ExportInfo } from "../../graph/ExportsInfo" */
+/** @import Module from "../../module/Module" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
 /**
  * @import {
  * 	CommonJSDependencyBaseKeywords
  * } from "./CommonJsDependencyHelpers"
  */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[undefined | boolean, Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[], ExportInfoName[], boolean, boolean]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[undefined | boolean, Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[], ExportInfoName[], boolean, boolean]>} ObjectSerializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[undefined | boolean, Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[], ExportInfoName[], boolean, boolean, number | null, Range | null, CommonJsRequireDependency | null]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[undefined | boolean, Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[], ExportInfoName[], boolean, boolean, number | null, Range | null, CommonJsRequireDependency | null]>} ObjectSerializerContext */
 
 const idsSymbol = /** @type {symbol} */ (
 	Symbol("CommonJsExportRequireDependency.ids")
@@ -84,6 +85,14 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		// (as produced by `Object.defineProperty`) rather than an eager value.
 		/** @type {boolean} */
 		this.getter = false;
+		// start of the `Object.defineProperty` descriptor, kept verbatim but for its value
+		/** @type {number | null} */
+		this.descriptorStart = null;
+		// the `const` binding of the same `require()` the value reads, and its dependency
+		/** @type {Range | null} */
+		this.bindingRange = null;
+		/** @type {CommonJsRequireDependency | null} */
+		this.bindingDependency = null;
 	}
 
 	get type() {
@@ -235,18 +244,36 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			const ids = this.getIds(moduleGraph);
 			const name = this.names[0];
 			const from = moduleGraph.getConnection(this);
-			if (!from) return;
+			// a missing target may come back without this module changing, so
+			// what it exports now must not be cached
+			if (!from) return { exports: [], dependencies: [] };
 			const exportChain = esmUnwrap
 				? [ESM_MODULE_EXPORTS_NAME, ...ids]
 				: ids.length === 0
 					? null
 					: ids;
+
+			// `require()` of a namespace module returns an object carrying `__esModule`
+			let namespaceMarker = false;
+			if (
+				!esmUnwrap &&
+				ids.length === 0 &&
+				importedModule &&
+				importedModule.getExportsType(moduleGraph, false) === "namespace"
+			) {
+				const importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
+				namespaceMarker = !(
+					importedExportsInfo.otherExportsInfo.provided === false &&
+					importedExportsInfo.ownedExports[Symbol.iterator]().next().done
+				);
+			}
 			return {
 				exports: [
 					{
 						name,
 						from,
 						export: exportChain,
+						exports: namespaceMarker ? ["__esModule"] : undefined,
 						// we can't mangle names that are in an empty object
 						// because one could access the prototype property
 						// when export isn't set yet
@@ -271,7 +298,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			};
 		}
 		const from = moduleGraph.getConnection(this);
-		if (!from) return;
+		if (!from) return { exports: [], dependencies: [] };
 		if (esmUnwrap) {
 			// In `module.exports = require("./esm")` of a module carrying a
 			// `"module.exports"` export, this module's own exports become the
@@ -430,7 +457,10 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			.write(this.names)
 			.write(this.ids)
 			.write(this.resultUsed)
-			.write(this.getter);
+			.write(this.getter)
+			.write(this.descriptorStart)
+			.write(this.bindingRange)
+			.write(this.bindingDependency);
 		super.serialize(context);
 	}
 
@@ -454,14 +484,67 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		this.resultUsed = c6.read();
 		const c7 = c6.rest;
 		this.getter = c7.read();
-		super.deserialize(c7.rest);
+		const c8 = c7.rest;
+		this.descriptorStart = c8.read();
+		const c9 = c8.rest;
+		this.bindingRange = c9.read();
+		const c10 = c9.rest;
+		this.bindingDependency = c10.read();
+		super.deserialize(c10.rest);
 	}
 }
 
-makeSerializable(
-	CommonJsExportRequireDependency,
+makeSerializable(CommonJsExportRequireDependency, [
+	"webpack/lib/dependencies/commonjs/CommonJsExportRequireDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CommonJsExportRequireDependency"
-);
+]);
+
+/**
+ * Reads the re-exported value off the `const` binding already holding the same exports.
+ * Only when that binding renders the module, which it doesn't when its own require is inactive.
+ * @param {CommonJsExportRequireDependency} dep the dependency
+ * @param {Module | null} importedModule the re-exported module
+ * @param {ModuleGraph} moduleGraph the module graph
+ * @param {RuntimeSpec} runtime the runtime
+ * @param {boolean} used whether the re-export is used, so its value must be read
+ * @returns {string | undefined} the access to append to the binding, undefined when it can't be read
+ */
+const getBindingAccess = (dep, importedModule, moduleGraph, runtime, used) => {
+	if (!dep.bindingRange || !dep.bindingDependency || !importedModule) return;
+	const connection = moduleGraph.getConnection(dep.bindingDependency);
+	if (
+		!connection ||
+		connection.module !== importedModule ||
+		!connection.isTargetActive(runtime)
+	) {
+		return;
+	}
+	const ids = dep.getIds(moduleGraph);
+	if (ids.length === 0) return "";
+	// the binding holds the unwrapped value, whose properties aren't tracked
+	if (isRequireEsmModuleExportsModule(importedModule, moduleGraph)) return;
+	const usedImported = /** @type {string | string[] | false} */ (
+		moduleGraph.getExportsInfo(importedModule).getUsedName(ids, runtime)
+	);
+	if (usedImported) {
+		return propertyAccess(/** @type {string[]} */ (usedImported));
+	}
+	// an unused re-export of an unused member keeps only the load the binding did
+	if (!used) return "";
+};
+
+/**
+ * Replaces what follows the binding up to `end` (its member chain, a closing `})`).
+ * Nothing follows a bare binding, whose access is then empty too.
+ * @param {ReplaceSource} source the source
+ * @param {Range} bindingRange range of the binding identifier
+ * @param {number} end end of the replaced code
+ * @param {string} content replacement
+ */
+const replaceAfterBinding = (source, bindingRange, end, content) => {
+	if (end > bindingRange[1]) source.replace(bindingRange[1], end - 1, content);
+};
 
 CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependencyTemplate extends (
 	ModuleDependency.Template
@@ -492,9 +575,7 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 			moduleGraph.getExportsInfo(module).getUsedName(dep.names, runtime)
 		);
 
-		const connection = /** @type {ModuleGraphConnection | undefined} */ (
-			moduleGraph.getConnection(dep)
-		);
+		const connection = moduleGraph.getConnection(dep);
 		// Inactive unused reexport: no module id; drop to a no-op.
 		// Missing connection (e.g. IgnorePlugin) must keep the require so it throws.
 		if (!used && connection && !connection.isTargetActive(runtime)) {
@@ -509,6 +590,51 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 		);
 
 		const importedModule = moduleGraph.getModule(dep);
+		const bindingAccess = getBindingAccess(
+			dep,
+			importedModule,
+			moduleGraph,
+			runtime,
+			Boolean(used)
+		);
+		if (bindingAccess !== undefined) {
+			const bindingRange = /** @type {Range} */ (dep.bindingRange);
+			if (!used) {
+				source.replace(
+					dep.range[0],
+					bindingRange[0] - 1,
+					"/* unused reexport */ "
+				);
+				replaceAfterBinding(source, bindingRange, dep.range[1], bindingAccess);
+				return;
+			}
+			if (type === "expression") {
+				source.replace(
+					dep.range[0],
+					bindingRange[0] - 1,
+					`${base}${propertyAccess(/** @type {string[]} */ (used))} = `
+				);
+			} else {
+				source.replace(
+					dep.range[0],
+					/** @type {number} */ (dep.descriptorStart) - 1,
+					`Object.defineProperty(${base}${propertyAccess(
+						/** @type {string[]} */ (used).slice(0, -1)
+					)}, ${JSON.stringify(used[used.length - 1])}, `
+				);
+			}
+			let valueEnd = dep.range[1];
+			if (type !== "expression") {
+				const valueRange = /** @type {Range} */ (dep.valueRange);
+				// `(ns).a`: the value opens before the binding; drop that with what follows it
+				if (valueRange[0] < bindingRange[0]) {
+					source.replace(valueRange[0], bindingRange[0] - 1, "");
+				}
+				valueEnd = valueRange[1];
+			}
+			replaceAfterBinding(source, bindingRange, valueEnd, bindingAccess);
+			return;
+		}
 		/** @type {string} */
 		let requireExpr;
 		if (
@@ -589,18 +715,16 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 					);
 					return;
 				}
-				const descriptor = dep.getter
-					? "enumerable: true, get: () => ("
-					: "value: (";
+				// Only the target and the value change, so the descriptor keeps its
+				// attributes and the getter its own function.
 				source.replace(
 					dep.range[0],
-					valueRange[0] - 1,
+					/** @type {number} */ (dep.descriptorStart) - 1,
 					`Object.defineProperty(${base}${propertyAccess(
 						/** @type {string[]} */ (used).slice(0, -1)
-					)}, ${JSON.stringify(used[used.length - 1])}, { ${descriptor}`
+					)}, ${JSON.stringify(used[used.length - 1])}, `
 				);
-				source.replace(valueRange[0], valueRange[1] - 1, requireExpr);
-				source.replace(valueRange[1], dep.range[1] - 1, ") })");
+				source.replace(valueRange[0], valueRange[1] - 1, `(${requireExpr})`);
 				return;
 			}
 			default:
@@ -611,4 +735,10 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 
 CommonJsExportRequireDependency.idsSymbol = idsSymbol;
 
+/** @type {Set<keyof DependencyKinds>} */
+CommonJsExportRequireDependency.KINDS = new Set([
+	...ModuleDependency.KINDS,
+	"commonjs-export-require"
+]);
+
 module.exports = CommonJsExportRequireDependency;

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

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const InitFragment = require("../InitFragment");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess } = require("../util/property");
+const InitFragment = require("../../template/InitFragment");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyAccess } = require("../../util/property");
+const NullDependency = require("../core/NullDependency");
 const {
 	handleDependencyBase,
 	isThisBase,
 	isWorkerEntryThis
 } = require("./CommonJsDependencyHelpers");
-const NullDependency = require("./NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
 /**
@@ -21,19 +21,19 @@ const NullDependency = require("./NullDependency");
  * 	ExportsSpec,
  * 	UpdateHashContext,
  * 	ExportInfoName
- * } from "../Dependency"
+ * } from "../../graph/Dependency"
  */
-/** @import Hash from "../util/Hash" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import Hash from "../../util/Hash" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /**
  * @import {
  * 	CommonJSDependencyBaseKeywords
  * } from "./CommonJsDependencyHelpers"
  */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[]]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[]]>} ObjectSerializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[]]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[]]>} ObjectSerializerContext */
 
 const EMPTY_OBJECT = {};
 
@@ -129,10 +129,11 @@ class CommonJsExportsDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	CommonJsExportsDependency,
+makeSerializable(CommonJsExportsDependency, [
+	"webpack/lib/dependencies/commonjs/CommonJsExportsDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CommonJsExportsDependency"
-);
+]);
 
 CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate extends (
 	NullDependency.Template