webpack 5.112.0 → 5.112.1

package/lib/dependencies/commonjs/CommonJsExportRequireDependency.js

@@ -36,7 +36,6 @@ const {
 /** @import ExportsInfo, { ExportInfo } from "../../graph/ExportsInfo" */
 /** @import Module from "../../module/Module" */
 /** @import ModuleGraph from "../../graph/ModuleGraph" */
-/** @import ModuleGraphConnection from "../../graph/ModuleGraphConnection" */
 /** @import { Range } from "../../javascript/JavascriptParser" */
 /** @import { RuntimeSpec } from "../../util/runtime" */
 /** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
@@ -576,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)) {

package/lib/dependencies/commonjs/CommonJsExportsParserPlugin.js

@@ -52,7 +52,6 @@ const FUNCTION_PROPERTY_DROP_HEAD =
  */
 /** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
 /** @import { ExportInfoName } from "../../graph/Dependency" */
-/** @import { BuildInfo } from "../../module/Module" */
 
 /**
  * @import JavascriptParser, {
@@ -72,11 +71,6 @@ const FUNCTION_PROPERTY_DROP_HEAD =
  * } from "./CommonJsObjectExportDependency"
  */
 /** @import { RequireBindingData } from "./CommonJsImportsParserPlugin" */
-/**
- * @import {
- * 	JavascriptModuleBuildMeta
- * } from "../../javascript/JavascriptModule"
- */
 
 /**
  * This function takes a generic expression and detects whether it is an ObjectExpression.
@@ -165,7 +159,7 @@ const getReexportOfPropertyDescriptor = (expr) => {
 		if (getFn.async || getFn.generator) return;
 		// Arrow with expression body: `() => require("./x")`.
 		if (getFn.body.type !== "BlockStatement") {
-			return { expr: /** @type {Expression} */ (getFn.body), getter: true };
+			return { expr: getFn.body, getter: true };
 		}
 		// Function body must be exactly `return <expr>;`.
 		if (
@@ -264,15 +258,18 @@ const parseRequireCall = (parser, expr) => {
 	};
 };
 
+/** @typedef {Node extends infer N ? (N extends Node ? N[keyof N] : never) : never} NodeFieldValue */
+
 /**
  * Checks if a value is an AST node.
- * @param {unknown} value candidate
- * @returns {value is Node} true when the value is an AST node
+ * @template V
+ * @param {V} value candidate
+ * @returns {value is Extract<V, Node>} true when the value is an AST node
  */
 const isNode = (value) =>
 	typeof value === "object" &&
 	value !== null &&
