webpack 5.111.0 → 5.112.0

package/lib/dependencies/{CssIcssImportDependency.js → css/CssIcssImportDependency.js}

@@ -5,29 +5,29 @@
 
 "use strict";
 
-const WebpackError = require("../errors/WebpackError");
-const { cssExportConvention } = require("../util/conventions");
-const makeSerializable = require("../util/makeSerializable");
+const { cssExportConvention } = require("../../css/conventions");
+const WebpackError = require("../../errors/WebpackError");
+const makeSerializable = require("../../util/makeSerializable");
 const CssImportDependency = require("./CssImportDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { ReferencedExports } from "../Dependency" */
+/** @import Dependency, { ReferencedExports, DependencyKinds } from "../../graph/Dependency" */
 /**
  * @import {
  * 	CssDependencyTemplateContext as DependencyTemplateContext
- * } from "../DependencyTemplate"
+ * } from "../../template/DependencyTemplate"
  */
-/** @import CssGenerator from "../css/CssGenerator" */
-/** @import CssModule from "../css/CssModule" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { RuntimeSpec } from "../util/runtime" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string]>} ObjectSerializerContext */
+/** @import CssGenerator from "../../css/CssGenerator" */
+/** @import CssModule from "../../css/CssModule" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string]>} ObjectSerializerContext */
 /**
  * @import {
  * 	CssGeneratorExportsConvention
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
 
 class CssIcssImportDependency extends CssImportDependency {
@@ -100,12 +100,9 @@ class CssIcssImportDependency extends CssImportDependency {
 
 		if (!module) return null;
 
-		// The target module stores exports under the names produced by its
-		// `exportsConvention`, so a raw `isExportProvided(this.importName)`
-		// would false-positive against `camel-case-only` / `dashes-only` (and
-		// any custom function that drops the original spelling). Expand
-		// `importName` through the *target* module's convention and accept
-		// if any alias is provided.
+		// The target stores exports under its own `exportsConvention`, so asking for
+		// the raw name misses under `camel-case-only` or any convention dropping the
+		// original spelling. Expand through that convention and accept any alias.
 		const generator =
 			/** @type {CssGenerator | undefined} */
 			(module.generator);
@@ -167,9 +164,16 @@ CssIcssImportDependency.Template = class CssIcssImportDependencyTemplate extends
 	}
 };
 
