webpack 5.111.1 → 5.112.1

package/lib/dependencies/{HarmonyExportExpressionDependency.js → esm/ESMExportExpressionDependency.js}

@@ -5,42 +5,43 @@
 
 "use strict";
 
-const ConcatenationScope = require("../ConcatenationScope");
-const Dependency = require("../Dependency");
-const InitFragment = require("../InitFragment");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { InlinedUsedName } = require("../optimize/InlineExports");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess } = require("../util/property");
+const Dependency = require("../../graph/Dependency");
+const ConcatenationScope = require("../../optimize/ConcatenationScope");
+const { isInlinedUsedName } = require("../../optimize/InlineExports");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const InitFragment = require("../../template/InitFragment");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyAccess } = require("../../util/property");
 
-const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
+const NullDependency = require("../core/NullDependency");
+const ESMExportInitFragment = require("./ESMExportInitFragment");
 
-const { ExportBindingType } = HarmonyExportInitFragment;
-
-const NullDependency = require("./NullDependency");
+const { ExportBindingType } = ESMExportInitFragment;
 
 const DEFAULT_EXPORT_NAME = "default";
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { ExportsSpec, LazyUntil } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { ConnectionState } from "../ModuleGraphConnection" */
-/** @import { InlinedValue } from "../optimize/InlineExports" */
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { ExportsSpec, LazyRole, UpdateHashContext } from "../../graph/Dependency" */
+/** @import Module, { BuildInfo } from "../../module/Module" */
+/** @import Hash from "../../util/Hash" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { ConnectionState } from "../../graph/ModuleGraphConnection" */
+/** @import { InlinedValue } from "../../optimize/InlineExports" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /** @typedef {string | { id?: string | undefined, range: Range, prefix: string, suffix: string }} DeclarationId */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean]>} ObjectSerializerContext */
-/** @import { ExportMap } from "./HarmonyExportInitFragment" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean, InlinedValue | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean, InlinedValue | undefined]>} ObjectSerializerContext */
+/** @import { ExportMap } from "./ESMExportInitFragment" */
 /**
  * @import {
  * 	JavascriptModuleBuildInfo
- * } from "../javascript/JavascriptModule"
+ * } from "../../javascript/JavascriptModule"
  */
 