-	typeof (/** @type {{ type?: unknown }} */ (value).type) === "string";
+	typeof (/** @type {Partial<Node>} */ (value).type) === "string";
 
 /** Positional/metadata keys that never hold child AST nodes. */
 const NON_CHILD_KEYS = new Set([
@@ -337,8 +334,8 @@ const findOwnThisExpression = (body, params) => {
 				break;
 			default: {
 				const children =
-					/** @type {Record<string, unknown>} */
-					(/** @type {unknown} */ (node));
+					/** @type {Node & Record<string, NodeFieldValue>} */
+					(node);
 				const keys = getChildKeys(node);
 				for (let i = 0; i < keys.length; i++) {
 					const value = children[keys[i]];
@@ -462,11 +459,11 @@ class CommonJsExportsParserPlugin {
 		 */
 		const bailoutHint = (reason) => {
 			recordOptimizationBailout(
-				/** @type {BuildInfo} */ (parser.state.module.buildInfo),
+				parser.state.module.buildInfo,
 				`CommonJS bailout: ${reason}`
 			);
 		};
-		/** @type {unknown} */
+		/** @type {JavascriptParser["state"] | undefined} */
 		let keptAllExportsForState;
 		/**
 		 * An exported function accessing its own `this` may reach any export
@@ -547,9 +544,7 @@ class CommonJsExportsParserPlugin {
 				dep.loc = parser.getLocation(expr);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.module.addDependency(dep);
-				/** @type {JavascriptModuleBuildMeta} */ (
-					parser.state.module.buildMeta
-				).treatAsCommonJs = true;
+				parser.state.module.buildMeta.treatAsCommonJs = true;
 
 				return true;
 			}
@@ -574,9 +569,7 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = parser.getLocation(expr);
 			parser.state.module.addDependency(dep);
-			/** @type {JavascriptModuleBuildMeta} */ (
-				parser.state.module.buildMeta
-			).treatAsCommonJs = true;
+			parser.state.module.buildMeta.treatAsCommonJs = true;
 			keepAllExportsOnThisAccess(expr.right, base);
 			parser.walkExpression(expr.right);
 			return true;
@@ -600,9 +593,7 @@ class CommonJsExportsParserPlugin {
 			if (object.type !== "ObjectExpression") return;
 
 			const module = parser.state.module;
-			/** @type {JavascriptModuleBuildMeta} */ (
-				module.buildMeta
-			).treatAsCommonJs = true;
+			module.buildMeta.treatAsCommonJs = true;
 			// LHS stays as the text `module.exports` (moduleArgument is "module"
 			// unless a top-level `module` binding shadows it, which prevents this hook).
 			module.addPresentationalDependency(
@@ -697,7 +688,7 @@ class CommonJsExportsParserPlugin {
 		parser.hooks.call
 			.for("Object.defineProperty")
 			.tap(PLUGIN_NAME, (expression) => {
-				const expr = /** @type {CallExpression} */ (expression);
+				const expr = expression;
 				if (!parser.isStatementLevelExpression(expr)) return;
 				if (expr.arguments.length !== 3) return;
 				if (expr.arguments[0].type === "SpreadElement") return;
@@ -747,9 +738,7 @@ class CommonJsExportsParserPlugin {
 						dep.loc = parser.getLocation(expr);
 						dep.optional = Boolean(parser.scope.inTry);
 						parser.state.module.addDependency(dep);
-						/** @type {JavascriptModuleBuildMeta} */ (
-							parser.state.module.buildMeta
-						).treatAsCommonJs = true;
+						parser.state.module.buildMeta.treatAsCommonJs = true;
 
 						return true;
 					}
@@ -768,9 +757,7 @@ class CommonJsExportsParserPlugin {
 				);
 				dep.loc = parser.getLocation(expr);
 				parser.state.module.addDependency(dep);
-				/** @type {JavascriptModuleBuildMeta} */ (
-					parser.state.module.buildMeta
-				).treatAsCommonJs = true;
+				parser.state.module.buildMeta.treatAsCommonJs = true;
 
 				if (descArg.type === "ObjectExpression") {
 					// `value`, `get` and `set` descriptor functions are all called
@@ -824,9 +811,7 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = parser.getLocation(expr);
 			parser.state.module.addDependency(dep);
-			/** @type {JavascriptModuleBuildMeta} */ (
-				parser.state.module.buildMeta
-			).treatAsCommonJs = true;
+			parser.state.module.buildMeta.treatAsCommonJs = true;
 
 			if (call) {
 				parser.walkExpressions(call.arguments);

package/lib/dependencies/commonjs/CommonJsImportsParserPlugin.js

@@ -189,9 +189,7 @@ const createRequireCallHandler = (
 				parser,
 				expr
 			);
-			const binding =
-				requireBindingData &&
-				requireBindingData.get(/** @type {CallExpression} */ (expr));
+			const binding = requireBindingData && requireBindingData.get(expr);
 			if (binding && !referencedExports) {
 				// `const NAME = require(LITERAL)` — let later member-access walks
 				// on `NAME` populate the dependency's referenced exports.

package/lib/dependencies/commonjs/CommonJsObjectExportDependency.js

@@ -136,10 +136,10 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 		if (!used) {
 			// Object spread rewrite needs environment.spread.
 			if (!runtimeTemplate.supportsSpread()) return;
-			const range = /** @type {Range} */ (dep.range);
+			const range = dep.range;
 			if (FUNCTION_PROPERTY_DROP_HEAD.has(dep.kind)) {
 				// Keep the function body so nested dependency replaces stay valid.
-				const valueRange = /** @type {Range} */ (dep.valueRange);
+				const valueRange = dep.valueRange;
 				source.replace(
 					range[0],
 					valueRange[0] - 1,
@@ -153,7 +153,7 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 				return;
 			}
 			// keyValue: keep the value's side effects in place.
-			const valueRange = /** @type {Range} */ (dep.valueRange);
+			const valueRange = dep.valueRange;
 			if (dep.pure) {
 				// spreading null adds nothing; the text stays so nested replaces hold
 				source.replace(
@@ -170,7 +170,7 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 		}
 		if (used === dep.name) return;
 		// Rename the key to the mangled export name.
-		const keyRange = /** @type {Range} */ (dep.keyRange);
+		const keyRange = dep.keyRange;
 		if (dep.kind === "shorthand") {
 			source.replace(
 				keyRange[0],

package/lib/dependencies/commonjs/CommonJsPlugin.js

@@ -42,7 +42,6 @@ const TopLevelThisParserPlugin = require("./TopLevelThisParserPlugin");
  */
 /** @import Compilation from "../../Compilation" */
 /** @import Compiler from "../../Compiler" */
-/** @import { BuildInfo } from "../../module/Module" */
 /** @import Parser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "CommonJsPlugin";
@@ -232,8 +231,7 @@ class CommonJsPlugin {
 					parser.hooks.expression
 						.for(RuntimeGlobals.moduleLoaded)
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								RuntimeGlobals.moduleLoaded;
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleLoaded
@@ -246,8 +244,7 @@ class CommonJsPlugin {
 					parser.hooks.expression
 						.for(RuntimeGlobals.moduleId)
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								RuntimeGlobals.moduleId;
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleId

package/lib/dependencies/commonjs/RequireEnsureDependenciesBlockParserPlugin.js

@@ -12,6 +12,7 @@ const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
 
 /** @import { Expression, SpreadElement } from "estree" */
 /** @import { GroupOptions } from "../../graph/AsyncDependenciesBlock" */
+/** @import DependenciesBlock from "../../graph/DependenciesBlock" */
 /** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
 /** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 /** @import { FunctionExpressionResult } from "../helpers/getFunctionExpression" */
@@ -87,7 +88,9 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 					dep.loc = parser.getLocation(expr);
 					depBlock.addDependency(dep);
 					const old = parser.state.current;
-					parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
+					parser.state.current = /** @type {typeof parser.state.current} */ (
+						/** @type {DependenciesBlock} */ (depBlock)
+					);
 					try {
 						let failed = false;
 						parser.inFunctionScope(true, [], () => {

package/lib/dependencies/context/ImportMetaContextDependencyParserPlugin.js

@@ -105,8 +105,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 				/** @type {RawReferencedExports | undefined} */
 				let exports;
 				if (optionsNode) {
-					for (const prop of /** @type {ObjectExpression} */ (optionsNode)
-						.properties) {
+					for (const prop of optionsNode.properties) {
 						if (prop.type !== "Property" || prop.key.type !== "Identifier") {
 							errors.push(
 								createError(

package/lib/dependencies/context/ImportMetaGlobDependencyParserPlugin.js

@@ -11,7 +11,6 @@ const {
 const ImportMetaGlobDependency = require("./ImportMetaGlobDependency");
 const { parseImportMetaGlobCall } = require("./ImportMetaGlobHelpers");
 
-/** @import { CallExpression } from "estree" */
 /** @import JavascriptParser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "ImportMetaGlobDependencyParserPlugin";
@@ -38,7 +37,7 @@ module.exports = class ImportMetaGlobDependencyParserPlugin {
 				options: globOptions,
 				errors,
 				warnings
-			} = parseImportMetaGlobCall(/** @type {CallExpression} */ (expr), parser);
+			} = parseImportMetaGlobCall(expr, parser);
 			for (const warning of warnings) {
 				parser.state.module.addWarning(warning);
 			}
@@ -58,11 +57,9 @@ module.exports = class ImportMetaGlobDependencyParserPlugin {
 					exhaustive: globOptions.exhaustive,
 					caseSensitive: globOptions.caseSensitive,
 					referencedExports: globOptions.referencedExports,
-					namespaceObject:
-						/** @type {import("../../module/Module").BuildMeta} */
-						(parser.state.module.buildMeta).strictHarmonyModule
-							? "strict"
-							: true,
+					namespaceObject: parser.state.module.buildMeta.strictHarmonyModule
+						? "strict"
+						: true,
 					mode: globOptions.mode,
 					category: "esm"
 				},

package/lib/dependencies/context/ImportMetaGlobHelpers.js

@@ -87,9 +87,7 @@ const staticStringFromExpr = (expr, parser) => {
 		return /** @type {string} */ (evaluated.string);
 	}
 	if (expr.type === "TemplateLiteral" && expr.expressions.length === 0) {
-		const cooked = /** @type {import("estree").TemplateElement} */ (
-			expr.quasis[0]
-		).value.cooked;
+		const cooked = expr.quasis[0].value.cooked;
 		if (cooked !== null && cooked !== undefined) return cooked;
 	}
 };
@@ -189,7 +187,10 @@ const staticImportMetaGlobQueryKeyFromPropName = (propName, parser) => {
 		if (typeof propName.value === "number") return String(propName.value);
 		if (typeof propName.value === "boolean") return String(propName.value);
 	}
-	const keyNode = /** @type {unknown} */ (propName);
+	const keyNode =
+		/** @type {typeof propName | { type: "Computed", expression: Expression }} */ (
+			propName
+		);
 	if (
 		typeof keyNode === "object" &&
 		keyNode !== null &&
@@ -197,10 +198,7 @@ const staticImportMetaGlobQueryKeyFromPropName = (propName, parser) => {
 		keyNode.type === "Computed" &&
 		"expression" in keyNode
 	) {
-		return staticImportMetaGlobQueryKeyFromExpr(
-			/** @type {Expression} */ (keyNode.expression),
-			parser
-		);
+		return staticImportMetaGlobQueryKeyFromExpr(keyNode.expression, parser);
 	}
 };
 
@@ -551,7 +549,7 @@ const parseImportMetaGlobCall = (expr, parser) => {
 	}
 
 	const rawGlobPatterns = parseStaticGlobPatternsFromExpr(
-		/** @type {Expression} */ (directoryNode),
+		directoryNode,
 		parser,
 		warnings
 	);
@@ -605,7 +603,7 @@ const parseImportMetaGlobCall = (expr, parser) => {
 	const compilerContext = parser.state.compilation.compiler.context;
 	const globOptions =
 		optionsNode && optionsNode.type === "ObjectExpression"
-			? /** @type {ObjectExpression} */ (optionsNode)
+			? optionsNode
 			: undefined;
 	const { eager, importName, query, base, exhaustive, caseSensitive } =
 		parseImportMetaGlobOptionsObject(globOptions, parser, warnings);

package/lib/dependencies/core/CachedConstDependency.js

@@ -127,12 +127,15 @@ CachedConstDependency.Template = class CachedConstDependencyTemplate extends (
 			? initFragments
 			: chunkInitFragments
 		).push(
-			new InitFragment(
-				`var ${dep.identifier} = ${dep.expression};\n`,
-				InitFragment.STAGE_CONSTANTS,
-				// For a chunk we inject expression after imports
-				dep.place === CachedConstDependency.PLACE_MODULE ? 0 : 10,
-				`const ${dep.identifier}`
+			// Its content is fixed, so it fits either list's render context.
+			/** @type {DependencyTemplateContext["initFragments"][number] & DependencyTemplateContext["chunkInitFragments"][number]} */ (
+				new InitFragment(
+					`var ${dep.identifier} = ${dep.expression};\n`,
+					InitFragment.STAGE_CONSTANTS,
+					// For a chunk we inject expression after imports
+					dep.place === CachedConstDependency.PLACE_MODULE ? 0 : 10,
+					`const ${dep.identifier}`
+				)
 			)
 		);
 

package/lib/dependencies/css/CssIcssExportDependency.js

@@ -141,8 +141,7 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 		/** @type {CssGeneratorLocalIdentName} */
 		(generator.options.localIdentName);
 	const relativeResourcePath = makePathsRelative(
-		/** @type {string} */
-		(runtimeTemplate.compilation.compiler.context),
+		runtimeTemplate.compilation.compiler.context,
 		/** @type {string} */
 		(module.getResource()),
 		runtimeTemplate.compilation.compiler.root
@@ -197,8 +196,8 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 
 		contentHash = digestNonNumericOnly(
 			hash,
-			/** @type {string} */ (runtimeTemplate.outputOptions.hashDigest),
-			/** @type {number} */ (runtimeTemplate.outputOptions.hashDigestLength)
+			runtimeTemplate.outputOptions.hashDigest,
+			runtimeTemplate.outputOptions.hashDigestLength
 		);
 	}
 
@@ -651,7 +650,7 @@ const EMPTY_INDEX = new Map();
  * type (CSS and JS), so this survives both passes — the index is built once per
  * build instead of once per `apply`. Weakly held, so it never keeps a module
  * alive.
- * @type {WeakMap<CssModule, { buildInfo: unknown, index: Map<string, CssIcssImportDependency[]> }>}
+ * @type {WeakMap<CssModule, { buildInfo: CssModule["buildInfo"], index: Map<string, CssIcssImportDependency[]> }>}
  */
 const moduleImportIndexes = new WeakMap();
 
@@ -1022,7 +1021,7 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 		} else {
 			references.push(
 				CssIcssExportDependencyTemplate.getIdentifier(
-					/** @type {string} */ (entry.value),
+					entry.value,
 					entry,
 					templateContext
 				)
@@ -1031,7 +1030,7 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 			const matches = getExportIndex(
 				cache,
 				/** @type {CssModule} */ (templateContext.module)
-			).get(/** @type {string} */ (entry.value));
+			).get(entry.value);
 			if (matches) {
 				for (const d of matches) {
 					if (d.exportMode === EXPORT_MODE.NONE) continue;

package/lib/dependencies/css/CssIcssImportDependency.js

@@ -107,9 +107,7 @@ class CssIcssImportDependency extends CssImportDependency {
 			/** @type {CssGenerator | undefined} */
 			(module.generator);
 		const convention =
-			generator &&
-			/** @type {CssGeneratorExportsConvention | undefined} */
-			(generator.options && generator.options.exportsConvention);
+			generator && generator.options && generator.options.exportsConvention;
 		const exportsInfo = moduleGraph.getExportsInfo(module);
 		const names = convention
 			? this.getImportNameConventionNames(convention)

package/lib/dependencies/css/CssUrlDependency.js

@@ -94,7 +94,7 @@ class CssUrlDependency extends ModuleDependency {
 			module.buildInfo
 		);
 		if (buildInfo && buildInfo.hash) {
-			hash.update(/** @type {string} */ (buildInfo.hash));
+			hash.update(buildInfo.hash);
 		}
 	}
 
@@ -231,11 +231,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 				break;
 		}
 
-		source.replace(
-			dep.range[0],
-			dep.range[1] - 1,
-			/** @type {string} */ (newValue)
-		);
+		source.replace(dep.range[0], dep.range[1] - 1, newValue);
 	}
 
 	/**

package/lib/dependencies/esm/ESMDetectionParserPlugin.js

@@ -23,7 +23,6 @@ const getEnvironmentNotSupportAsyncWarning = memoize(() =>
 	require("../../errors/EnvironmentNotSupportAsyncWarning")
 );
 
-/** @import { BuildInfo, BuildMeta } from "../../module/Module" */
 /** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "ESMDetectionParserPlugin";
@@ -82,9 +81,8 @@ module.exports = class ESMDetectionParserPlugin {
 		parser.hooks.topLevelAwait.tap(PLUGIN_NAME, (node) => {
 			const module = parser.state.module;
 			enableHarmony(false);
-			/** @type {BuildMeta} */
-			(module.buildMeta).async = true;
-			const buildInfo = /** @type {BuildInfo} */ (module.buildInfo);
+			module.buildMeta.async = true;
+			const buildInfo = module.buildInfo;
 			if (node.type === "AwaitExpression") {
 				// Record for a possible `await` -> `(yield …)` rewrite when the module
 				// is lowered to a generator (target without `async`/`await`).

package/lib/dependencies/esm/ESMExportExpressionDependency.js

@@ -30,8 +30,8 @@ const DEFAULT_EXPORT_NAME = "default";
 /** @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 */
+/** @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 {

package/lib/dependencies/esm/ESMExportImportedSpecifierDependency.js

@@ -14,6 +14,7 @@ const {
 	isInlineExportsEnabled,
 	isInlinedUsedName
 } = require("../../optimize/InlineExports");
+const LazyBarrels = require("../../optimize/LazyBarrels");
 const {
 	getKnownExportNames,
 	getMakeDeferredNamespaceModeFromExportsType
@@ -899,9 +900,7 @@ class ESMExportImportedSpecifierDependency extends ESMImportDependency {
 					runtime,
 					referencedExports,
 					[],
-					/** @type {InstanceType<ExportInfo>} */ (
-						mode.partialNamespaceExportInfo
-					)
+					mode.partialNamespaceExportInfo
 				);
 				return referencedExports;
 			}
@@ -917,9 +916,7 @@ class ESMExportImportedSpecifierDependency extends ESMImportDependency {
 					runtime,
 					referencedExports,
 					[],
-					/** @type {InstanceType<ExportInfo>} */ (
-						mode.partialNamespaceExportInfo
-					),
+					mode.partialNamespaceExportInfo,
 					mode.type === "reexport-fake-namespace-object"
 				);
 				return referencedExports;
@@ -1387,6 +1384,11 @@ ESMExportImportedSpecifierDependency.Template = class ESMExportImportedSpecifier
 
 		const mode = dep.getMode(moduleGraph, runtime);
 
+		// deferred by lazy barrel: never resolved, renders nothing
+		if (mode.type === "missing" && LazyBarrels.isLazy(moduleGraph, dep)) {
+			return;
+		}
+
 		// a wrapped module has no shared-scope symbols to redirect reexports to
 		if (concatenationScope && !concatenationScope.isWrapped()) {
 			switch (mode.type) {
@@ -1457,15 +1459,13 @@ ESMExportImportedSpecifierDependency.Template = class ESMExportImportedSpecifier
 			concatenationScope !== undefined &&
 			concatenationScope.isModuleInScope(importedModule);
 		const importVar = inScope
-			? /** @type {ConcatenationScope} */ (
-					concatenationScope
-				).createModuleReference(importedModule, { asiSafe: true })
+			? concatenationScope.createModuleReference(importedModule, {
+					asiSafe: true
+				})
 			: dep.getImportVar(moduleGraph);
 
 		const defaultImportVar = inScope
-			? /** @type {ConcatenationScope} */ (
-					concatenationScope
-				).createModuleReference(importedModule, {
+			? concatenationScope.createModuleReference(importedModule, {
 					ids: ["default"],
 					asiSafe: true
 				})
@@ -1473,9 +1473,7 @@ ESMExportImportedSpecifierDependency.Template = class ESMExportImportedSpecifier
 
 		// whole-namespace modes need the original export names, not mangled ones
 		const namespaceImportVar = inScope
-			? /** @type {ConcatenationScope} */ (
-					concatenationScope
-				).createModuleReference(importedModule, {
+			? concatenationScope.createModuleReference(importedModule, {
 					asiSafe: true,
 					mangleableNamespace: true
 				})
@@ -1560,9 +1558,9 @@ ESMExportImportedSpecifierDependency.Template = class ESMExportImportedSpecifier
 							moduleGraph
 								.getExportsInfo(module)
 								.getUsedName(/** @type {string} */ (mode.name), runtime),
-							/** @type {ConcatenationScope} */ (
-								concatenationScope
-							).createModuleReference(importedModule, { asiSafe: true }),
+							concatenationScope.createModuleReference(importedModule, {
+								asiSafe: true
+							}),
 							"",
 							runtimeRequirements
 						)

package/lib/dependencies/esm/ESMExportSpecifierDependency.js

@@ -8,13 +8,14 @@
 const Dependency = require("../../graph/Dependency");
 const { isInlinedUsedName } = require("../../optimize/InlineExports");
 const makeSerializable = require("../../util/makeSerializable");
+const { getRuntimeKey } = require("../../util/runtime");
 const NullDependency = require("../core/NullDependency");
 const ESMExportInitFragment = require("./ESMExportInitFragment");
 
 const { ExportBindingType } = ESMExportInitFragment;
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { ExportsSpec, LazyRole, UpdateHashContext } from "../../graph/Dependency" */
+/** @import { DependencyKinds, ExportsSpec, LazyRole, UpdateHashContext } from "../../graph/Dependency" */
 /** @import Module, { BuildInfo } from "../../module/Module" */
 /** @import Hash from "../../util/Hash" */
 /** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
@@ -204,12 +205,22 @@ ESMExportSpecifierDependency.Template = class ESMExportSpecifierDependencyTempla
 			meta !== undefined &&
 			meta.onDemandExports === true;
 
+		// a module library may have moved the binding to the chunk's scope
+		const live =
+			meta !== undefined && meta.liveBindings !== undefined
+				? meta.liveBindings.get(dep.id)
+				: undefined;
+		const local =
+			live !== undefined && live.runtimes.has(getRuntimeKey(runtime))
+				? live.name
+				: dep.id;
+
 		/** @type {ExportMap} */
 		const map = new Map();
 		map.set(used, {
-			value: `/* binding */ ${dep.id}`,
+			value: `/* binding */ ${local}`,
 			type: valueFormat ? ExportBindingType.Value : ExportBindingType.Getter,
-			finalName: dep.id
+			finalName: local
 		});
 		initFragments.push(
 			new ESMExportInitFragment(
@@ -222,4 +233,10 @@ ESMExportSpecifierDependency.Template = class ESMExportSpecifierDependencyTempla
 	}
 };
 
+/** @type {Set<keyof DependencyKinds>} */
+ESMExportSpecifierDependency.KINDS = new Set([
+	...NullDependency.KINDS,
+	"esm-export-specifier"
+]);
+
 module.exports = ESMExportSpecifierDependency;

package/lib/dependencies/esm/ESMExports.js

@@ -7,12 +7,6 @@
 
 const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
 
-/** @import { BuildInfo } from "../../module/Module" */
-/**
- * @import {
- * 	JavascriptModuleBuildMeta
- * } from "../../javascript/JavascriptModule"
- */
 /** @import { JavascriptParserState } from "../../javascript/JavascriptParser" */
 
 /** @type {WeakMap<JavascriptParserState, boolean>} */
@@ -29,11 +23,9 @@ module.exports.enable = (parserState, isStrictHarmony) => {
 	if (value === false) return;
 	parserStateExportsState.set(parserState, true);
 	if (value !== true) {
-		const buildMeta =
-			/** @type {JavascriptModuleBuildMeta} */
-			(parserState.module.buildMeta);
+		const buildMeta = parserState.module.buildMeta;
 		buildMeta.exportsType = "namespace";
-		const buildInfo = /** @type {BuildInfo} */ (parserState.module.buildInfo);
+		const buildInfo = parserState.module.buildInfo;
 		buildInfo.strict = true;
 		buildInfo.exportsArgument = RuntimeGlobals.exports;
 		if (isStrictHarmony) {