-makeSerializable(
-	CssIcssImportDependency,
+makeSerializable(CssIcssImportDependency, [
+	"webpack/lib/dependencies/css/CssIcssImportDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CssIcssImportDependency"
-);
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+CssIcssImportDependency.KINDS = new Set([
+	...CssImportDependency.KINDS,
+	"css-icss-import"
+]);
 
 module.exports = CssIcssImportDependency;

package/lib/dependencies/{CssIcssSymbolDependency.js → css/CssIcssSymbolDependency.js}

@@ -5,22 +5,22 @@
 
 "use strict";
 
-const { CSS_TYPE } = require("../ModuleSourceTypeConstants");
-const makeSerializable = require("../util/makeSerializable");
+const { CSS_TYPE } = require("../../module/ModuleSourceTypeConstants");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 const CssIcssExportDependency = require("./CssIcssExportDependency");
-const NullDependency = require("./NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/** @import Dependency, { UpdateHashContext } from "../../graph/Dependency" */
 /**
  * @import {
  * 	CssDependencyTemplateContext as DependencyTemplateContext
- * } from "../DependencyTemplate"
+ * } from "../../template/DependencyTemplate"
  */
-/** @import { Range } from "../css/CssParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, Range, string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, Range, string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
-/** @import Hash from "../util/Hash" */
+/** @import { Range } from "../../css/CssParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, Range, string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[string, Range, string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
+/** @import Hash from "../../util/Hash" */
 
 class CssIcssSymbolDependency extends NullDependency {
 	/**
@@ -130,9 +130,10 @@ CssIcssSymbolDependency.Template = class CssIcssSymbolDependencyTemplate extends
 	}
 };
 
-makeSerializable(
-	CssIcssSymbolDependency,
+makeSerializable(CssIcssSymbolDependency, [
+	"webpack/lib/dependencies/css/CssIcssSymbolDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CssIcssSymbolDependency"
-);
+]);
 
 module.exports = CssIcssSymbolDependency;

package/lib/dependencies/{CssImportDependency.js → css/CssImportDependency.js}

@@ -5,24 +5,24 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { CssParserExportType } from "../../declarations/WebpackOptions" */
-/** @import Dependency from "../Dependency" */
+/** @import { CssParserExportType } from "../../../declarations/WebpackOptions" */
+/** @import Dependency, { DependencyKinds } from "../../graph/Dependency" */
 /**
  * @import {
  * 	CssDependencyTemplateContext as DependencyTemplateContext
- * } from "../DependencyTemplate"
+ * } from "../../template/DependencyTemplate"
  */
-/** @import { Inheritance } from "../css/CssModule" */
-/** @import { Range } from "../css/CssParser" */
+/** @import { Inheritance } from "../../css/CssModule" */
+/** @import { Range } from "../../css/CssParser" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
- * } from "../serialization/ObjectMiddleware"
+ * } from "../../serialization/ObjectMiddleware"
  */
 
 class CssImportDependency extends ModuleDependency {
@@ -157,9 +157,13 @@ CssImportDependency.Template = class CssImportDependencyTemplate extends (
 	}
 };
 
-makeSerializable(
-	CssImportDependency,
+makeSerializable(CssImportDependency, [
+	"webpack/lib/dependencies/css/CssImportDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CssImportDependency"
-);
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+CssImportDependency.KINDS = new Set([...ModuleDependency.KINDS, "css-import"]);
 
 module.exports = CssImportDependency;

package/lib/dependencies/{CssUrlDependency.js → css/CssUrlDependency.js}

@@ -5,27 +5,27 @@
 
 "use strict";
 
-const { ASSET_URL_TYPE } = require("../ModuleSourceTypeConstants");
-const RawDataUrlModule = require("../asset/RawDataUrlModule");
-const makeSerializable = require("../util/makeSerializable");
-const memoize = require("../util/memoize");
-const ModuleDependency = require("./ModuleDependency");
+const RawDataUrlModule = require("../../asset/RawDataUrlModule");
+const { ASSET_URL_TYPE } = require("../../module/ModuleSourceTypeConstants");
+const makeSerializable = require("../../util/makeSerializable");
+const memoize = require("../../util/memoize");
+const ModuleDependency = require("../core/ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import CodeGenerationResults from "../CodeGenerationResults" */
-/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/** @import CodeGenerationResults from "../../module/CodeGenerationResults" */
+/** @import Dependency, { UpdateHashContext, DependencyKinds } from "../../graph/Dependency" */
 /**
  * @import {
  * 	CssDependencyTemplateContext as DependencyTemplateContext
- * } from "../DependencyTemplate"
+ * } from "../../template/DependencyTemplate"
  */
-/** @import Module from "../Module" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<["string" | "url" | "src", true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<["string" | "url" | "src", true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
-/** @import Hash from "../util/Hash" */
-/** @import { RuntimeSpec } from "../util/runtime" */
-/** @import { NormalModuleBuildInfo } from "../NormalModule" */
+/** @import Module from "../../module/Module" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<["string" | "url" | "src", true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<["string" | "url" | "src", true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
+/** @import Hash from "../../util/Hash" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import { NormalModuleBuildInfo } from "../../module/NormalModule" */
 
 const getIgnoredRawDataUrlModule = memoize(
 	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
@@ -84,11 +84,9 @@ class CssUrlDependency extends ModuleDependency {
 	 * @returns {void}
 	 */
 	updateHash(hash, context) {
-		// The dependency template substitutes the referenced asset's hashed
-		// filename into the rendered CSS at code-generation time. Folding the
-		// asset module's content hash into the dependency hash ensures the
-		// CSS module's hash invalidates — and the CSS chunk's contenthash
-		// updates — whenever the referenced asset's content changes.
+		// The template substitutes the asset's hashed filename into the rendered CSS,
+		// so folding that asset's content hash in here is what makes the CSS module's
+		// hash, and the chunk's contenthash, follow the asset.
 		const { chunkGraph } = context;
 		const module = chunkGraph.moduleGraph.getModule(this);
 		if (!module) return;
@@ -261,6 +259,13 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 	}
 };
 
-makeSerializable(CssUrlDependency, "webpack/lib/dependencies/CssUrlDependency");
+makeSerializable(CssUrlDependency, [
+	"webpack/lib/dependencies/css/CssUrlDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
+	"webpack/lib/dependencies/CssUrlDependency"
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+CssUrlDependency.KINDS = new Set([...ModuleDependency.KINDS, "css-url"]);
 
 module.exports = CssUrlDependency;

package/lib/dependencies/{CreateRequireParserPlugin.js → esm/CreateRequireParserPlugin.js}

@@ -6,28 +6,28 @@
 "use strict";
 
 const { fileURLToPath } = require("url");
-const WebpackError = require("../errors/WebpackError");
-const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
-const { VariableInfo } = require("../javascript/JavascriptParser");
+const WebpackError = require("../../errors/WebpackError");
+const BasicEvaluatedExpression = require("../../javascript/BasicEvaluatedExpression");
+const { isVariableInfo } = require("../../javascript/JavascriptParser");
 const {
 	evaluateToString,
 	expressionIsUnsupported,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
-const CommonJsImportsParserPlugin = require("./CommonJsImportsParserPlugin");
-const ConstDependency = require("./ConstDependency");
+} = require("../../javascript/JavascriptParserHelpers");
+const CommonJsImportsParserPlugin = require("../commonjs/CommonJsImportsParserPlugin");
+const ConstDependency = require("../core/ConstDependency");
 
 /** @import { CallExpression, Expression } from "estree" */
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
 /**
  * @import JavascriptParser, {
  * 	ImportSource,
  * 	Range
- * } from "../javascript/JavascriptParser"
+ * } from "../../javascript/JavascriptParser"
  */
 
 /**
@@ -282,7 +282,7 @@ class CreateRequireParserPlugin {
 			}
 			const variableInfo = parser.getVariableInfo(declarator.init.callee.name);
 			if (
-				variableInfo instanceof VariableInfo &&
+				isVariableInfo(variableInfo) &&
 				variableInfo.tagInfo &&
 				variableInfo.tagInfo.tag === createRequireSpecifierTag
 			) {

package/lib/dependencies/{HarmonyAcceptDependency.js → esm/ESMAcceptDependency.js}

@@ -5,32 +5,33 @@
 
 "use strict";
 
-const Template = require("../Template");
-const AwaitDependenciesInitFragment = require("../async-modules/AwaitDependenciesInitFragment");
-const makeSerializable = require("../util/makeSerializable");
-const HarmonyImportDependency = require("./HarmonyImportDependency");
-const { ImportPhaseUtils } = require("./ImportPhase");
-const NullDependency = require("./NullDependency");
+const AwaitDependenciesInitFragment = require("../../async-modules/AwaitDependenciesInitFragment");
+const isDependencyKind = require("../../graph/isDependencyKind");
+const Template = require("../../template/Template");
+const makeSerializable = require("../../util/makeSerializable");
+const { ImportPhaseUtils } = require("../core/ImportPhase");
+const NullDependency = require("../core/NullDependency");
+const ESMImportDependency = require("./ESMImportDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import HarmonyAcceptImportDependency from "./HarmonyAcceptImportDependency" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, HarmonyAcceptImportDependency[], boolean]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, HarmonyAcceptImportDependency[], boolean]>} ObjectSerializerContext */
-
-class HarmonyAcceptDependency extends NullDependency {
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import ESMAcceptImportDependency from "./ESMAcceptImportDependency" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, ESMAcceptImportDependency[], boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, ESMAcceptImportDependency[], boolean]>} ObjectSerializerContext */
+
+class ESMAcceptDependency extends NullDependency {
 	/**
-	 * Creates an instance of HarmonyAcceptDependency.
+	 * Creates an instance of ESMAcceptDependency.
 	 * @param {Range} range expression range
-	 * @param {HarmonyAcceptImportDependency[]} dependencies import dependencies
+	 * @param {ESMAcceptImportDependency[]} dependencies import dependencies
 	 * @param {boolean} hasCallback true, if the range wraps an existing callback
 	 */
 	constructor(range, dependencies, hasCallback) {
 		super();
 		this.range = range;
-		/** @type {HarmonyAcceptImportDependency[]} */
+		/** @type {ESMAcceptImportDependency[]} */
 		this.dependencies = dependencies;
 		/** @type {boolean} */
 		this.hasCallback = hasCallback;
@@ -63,12 +64,14 @@ class HarmonyAcceptDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyAcceptDependency,
+makeSerializable(ESMAcceptDependency, [
+	"webpack/lib/dependencies/esm/ESMAcceptDependency",
+	// 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/HarmonyAcceptDependency"
-);
+]);
 
-HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends (
+ESMAcceptDependency.Template = class ESMAcceptDependencyTemplate extends (
 	NullDependency.Template
 ) {
 	/**
@@ -79,7 +82,7 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const dep = /** @type {HarmonyAcceptDependency} */ (dependency);
+		const dep = /** @type {ESMAcceptDependency} */ (dependency);
 		const {
 			module,
 			runtime,
@@ -96,7 +99,7 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 		 * @returns {boolean} true if the dependencies are related
 		 */
 		const isRelatedHarmonyImportDependency = (a, b) => {
-			if (a === b || !(b instanceof HarmonyImportDependency)) return false;
+			if (a === b || !isDependencyKind(b, "esm-import")) return false;
 			// Compare modules by reference: an unresolved import (ignored/failed, or a
 			// deferred lazy-barrel re-export) has no module, and a module not in any
 			// chunk has a null id — so comparing ids would crash or miss real matches.
@@ -105,18 +108,18 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 		};
 
 		/**
-		 * HarmonyAcceptImportDependency lacks a lot of information, such as the defer property.
-		 * One HarmonyAcceptImportDependency may need to generate multiple ImportStatements.
-		 * Therefore, we find its original HarmonyImportDependency for code generation.
-		 * @param {HarmonyAcceptImportDependency} dependency the dependency to get harmony import dependencies for
-		 * @returns {HarmonyImportDependency[]} array of related harmony import dependencies
+		 * ESMAcceptImportDependency lacks a lot of information, such as the defer property.
+		 * One ESMAcceptImportDependency may need to generate multiple ImportStatements.
+		 * Therefore, we find its original ESMImportDependency for code generation.
+		 * @param {ESMAcceptImportDependency} dependency the dependency to get harmony import dependencies for
+		 * @returns {ESMImportDependency[]} array of related harmony import dependencies
 		 */
 		const getHarmonyImportDependencies = (dependency) => {
-			/** @type {HarmonyImportDependency[]} */
+			/** @type {ESMImportDependency[]} */
 			const result = [];
-			/** @type {HarmonyImportDependency | null} */
+			/** @type {ESMImportDependency | null} */
 			let deferDependency = null;
-			/** @type {HarmonyImportDependency | null} */
+			/** @type {ESMImportDependency | null} */
 			let noDeferredDependency = null;
 
 			for (const d of module.dependencies) {
@@ -124,12 +127,12 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 				if (isRelatedHarmonyImportDependency(dependency, d)) {
 					if (
 						ImportPhaseUtils.isDefer(
-							/** @type {HarmonyImportDependency} */ (d).phase
+							/** @type {ESMImportDependency} */ (d).phase
 						)
 					) {
-						deferDependency = /** @type {HarmonyImportDependency} */ (d);
+						deferDependency = /** @type {ESMImportDependency} */ (d);
 					} else {
-						noDeferredDependency = /** @type {HarmonyImportDependency} */ (d);
+						noDeferredDependency = /** @type {ESMImportDependency} */ (d);
 					}
 				}
 			}
@@ -142,10 +145,10 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 			return result;
 		};
 
-		/** @type {HarmonyImportDependency[]} */
+		/** @type {ESMImportDependency[]} */
 		const syncDeps = [];
 
-		/** @type {HarmonyAcceptImportDependency[]} */
+		/** @type {ESMAcceptImportDependency[]} */
 		const asyncDeps = [];
 
 		for (const dependency of dep.dependencies) {
@@ -164,7 +167,7 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 				return {
 					dependency,
 					runtimeCondition: referencedModule
-						? HarmonyImportDependency.Template.getImportEmittedRuntime(
+						? ESMImportDependency.Template.getImportEmittedRuntime(
 								module,
 								referencedModule
 							)
@@ -232,4 +235,4 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 	}
 };
 
-module.exports = HarmonyAcceptDependency;
+module.exports = ESMAcceptDependency;

package/lib/dependencies/esm/ESMAcceptImportDependency.js

@@ -0,0 +1,39 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const makeSerializable = require("../../util/makeSerializable");
+const { ImportPhase } = require("../core/ImportPhase");
+const NullDependency = require("../core/NullDependency");
+const ESMImportDependency = require("./ESMImportDependency");
+
+class ESMAcceptImportDependency extends ESMImportDependency {
+	/**
+	 * Creates an instance of ESMAcceptImportDependency.
+	 * @param {string} request the request string
+	 */
+	constructor(request) {
+		super(request, Infinity, ImportPhase.Evaluation);
+		/** @type {boolean} */
+		this.weak = true;
+	}
+
+	get type() {
+		return "harmony accept";
+	}
+}
+
+makeSerializable(ESMAcceptImportDependency, [
+	"webpack/lib/dependencies/esm/ESMAcceptImportDependency",
+	// 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/HarmonyAcceptImportDependency"
+]);
+
+ESMAcceptImportDependency.Template =
+	/** @type {typeof ESMImportDependency.Template} */ (NullDependency.Template);
+
+module.exports = ESMAcceptImportDependency;

package/lib/dependencies/{HarmonyCompatibilityDependency.js → esm/ESMCompatibilityDependency.js}

@@ -5,45 +5,44 @@
 
 "use strict";
 
-const { UsageState } = require("../ExportsInfo");
-const InitFragment = require("../InitFragment");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const isGeneratorLowered = require("../async-modules/isGeneratorLowered");
-const makeSerializable = require("../util/makeSerializable");
-const memoize = require("../util/memoize");
-const NullDependency = require("./NullDependency");
+const isGeneratorLowered = require("../../async-modules/isGeneratorLowered");
+const { UsageState } = require("../../graph/ExportsInfo");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const InitFragment = require("../../template/InitFragment");
+const makeSerializable = require("../../util/makeSerializable");
+const memoize = require("../../util/memoize");
+const NullDependency = require("../core/NullDependency");
 
-// Required here rather than at the top: the plugin reaches back into the dependencies.
-const getJavascriptModulesPlugin = memoize(() =>
-	require("../javascript/JavascriptModulesPlugin")
-);
-// Same reason: the deferred-namespace runtime imports dependencies from here.
+// Required here rather than at the top: the deferred-namespace runtime imports
+// dependencies from here.
 const getDeferredCycleHelpers = memoize(() =>
-	require("../runtime/MakeDeferredNamespaceObjectRuntime")
+	require("../../runtime/MakeDeferredNamespaceObjectRuntime")
 );
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import Module, { BuildMeta } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import ChunkGraph, { ModuleId } from "../ChunkGraph" */
+/** @import Dependency, { DependencyKinds } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import Module, { BuildMeta } from "../../module/Module" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import ChunkGraph, { ModuleId } from "../../graph/ChunkGraph" */
 /**
  * @import {
  * 	JavascriptModuleBuildInfo
- * } from "../javascript/JavascriptModule"
+ * } from "../../javascript/JavascriptModule"
  */
 
-class HarmonyCompatibilityDependency extends NullDependency {
+class ESMCompatibilityDependency extends NullDependency {
 	get type() {
 		return "harmony export header";
 	}
 }
 
-makeSerializable(
-	HarmonyCompatibilityDependency,
+makeSerializable(ESMCompatibilityDependency, [
+	"webpack/lib/dependencies/esm/ESMCompatibilityDependency",
+	// 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/HarmonyCompatibilityDependency"
-);
+]);
 
 /**
  * Key shared by the async modules of one strongly-connected component. The spec
@@ -78,7 +77,7 @@ const getAsyncCycleGroupId = (moduleGraph, chunkGraph, module) => {
 	return groupId;
 };
 
-HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate extends (
+ESMCompatibilityDependency.Template = class ESMExportDependencyTemplate extends (
 	NullDependency.Template
 ) {
 	/**
@@ -99,7 +98,8 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate
 			initFragments,
 			runtimeRequirements,
 			runtime,
-			concatenationScope
+			concatenationScope,
+			getData
 		}
 	) {
 		// a wrapped module has a real exports object that still needs `__esModule`
@@ -113,24 +113,17 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate
 				exportsArgument: module.exportsArgument,
 				runtimeRequirements
 			});
-			// A library exporting the same bindings natively never reads the marker back
-			// off the exports object, so it takes the call over and emits it where wrapped.
-			const hooks = getJavascriptModulesPlugin().getCompilationHooks(
-				runtimeTemplate.compilation
-			);
-			const takenOver =
-				hooks.onDemandExportsGeneration.isUsed() &&
-				hooks.onDemandExportsGeneration.call(
-					module,
-					runtime,
-					content,
-					false
-				) === true;
-			if (!takenOver) {
+
+			const meta = moduleGraph.getMetaIfExisting(module);
+			if (!concatenationScope && meta && meta.onDemandExports && getData) {
+				const data = getData();
+				const before = data.get("exportsSource");
+				data.set("exportsSource", before ? `${before}${content}` : content);
+			} else {
 				initFragments.push(
 					new InitFragment(
 						content,
-						InitFragment.STAGE_HARMONY_EXPORTS,
+						InitFragment.STAGE_ESM_EXPORTS,
 						0,
 						"harmony compatibility"
 					)
@@ -196,4 +189,10 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate
 	}
 };
 
-module.exports = HarmonyCompatibilityDependency;
+/** @type {Set<keyof DependencyKinds>} */
+ESMCompatibilityDependency.KINDS = new Set([
+	...NullDependency.KINDS,
+	"esm-compatibility"
+]);
+
+module.exports = ESMCompatibilityDependency;