-class HarmonyExportExpressionDependency extends NullDependency {
+class ESMExportExpressionDependency extends NullDependency {
 	/**
-	 * Creates an instance of HarmonyExportExpressionDependency.
+	 * Creates an instance of ESMExportExpressionDependency.
 	 * @param {Range} range range
 	 * @param {Range} rangeStatement range statement
 	 * @param {string} prefix prefix
@@ -67,17 +68,17 @@ class HarmonyExportExpressionDependency extends NullDependency {
 
 	/**
 	 * Returns how this dependency may be deferred when its parent module is side-effect-free (lazy barrel optimization).
-	 * @returns {LazyUntil | null} lazy classification, null when it must be processed eagerly
+	 * @returns {LazyRole | null} lazy classification, null when it must be processed eagerly
 	 */
-	getLazyUntil() {
-		return Dependency.LAZY_UNTIL_LOCAL;
+	get lazyRole() {
+		return Dependency.LAZY_LOCAL_EXPORT;
 	}
 
 	/**
-	 * Returns the export name for a `LAZY_UNTIL_LOCAL`/`LAZY_UNTIL_ID` classification (lazy barrel optimization).
+	 * Returns the export name for a `LAZY_LOCAL_EXPORT`/`LAZY_NAMED_REEXPORT` classification (lazy barrel optimization).
 	 * @returns {string | null} export name, null when not applicable
 	 */
-	getLazyName() {
+	get lazyName() {
 		return DEFAULT_EXPORT_NAME;
 	}
 
@@ -120,6 +121,24 @@ class HarmonyExportExpressionDependency extends NullDependency {
 		return false;
 	}
 
+	/**
+	 * Updates the hash with the data contributed by this instance.
+	 * @param {Hash} hash hash to be updated
+	 * @param {UpdateHashContext} context context
+	 * @returns {void}
+	 */
+	updateHash(hash, context) {
+		// the module's cycles, known only after it is built, pick value or getter
+		const module = /** @type {Module} */ (
+			context.chunkGraph.moduleGraph.getParentModule(this)
+		);
+		hash.update(
+			/** @type {BuildInfo} */ (module.buildInfo).isCircular === false
+				? "value"
+				: "getter"
+		);
+	}
+
 	/**
 	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
@@ -158,12 +177,14 @@ class HarmonyExportExpressionDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyExportExpressionDependency,
+makeSerializable(ESMExportExpressionDependency, [
+	"webpack/lib/dependencies/esm/ESMExportExpressionDependency",
+	// TODO in the next major release: remove, it restores the packs written
+	// under the name the file had before the ESM rename
 	"webpack/lib/dependencies/HarmonyExportExpressionDependency"
-);
+]);
 
-HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTemplate extends (
+ESMExportExpressionDependency.Template = class ESMExportDependencyTemplate extends (
 	NullDependency.Template
 ) {
 	/**
@@ -188,9 +209,16 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 			!templateContext.concatenationScope.isWrapped()
 				? templateContext.concatenationScope
 				: undefined;
-		const dep = /** @type {HarmonyExportExpressionDependency} */ (dependency);
+		const dep = /** @type {ESMExportExpressionDependency} */ (dependency);
 		const { declarationId } = dep;
 		const exportsName = module.exportsArgument;
+		const meta = moduleGraph.getMetaIfExisting(module);
+
+		const onDemand =
+			!concatenationScope &&
+			meta !== undefined &&
+			meta.onDemandExports === true;
+
 		if (declarationId) {
 			/** @type {string} */
 			let name;
@@ -218,9 +246,12 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				const map = new Map();
 				map.set(used, {
 					value: `/* export default binding */ ${name}`,
-					type: ExportBindingType.Getter
+					type: ExportBindingType.Getter,
+					finalName: name
 				});
-				initFragments.push(new HarmonyExportInitFragment(exportsName, map));
+				initFragments.push(
+					new ESMExportInitFragment(exportsName, map, undefined, onDemand)
+				);
 			}
 
 			source.replace(
@@ -235,12 +266,12 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				(concatenationScope || used)
 			) {
 				// Fix .name for anonymous default export function declarations
-				// see test/test262-cases/test/language/module-code/instn-named-bndng-dflt-fun-anon.js cspell:disable-line
+				// see test/external/test262-cases/test/language/module-code/instn-named-bndng-dflt-fun-anon.js cspell:disable-line
 				runtimeRequirements.add(RuntimeGlobals.setAnonymousDefaultName);
 				initFragments.push(
 					new InitFragment(
 						`${RuntimeGlobals.setAnonymousDefaultName}(${name});\n`,
-						InitFragment.STAGE_HARMONY_EXPORTS,
+						InitFragment.STAGE_ESM_EXPORTS,
 						2
 					)
 				);
@@ -258,15 +289,16 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 					const used = moduleGraph
 						.getExportsInfo(module)
 						.getUsedName(DEFAULT_EXPORT_NAME, runtime);
-					if (used instanceof InlinedUsedName) {
+					if (isInlinedUsedName(used)) {
 						content = `/* inlined harmony default export */ const ${name} = `;
 					} else if (used) {
 						defaultIsUsed = true;
 						runtimeRequirements.add(RuntimeGlobals.exports);
 						// `export default <expr>` binds an immutable const declaration
 						const valueFormat =
-							/** @type {import("../Module").BuildInfo} */ (module.buildInfo)
-								.isCircular === false;
+							/** @type {import("../../module/Module").BuildInfo} */ (
+								module.buildInfo
+							).isCircular === false;
 
 						/** @type {ExportMap} */
 						const map = new Map();
@@ -274,9 +306,12 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 							value: name,
 							type: valueFormat
 								? ExportBindingType.Value
-								: ExportBindingType.Getter
+								: ExportBindingType.Getter,
+							finalName: name
 						});
-						initFragments.push(new HarmonyExportInitFragment(exportsName, map));
+						initFragments.push(
+							new ESMExportInitFragment(exportsName, map, undefined, onDemand)
+						);
 					} else {
 						content = `/* unused harmony default export */ var ${name} = `;
 					}
@@ -288,7 +323,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				const used = moduleGraph
 					.getExportsInfo(module)
 					.getUsedName(DEFAULT_EXPORT_NAME, runtime);
-				if (used instanceof InlinedUsedName) {
+				if (isInlinedUsedName(used)) {
 					content = `/* inlined harmony default export */ var ${name} = `;
 				} else if (used) {
 					defaultIsUsed = true;
@@ -329,7 +364,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				);
 				if (dep.isAnonymousDefault && defaultIsUsed) {
 					// Fix .name for anonymous default export expressions
-					// see test/test262-cases/test/language/module-code/eval-export-dflt-cls-anon.js cspell:disable-line
+					// see test/external/test262-cases/test/language/module-code/eval-export-dflt-cls-anon.js cspell:disable-line
 					runtimeRequirements.add(RuntimeGlobals.setAnonymousDefaultName);
 					source.replace(
 						dep.range[1],
@@ -347,4 +382,4 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 	}
 };
 
-module.exports = HarmonyExportExpressionDependency;
+module.exports = ESMExportExpressionDependency;

package/lib/dependencies/{HarmonyExportHeaderDependency.js → esm/ESMExportHeaderDependency.js}

@@ -5,19 +5,19 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range | undefined | null, Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range | undefined | null, Range]>} ObjectSerializerContext */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range | undefined | null, Range]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range | undefined | null, Range]>} ObjectSerializerContext */
 
