@depup/webpack 5.109.2-depup.0 → 5.110.3-depup.0

package/lib/dependencies/ContextElementDependency.js

@@ -9,15 +9,14 @@ const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("../ContextModule")} ContextModule */
-/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined]>} ObjectSerializerContext */
+/** @import ContextModule from "../ContextModule" */
+/** @import { RawReferencedExports, ReferencedExports } from "../Dependency" */
+/** @import Module from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined, string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined, string | undefined]>} ObjectSerializerContext */
 
 class ContextElementDependency extends ModuleDependency {
 	/**
@@ -29,6 +28,7 @@ class ContextElementDependency extends ModuleDependency {
 	 * @param {RawReferencedExports | null=} referencedExports referenced exports
 	 * @param {string=} context context
 	 * @param {ImportAttributes=} attributes import assertions
+	 * @param {string=} contextRequest the request of the context as written by the user, without query and fragment
 	 */
 	constructor(
 		request,
@@ -37,7 +37,8 @@ class ContextElementDependency extends ModuleDependency {
 		category,
 		referencedExports,
 		context,
-		attributes
+		attributes,
+		contextRequest
 	) {
 		super(request);
 
@@ -56,6 +57,21 @@ class ContextElementDependency extends ModuleDependency {
 		this._context = context || undefined;
 		/** @type {ImportAttributes | undefined} */
 		this.attributes = attributes;
+		/** @type {string | undefined} */
+		this._contextRequest = contextRequest || undefined;
+	}
+
+	/**
+	 * The request as the user wrote it, e.g. `#configs/file.mjs` where `request`
+	 * is the `./file.mjs` relative to the resolved `#configs` directory.
+	 * @returns {string} the original request
+	 */
+	get originalRequest() {
+		const request = this.request;
+		if (this._contextRequest === undefined || !request.startsWith("./")) {
+			return request;
+		}
+		return this._contextRequest + request.slice(1);
 	}
 
 	get type() {
@@ -132,7 +148,8 @@ class ContextElementDependency extends ModuleDependency {
 			.write(this._typePrefix)
 			.write(this._category)
 			.write(this.referencedExports)
-			.write(this.attributes);
+			.write(this.attributes)
+			.write(this._contextRequest);
 		super.serialize(context);
 	}
 
@@ -148,7 +165,9 @@ class ContextElementDependency extends ModuleDependency {
 		this.referencedExports = c2.read();
 		const c3 = c2.rest;
 		this.attributes = c3.read();
-		super.deserialize(c3.rest);
+		const c4 = c3.rest;
+		this._contextRequest = c4.read();
+		super.deserialize(c4.rest);
 	}
 }
 

package/lib/dependencies/CreateRequireParserPlugin.js

@@ -17,13 +17,18 @@ const {
 const CommonJsImportsParserPlugin = require("./CommonJsImportsParserPlugin");
 const ConstDependency = require("./ConstDependency");
 
-/** @typedef {import("estree").CallExpression} CallExpression */
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").ImportSource} ImportSource */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { CallExpression, Expression } from "estree" */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/**
+ * @import JavascriptParser, {
+ * 	ImportSource,
+ * 	Range
+ * } from "../javascript/JavascriptParser"
+ */
 
 /**
  * Defines the common js import settings type used by this module.

package/lib/dependencies/CreateScriptUrlDependency.js

@@ -9,10 +9,10 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 

package/lib/dependencies/CssIcssExportDependency.js

@@ -20,27 +20,38 @@ const NullDependency = require("./NullDependency");
 
 const getCssTokens = memoize(() => require("../css/syntax"));
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
-/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
-/** @typedef {import("../../declarations/WebpackOptions").HashFunction} HashFunction */
-/** @typedef {import("../css/CssGenerator")} CssGenerator */
-/** @typedef {import("../css/CssModule")} CssModule */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("../css/CssParser").Range} Range */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @import { ReplaceSource } from "webpack-sources" */
+/**
+ * @import {
+ * 	CssGeneratorExportsConvention,
+ * 	CssGeneratorLocalIdentName,
+ * 	HashFunction
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import CssGenerator from "../css/CssGenerator" */
+/** @import CssModule from "../css/CssModule" */
+/** @import ChunkGraph from "../ChunkGraph" */
+/**
+ * @import Dependency, {
+ * 	ExportsSpec,
+ * 	ReferencedExports,
+ * 	UpdateHashContext,
+ * 	DependencyLocation
+ * } from "../Dependency"
+ */
+/**
+ * @import {
+ * 	CssDependencyTemplateContext as DependencyTemplateContext
+ * } from "../DependencyTemplate"
+ */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import RuntimeTemplate from "../RuntimeTemplate" */
+/** @import { Range } from "../css/CssParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<(number | string | Value | Range | boolean | ExportMode | ExportType | DependencyLocation | undefined)[]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<(number | string | Value | Range | boolean | ExportMode | ExportType | DependencyLocation | undefined)[]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../errors/WebpackError")} WebpackErrorType */
+/** @import Hash from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import WebpackErrorType from "../errors/WebpackError" */
 
 /** @typedef {string | [string, string] | [string, string, string]} Value */
 /** @typedef {(name: string) => string | string[]} ExportsConventionFn */
@@ -201,21 +212,23 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
  * Module-level reference so `moduleGraph.cached` can use it as a stable
  * computer key — repeated lookups during a build skip `cssExportConvention`,
  * `getLocalIdent` (with its content / path hashing) and `escapeIdentifier`.
+ * Parameters are ordered by rising cardinality because `cached` keys a trie on
+ * them — see the call site.
  * @param {ModuleGraph} _moduleGraph module graph (unused, kept for `cached` signature)
  * @param {CssModule} module css module the value resolves in
- * @param {string} value raw value to interpolate
- * @param {ExportType} exportType export type discriminator
  * @param {ChunkGraph} chunkGraph chunk graph
  * @param {RuntimeTemplate} runtimeTemplate runtime template
+ * @param {ExportType} exportType export type discriminator
+ * @param {string} value raw value to interpolate
  * @returns {string} interpolated identifier
  */
 const computeInterpolatedIdentifier = (
 	_moduleGraph,
 	module,
-	value,
-	exportType,
 	chunkGraph,
-	runtimeTemplate
+	runtimeTemplate,
+	exportType,
+	value
 ) => {
 	const generator = /** @type {CssGenerator} */ (module.generator);
 	const local = cssExportConvention(
@@ -690,7 +703,16 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 		if (!module) return undefined;
 
 		const matches = getExportIndex(cache, module).get(importName);
-		const exportEntry = matches && matches[0];
+		// Skip demoted (`NONE`) cross-kind entries so `@value name from` picks the same winner as the JS export map.
+		let exportEntry;
+		if (matches) {
+			for (const m of matches) {
+				if (m.exportMode !== EXPORT_MODE.NONE) {
+					exportEntry = m;
+					break;
+				}
+			}
+		}
 		if (!exportEntry) return undefined;
 		if (seen.has(exportEntry)) return undefined;
 		seen.add(exportEntry);
@@ -754,6 +776,7 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 			const matches = getExportIndex(cache, module).get(name);
 			if (matches) {
 				for (const d of matches) {
+					if (d.exportMode === EXPORT_MODE.NONE) continue;
 					if (Array.isArray(d.value)) {
 						references.push(
 							...CssIcssExportDependencyTemplate.resolveReferences(
@@ -789,6 +812,7 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 			).get(/** @type {string} */ (entry.value));
 			if (matches) {
 				for (const d of matches) {
+					if (d.exportMode === EXPORT_MODE.NONE) continue;
 					if (d.exportType !== EXPORT_TYPE.COMPOSES) continue;
 					if (Array.isArray(d.value)) {
 						references.push(
@@ -826,13 +850,17 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 		if (!entry.interpolate) return value;
 		const { moduleGraph, module, chunkGraph, runtimeTemplate } =
 			templateContext;
+		// Key order is by rising cardinality: `moduleGraph.cached` is a trie that
+		// allocates a node per level per new prefix, so the per-export `value` goes
+		// last — otherwise every export name forks the trie and re-allocates the
+		// three elements below it, which are constant for the whole compilation.
 		return moduleGraph.cached(
 			computeInterpolatedIdentifier,
 			/** @type {CssModule} */ (module),
-			value,
-			entry.exportType,
 			chunkGraph,
-			runtimeTemplate
+			runtimeTemplate,
+			entry.exportType,
+			value
 		);
 	}
 

package/lib/dependencies/CssIcssImportDependency.js

@@ -10,21 +10,25 @@ const { cssExportConvention } = require("../util/conventions");
 const makeSerializable = require("../util/makeSerializable");
 const CssImportDependency = require("./CssImportDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../css/CssGenerator")} CssGenerator */
-/** @typedef {import("../css/CssModule")} CssModule */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency, { ReferencedExports } from "../Dependency" */
+/**
+ * @import {
+ * 	CssDependencyTemplateContext as DependencyTemplateContext
+ * } from "../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 */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
-/** @typedef {import("./CssIcssExportDependency").ExportMode} ExportMode */
-/** @typedef {import("./CssIcssExportDependency").ExportType} ExportType */
+/**
+ * @import {
+ * 	CssGeneratorExportsConvention
+ * } from "../../declarations/WebpackOptions"
+ */
 
 class CssIcssImportDependency extends CssImportDependency {
 	/**

package/lib/dependencies/CssIcssSymbolDependency.js

@@ -10,18 +10,17 @@ const makeSerializable = require("../util/makeSerializable");
 const CssIcssExportDependency = require("./CssIcssExportDependency");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../css/CssParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/**
+ * @import {
+ * 	CssDependencyTemplateContext as DependencyTemplateContext
+ * } from "../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 */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import Hash from "../util/Hash" */
 
 class CssIcssSymbolDependency extends NullDependency {
 	/**

package/lib/dependencies/CssImportDependency.js

@@ -8,14 +8,22 @@
 const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../../declarations/WebpackOptions").CssParserExportType} CssParserExportType */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../css/CssModule").Inheritance} Inheritance */
-/** @typedef {import("../css/CssParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { CssParserExportType } from "../../declarations/WebpackOptions" */
+/** @import Dependency from "../Dependency" */
+/**
+ * @import {
+ * 	CssDependencyTemplateContext as DependencyTemplateContext
+ * } from "../DependencyTemplate"
+ */
+/** @import { Inheritance } from "../css/CssModule" */
+/** @import { Range } from "../css/CssParser" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "../serialization/ObjectMiddleware"
+ */
 
 class CssImportDependency extends ModuleDependency {
 	/**
@@ -65,9 +73,10 @@ class CssImportDependency extends ModuleDependency {
 
 	/**
 	 * Returns true if this dependency can be concatenated
+	 * @param {boolean} concatenateCommonJsModules whether optimization.concatenateModules.commonjs is enabled
 	 * @returns {boolean} true if this dependency can be concatenated
 	 */
-	canConcatenate() {
+	canConcatenate(concatenateCommonJsModules) {
 		return true;
 	}
 

package/lib/dependencies/CssUrlDependency.js

@@ -11,21 +11,21 @@ const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
-/** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
-/** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/**
+ * @import {
+ * 	CssDependencyTemplateContext as DependencyTemplateContext
+ * } from "../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 */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
+/** @import Hash from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { NormalModuleBuildInfo } from "../NormalModule" */
 
 const getIgnoredRawDataUrlModule = memoize(
 	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
@@ -64,6 +64,10 @@ class CssUrlDependency extends ModuleDependency {
 		return "url";
 	}
 
+	get referencedSourceType() {
+		return ASSET_URL_TYPE;
+	}
+
 	/**
 	 * Creates an ignored module.
 	 * @param {string} context context directory

package/lib/dependencies/DllEntryDependency.js

@@ -8,7 +8,7 @@
 const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("./EntryDependency")} EntryDependency */
+/** @import EntryDependency from "./EntryDependency" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[EntryDependency[], string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[EntryDependency[], string]>} ObjectSerializerContext */
 

package/lib/dependencies/DynamicExports.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
+/** @import { BuildMeta } from "../Module" */
+/** @import { JavascriptParserState } from "../javascript/JavascriptParser" */
 
 /** @type {WeakMap<JavascriptParserState, boolean>} */
 const parserStateExportsState = new WeakMap();

package/lib/dependencies/ExportBindingInitFragment.js

@@ -8,9 +8,9 @@
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
-/** @typedef {import("../ExportsInfo").UsedName} UsedName */
+/** @import { Source } from "webpack-sources" */
+/** @import { GenerateContext } from "../Generator" */
+/** @import { UsedName } from "../ExportsInfo" */
 
 /**
  * @typedef {object} ExportBinding
@@ -19,6 +19,14 @@ const RuntimeGlobals = require("../RuntimeGlobals");
  * @property {"getter" | "value"=} bindingType "value" for value binding, defaults to "getter"
  */
 
+/**
+ * Offered the rendered `d()` call and where it sits, and answers whether it took it
+ * over. A consumer that does emits the call itself where it is actually read — or
+ * leaves it out. Value bindings read the declarations above them, so one placed at
+ * the end cannot be moved before the module body.
+ * @typedef {(source: string, placeAtEnd: boolean) => boolean} OnDemandGeneration
+ */
+
 /**
  * Init fragment for const export bindings.
  * Generates a flat-array __webpack_require__.d() call.
@@ -35,8 +43,14 @@ class ExportBindingInitFragment extends InitFragment {
 	 * @param {string} exportsArgument the exports identifier
 	 * @param {ExportBinding[]} bindings list of export bindings
 	 * @param {boolean=} placeAtEnd when true, place the d() call at the end of the module
+	 * @param {OnDemandGeneration=} onDemand offered the call instead of emitting it
 	 */
-	constructor(exportsArgument, bindings, placeAtEnd = false) {
+	constructor(
+		exportsArgument,
+		bindings,
+		placeAtEnd = false,
+		onDemand = undefined
+	) {
 		super(
 			undefined,
 			InitFragment.STAGE_HARMONY_EXPORTS,
@@ -49,6 +63,8 @@ class ExportBindingInitFragment extends InitFragment {
 		this.bindings = bindings;
 		/** @type {boolean} */
 		this.placeAtEnd = placeAtEnd;
+		/** @type {OnDemandGeneration | undefined} */
+		this.onDemand = onDemand;
 	}
 
 	/**
@@ -75,7 +91,8 @@ class ExportBindingInitFragment extends InitFragment {
 		return new ExportBindingInitFragment(
 			this.exportsArgument,
 			bindings,
-			placeAtEnd
+			placeAtEnd,
+			this.onDemand
 		);
 	}
 
@@ -103,7 +120,8 @@ class ExportBindingInitFragment extends InitFragment {
 		return new ExportBindingInitFragment(
 			this.exportsArgument,
 			bindings,
-			this.placeAtEnd || other.placeAtEnd
+			this.placeAtEnd || other.placeAtEnd,
+			this.onDemand || other.onDemand
 		);
 	}
 
@@ -131,11 +149,20 @@ class ExportBindingInitFragment extends InitFragment {
 			}
 		}
 
+		// Requested even when the call is taken over below: whoever took it may still
+		// emit it, and by then the requirement set is closed.
 		runtimeRequirements.add(RuntimeGlobals.exports);
 		runtimeRequirements.add(RuntimeGlobals.definePropertyGetters);
-		return `/* harmony export */ ${RuntimeGlobals.definePropertyGetters}(${
-			this.exportsArgument
-		}, [${items.join(",")}\n/* harmony export */ ]);\n`;
+		// Only this fragment emits the array form, so the runtime helper drops the
+		// branch reading it unless this asks for it.
+		runtimeRequirements.add(RuntimeGlobals.definePropertyGettersFromArray);
+		const definition = `/* harmony export */ ${
+			RuntimeGlobals.definePropertyGetters
+		}(${this.exportsArgument}, [${items.join(",")}\n/* harmony export */ ]);\n`;
+		return this.onDemand !== undefined &&
+			this.onDemand(definition, this.placeAtEnd)
+			? ""
+			: definition;
 	}
 
 	/**

package/lib/dependencies/ExportsInfoDependency.js

@@ -9,14 +9,13 @@ const { UsageState } = require("../ExportsInfo");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency, { ExportInfoName } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, ExportInfoName[] | null, string | null]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, ExportInfoName[] | null, string | null]>} ObjectSerializerContext */
 

package/lib/dependencies/ExternalModuleDependency.js

@@ -9,11 +9,15 @@ const makeSerializable = require("../util/makeSerializable");
 const CachedConstDependency = require("./CachedConstDependency");
 const ExternalModuleInitFragment = require("./ExternalModuleInitFragment");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../dependencies/ExternalModuleInitFragment").ArrayImportSpecifiers} ArrayImportSpecifiers */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/**
+ * @import {
+ * 	ArrayImportSpecifiers
+ * } from "../dependencies/ExternalModuleInitFragment"
+ */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<(string | ArrayImportSpecifiers | undefined)[]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<(string | ArrayImportSpecifiers | undefined)[]>} ObjectSerializerContext */
 

package/lib/dependencies/ExternalModuleInitFragment.js

@@ -8,8 +8,8 @@
 const InitFragment = require("../InitFragment");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @import { Source } from "webpack-sources" */
+/** @import { GenerateContext } from "../Generator" */
 /** @typedef {{ name: string, value?: string }[]} ArrayImportSpecifiers */
 /** @typedef {Set<string>} ImportSpecifier */
 /** @typedef {Map<string, ImportSpecifier>} ImportSpecifiers */

package/lib/dependencies/ExternalModuleInitFragmentDependency.js

@@ -10,11 +10,14 @@ const makeSerializable = require("../util/makeSerializable");
 const ExternalModuleInitFragment = require("./ExternalModuleInitFragment");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../dependencies/ExternalModuleInitFragment").ArrayImportSpecifiers} ArrayImportSpecifiers */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/**
+ * @import {
+ * 	ArrayImportSpecifiers
+ * } from "../dependencies/ExternalModuleInitFragment"
+ */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ArrayImportSpecifiers, string | undefined]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ArrayImportSpecifiers, string | undefined]>} ObjectSerializerContext */