-class HarmonyExportHeaderDependency extends NullDependency {
+class ESMExportHeaderDependency extends NullDependency {
 	/**
-	 * Creates an instance of HarmonyExportHeaderDependency.
+	 * Creates an instance of ESMExportHeaderDependency.
 	 * @param {Range | undefined | null} range range
 	 * @param {Range} rangeStatement range statement
 	 */
@@ -52,12 +52,14 @@ class HarmonyExportHeaderDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyExportHeaderDependency,
+makeSerializable(ESMExportHeaderDependency, [
+	"webpack/lib/dependencies/esm/ESMExportHeaderDependency",
+	// TODO in the next major release: remove, it restores the packs written
+	// under the name the file had before the ESM rename
 	"webpack/lib/dependencies/HarmonyExportHeaderDependency"
-);
+]);
 
-HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate extends (
+ESMExportHeaderDependency.Template = class ESMExportDependencyTemplate extends (
 	NullDependency.Template
 ) {
 	/**
@@ -68,7 +70,7 @@ HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate e
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const dep = /** @type {HarmonyExportHeaderDependency} */ (dependency);
+		const dep = /** @type {ESMExportHeaderDependency} */ (dependency);
 		const content = "";
 		const replaceUntil = dep.range
 			? dep.range[0] - 1
@@ -77,4 +79,4 @@ HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate e
 	}
 };
 
-module.exports = HarmonyExportHeaderDependency;
+module.exports = ESMExportHeaderDependency;

package/lib/dependencies/esm/ESMExportImportedSideEffectDependency.js

@@ -0,0 +1,37 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Haijie Xie @hai-x
+*/
+
+"use strict";
+
+const Dependency = require("../../graph/Dependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ESMImportSideEffectDependency = require("./ESMImportSideEffectDependency");
+
+/** @import { LazyRole } from "../../graph/Dependency" */
+
+/**
+ * The evaluation of an `export … from "..."` statement's module. It is a separate
+ * class rather than a flag so a lazy barrel defers it with the re-export, while an
+ * import declaration's evaluation stays tied to the barrel's own code.
+ */
+class ESMExportImportedSideEffectDependency extends ESMImportSideEffectDependency {
+	/**
+	 * Returns how this dependency may be deferred when its parent module is side-effect-free (lazy barrel optimization).
+	 * @returns {LazyRole | null} lazy classification, null when it must be processed eagerly
+	 */
+	get lazyRole() {
+		return Dependency.LAZY_REEXPORT_SIDE_EFFECT;
+	}
+}
+
+makeSerializable(
+	ESMExportImportedSideEffectDependency,
+	"webpack/lib/dependencies/esm/ESMExportImportedSideEffectDependency"
+);
+
+ESMExportImportedSideEffectDependency.Template =
+	ESMImportSideEffectDependency.Template;
+
+module.exports = ESMExportImportedSideEffectDependency;