webpack 5.110.2 → 5.111.0

package/lib/debug/ProfilingPlugin.js

@@ -12,6 +12,7 @@ const {
 	WEBASSEMBLY_MODULES
 } = require("../ModuleTypeConstants");
 const { dirname, mkdirpSync } = require("../util/fs");
+const { fileUrlToPath } = require("../util/identifier");
 
 /** @import { Session } from "inspector" */
 /** @import { FullTap } from "tapable" */
@@ -258,6 +259,9 @@ class ProfilingPlugin {
 	 * @param {ProfilingPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
+		if (typeof options.outputPath === "string") {
+			options.outputPath = fileUrlToPath(options.outputPath);
+		}
 		/** @type {ProfilingPluginOptions} */
 		this.options = options;
 	}

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const RuntimeGlobals = require("../RuntimeGlobals");
+const { recordOptimizationBailout } = require("../util/buildDiagnostics");
 const AMDDefineDependency = require("./AMDDefineDependency");
 const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
 const AMDRequireContextDependency = require("./AMDRequireContextDependency");
@@ -35,6 +36,7 @@ const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
  * } from "../../declarations/WebpackOptions"
  */
 /** @import Dependency from "../Dependency" */
+/** @import { BuildInfo } from "../Module" */
 /** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
 /**
  * @import JavascriptParser, {
@@ -353,9 +355,10 @@ class AMDDefineDependencyParserPlugin {
 				return;
 		}
 		DynamicExports.bailout(parser.state);
-		parser.state.compilation.moduleGraph
-			.getOptimizationBailout(parser.state.module)
-			.push("AMD bailout: define() prevents static exports analysis");
+		recordOptimizationBailout(
+			/** @type {BuildInfo} */ (parser.state.module.buildInfo),
+			"AMD bailout: define() prevents static exports analysis"
+		);
 		/** @type {Identifier[] | null} */
 		let fnParams = null;
 		let fnParamsOffset = 0;

package/lib/dependencies/AMDRuntimeModules.js

@@ -25,6 +25,15 @@ class AMDDefineRuntimeModule extends RuntimeModule {
 		return false;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
@@ -58,6 +67,15 @@ class AMDOptionsRuntimeModule extends RuntimeModule {
 		this.options = options;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -528,7 +528,9 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 				: ids;
 			requireExpr = concatenationScope.createModuleReference(importedModule, {
 				ids: requestedIds.length > 0 ? requestedIds : undefined,
-				asiSafe: true,
+				// a used reexport keeps its assignment, so only an unused one is
+				// left standing where the original statement began
+				asiSafe: used ? true : dep.asiSafe,
 				moduleExportsAccess: true
 			});
 		} else {

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -7,6 +7,7 @@
 
 const RuntimeGlobals = require("../RuntimeGlobals");
 const { evaluateToString } = require("../javascript/JavascriptParserHelpers");
+const { recordOptimizationBailout } = require("../util/buildDiagnostics");
 const formatLocation = require("../util/formatLocation");
 const { propertyAccess } = require("../util/property");
 const CommonJsExportRequireDependency = require("./CommonJsExportRequireDependency");
@@ -38,7 +39,7 @@ const FUNCTION_PROPERTY_DROP_HEAD =
  * } from "estree"
  */
 /** @import { ExportInfoName } from "../Dependency" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { BuildInfo } from "../Module" */
 /** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
 /**
  * @import JavascriptParser, {
@@ -357,15 +358,6 @@ const getObjectExportKind = (property) => {
 const PLUGIN_NAME = "CommonJsExportsParserPlugin";
 
 class CommonJsExportsParserPlugin {
-	/**
-	 * Creates an instance of CommonJsExportsParserPlugin.
-	 * @param {ModuleGraph} moduleGraph module graph
-	 */
-	constructor(moduleGraph) {
-		/** @type {ModuleGraph} */
-		this.moduleGraph = moduleGraph;
-	}
-
 	/**
 	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {JavascriptParser} parser the parser
@@ -406,9 +398,10 @@ class CommonJsExportsParserPlugin {
 		 * @param {string} reason reason
 		 */
 		const bailoutHint = (reason) => {
-			this.moduleGraph
-				.getOptimizationBailout(parser.state.module)
-				.push(`CommonJS bailout: ${reason}`);
+			recordOptimizationBailout(
+				/** @type {BuildInfo} */ (parser.state.module.buildInfo),
+				`CommonJS bailout: ${reason}`
+			);
 		};
 		/** @type {unknown} */
 		let keptAllExportsForState;
@@ -479,6 +472,9 @@ class CommonJsExportsParserPlugin {
 					requireCall.ids,
 					!parser.isStatementLevelExpression(expr)
 				);
+				dep.asiSafe = !parser.isAsiPosition(
+					/** @type {Range} */ (expr.range)[0]
+				);
 				dep.loc = parser.getLocation(expr);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.module.addDependency(dep);
@@ -670,6 +666,9 @@ class CommonJsExportsParserPlugin {
 							false
 						);
 						dep.getter = reexport.getter;
+						dep.asiSafe = !parser.isAsiPosition(
+							/** @type {Range} */ (expr.range)[0]
+						);
 						dep.loc = parser.getLocation(expr);
 						dep.optional = Boolean(parser.scope.inTry);
 						parser.state.module.addDependency(dep);

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -212,6 +212,7 @@ const createRequireCallHandler = (
 				/** @type {Range} */ (expr.range)
 			);
 			if (binding) binding.dep = dep;
+			dep.asiSafe = !parser.isAsiPosition(/** @type {Range} */ (expr.range)[0]);
 			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.current.addDependency(dep);

package/lib/dependencies/CommonJsPlugin.js

@@ -254,9 +254,7 @@ class CommonJsPlugin {
 					);
 
 					new CommonJsImportsParserPlugin(parserOptions).apply(parser);
-					new CommonJsExportsParserPlugin(compilation.moduleGraph).apply(
-						parser
-					);
+					new CommonJsExportsParserPlugin().apply(parser);
 				};
 
 				normalModuleFactory.hooks.parser
@@ -285,6 +283,15 @@ class HarmonyModuleDecoratorRuntimeModule extends RuntimeModule {
 		return false;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code
@@ -326,6 +333,15 @@ class NodeModuleDecoratorRuntimeModule extends RuntimeModule {
 		return false;
 	}
 
+	/**
+	 * The `[handlerMap, key]` pairs this module installs onto a chunk handler map
+	 * such as `__webpack_require__.f`, or `null` where it cannot name them.
+	 * @returns {[string, string][] | null} installed chunk handlers (do not mutate)
+	 */
+	getInstalledChunkHandlers() {
+		return RuntimeModule.NO_CHUNK_HANDLERS;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code

package/lib/dependencies/CommonJsRequireDependency.js

@@ -20,6 +20,7 @@ const HarmonyImportGuard = require("./HarmonyImportGuard");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
+/** @import ConcatenationScope from "../ConcatenationScope" */
 /**
  * @import {
  * 	GetConditionFn,
@@ -30,12 +31,13 @@ const ModuleDependency = require("./ModuleDependency");
 /** @import { DependencyTemplateContext } from "../DependencyTemplate" */
 /** @import Module from "../Module" */
 /** @import ModuleGraph from "../ModuleGraph" */
+/** @import ModuleGraphConnection from "../ModuleGraphConnection" */
 /** @import { Range } from "../javascript/JavascriptParser" */
 /** @import { UsedByExports } from "../optimize/InnerGraph" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 /** @import { DependencyGuard } from "./HarmonyImportGuard" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined, boolean | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined, boolean | undefined]>} ObjectSerializerContext */
 
 /**
  * Trims a member-access path at the first segment that is definitively not a
@@ -91,6 +93,10 @@ class CommonJsRequireDependency extends ModuleDependency {
 		// `new require(...)`; see the template for the return-value rule
 		/** @type {boolean} */
 		this.callNew = false;
+		// whether the position the call sits at cannot be joined to what precedes
+		// it by ASI; only meaningful once the call renders as a module reference
+		/** @type {boolean | undefined} */
+		this.asiSafe = undefined;
 	}
 
 	get type() {
@@ -200,6 +206,19 @@ class CommonJsRequireDependency extends ModuleDependency {
 		return concatenateCommonJsModules && this._canConcatenate;
 	}
 
+	/**
+	 * @param {ModuleGraphConnection} connection the active connection of this dependency
+	 * @param {ConcatenationScope} concatenationScope the concatenation scope
+	 * @returns {boolean} true when the call becomes a module reference
+	 */
+	rendersAsConcatenatedReference(connection, concatenationScope) {
+		return (
+			this._canConcatenate &&
+			this.valueRange !== undefined &&
+			concatenationScope.isModuleInScope(connection.module)
+		);
+	}
+
 	/**
 	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
@@ -211,7 +230,8 @@ class CommonJsRequireDependency extends ModuleDependency {
 			.write(this.branchGuards)
 			.write(this._canConcatenate)
 			.write(this.callNew)
-			.write(this.usedByExports);
+			.write(this.usedByExports)
+			.write(this.asiSafe);
 		super.serialize(context);
 	}
 
@@ -231,7 +251,9 @@ class CommonJsRequireDependency extends ModuleDependency {
 		this.callNew = c4.read();
 		const c5 = c4.rest;
 		this.usedByExports = c5.read();
-		super.deserialize(c5.rest);
+		const c6 = c5.rest;
+		this.asiSafe = c6.read();
+		super.deserialize(c6.rest);
 	}
 }
 
@@ -278,9 +300,9 @@ CommonJsRequireDependency.Template = class CommonJsRequireDependencyTemplate ext
 		if (
 			connection &&
 			concatenationScope !== undefined &&
-			dep.valueRange !== undefined &&
-			concatenationScope.isModuleInScope(connection.module)
+			dep.rendersAsConcatenatedReference(connection, concatenationScope)
 		) {
+			const valueRange = /** @type {Range} */ (dep.valueRange);
 			let content = concatenationScope.createModuleReference(
 				connection.module,
 				{
@@ -288,7 +310,9 @@ CommonJsRequireDependency.Template = class CommonJsRequireDependencyTemplate ext
 					ids: isRequireEsmModuleExportsModule(connection.module, moduleGraph)
 						? [ESM_MODULE_EXPORTS_NAME]
 						: undefined,
-					asiSafe: true,
+					// `new` wraps the reference in a call, so only a plain
+					// replacement inherits the original call's position
+					asiSafe: dep.callNew ? true : dep.asiSafe,
 					moduleExportsAccess: true
 				}
 			);
@@ -300,8 +324,7 @@ CommonJsRequireDependency.Template = class CommonJsRequireDependencyTemplate ext
 				);
 				content = `${RuntimeGlobals.constructRequire}(${content})`;
 			}
-			source.replace(dep.valueRange[0], dep.valueRange[1] - 1, content);
-			concatenationScope.registerReplacedRequire(dep.valueRange);
+			source.replace(valueRange[0], valueRange[1] - 1, content);
 			return;
 		}
 		const importedModule = /** @type {Module} */ (moduleGraph.getModule(dep));

package/lib/dependencies/ContextDependencyTemplateAsRequireCall.js

@@ -22,11 +22,9 @@ class ContextDependencyTemplateAsRequireCall
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(
-		dependency,
-		source,
-		{ runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements }
-	) {
+	apply(dependency, source, templateContext) {
+		const { runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements } =
+			templateContext;
 		const dep = /** @type {ContextDependency} */ (dependency);
 		let moduleExports = runtimeTemplate.moduleExports({
 			module: moduleGraph.getModule(dep),
@@ -49,8 +47,7 @@ class ContextDependencyTemplateAsRequireCall
 						source.replace(rep.range[0], rep.range[1] - 1, rep.value);
 					}
 				}
-				source.replace(dep.valueRange[1], range[1] - 1, ")");
-				source.replace(range[0], dep.valueRange[0] - 1, `${moduleExports}(`);
+				this.replaceCall(dep, source, moduleExports, templateContext);
 			} else {
 				source.replace(range[0], range[1] - 1, moduleExports);
 			}
@@ -58,6 +55,22 @@ class ContextDependencyTemplateAsRequireCall
 			source.replace(range[0], range[1] - 1, moduleExports);
 		}
 	}
+
+	/**
+	 * Rewrites the call around its request, dropping anything the original one
+	 * carried after it. Overridden where a later argument must be kept.
+	 * @param {ContextDependency} dep the dependency
+	 * @param {ReplaceSource} source the current replace source which can be modified
+	 * @param {string} moduleExports the expression the request is passed to
+	 * @param {DependencyTemplateContext} templateContext the context object
+	 * @returns {void}
+	 */
+	replaceCall(dep, source, moduleExports, templateContext) {
+		const range = /** @type {Range} */ (dep.range);
+		const valueRange = /** @type {Range} */ (dep.valueRange);
+		source.replace(valueRange[1], range[1] - 1, ")");
+		source.replace(range[0], valueRange[0] - 1, `${moduleExports}(`);
+	}
 }
 
 module.exports = ContextDependencyTemplateAsRequireCall;

package/lib/dependencies/CssIcssExportDependency.js

@@ -916,7 +916,13 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 			}
 
 			if (entry.exportType === EXPORT_TYPE.GRID_CUSTOM_IDENTIFIER) {
-				value += `-${entry.name}`;
+				// The suffix names what the identifier was built from, so it follows a
+				// `@value` to its resolved name — both spellings select the same line.
+				value += `-${
+					isReference
+						? /** @type {string[]} */ (entry.value)[0]
+						: /** @type {string} */ (entry.value)
+				}`;
 			}
 
 			if (isJs && entry.exportMode !== EXPORT_MODE.NONE) {

package/lib/dependencies/HarmonyCompatibilityDependency.js

@@ -17,11 +17,17 @@ const NullDependency = require("./NullDependency");
 const getJavascriptModulesPlugin = memoize(() =>
 	require("../javascript/JavascriptModulesPlugin")
 );
+// Same reason: the deferred-namespace runtime imports dependencies from here.
+const getDeferredCycleHelpers = memoize(() =>
+	require("../runtime/MakeDeferredNamespaceObjectRuntime")
+);
 
 /** @import { ReplaceSource } from "webpack-sources" */
 /** @import Dependency from "../Dependency" */
 /** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { BuildMeta } from "../Module" */
+/** @import Module, { BuildMeta } from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import ChunkGraph, { ModuleId } from "../ChunkGraph" */
 /**
  * @import {
  * 	JavascriptModuleBuildInfo
@@ -39,6 +45,39 @@ makeSerializable(
 	"webpack/lib/dependencies/HarmonyCompatibilityDependency"
 );
 
+/**
+ * Key shared by the async modules of one strongly-connected component. The spec
+ * records one `[[EvaluationError]]` per component, so a member that already
+ * fulfilled still has to report the root's error afterwards.
+ * @param {ModuleGraph} moduleGraph the module graph
+ * @param {ChunkGraph} chunkGraph the chunk graph
+ * @param {Module} module the async module
+ * @returns {ModuleId | null} the group key, or null when it is not in an async cycle
+ */
+const getAsyncCycleGroupId = (moduleGraph, chunkGraph, module) => {
+	const { getDeferredCycleModules } = getDeferredCycleHelpers();
+	const peers = getDeferredCycleModules(moduleGraph, module);
+	if (peers === null) return null;
+	// The component's smallest async member id names the group, so every member
+	// emits the same key and none has to carry the whole peer list.
+	let groupId = null;
+	let asyncPeerCount = 0;
+	for (const peer of peers) {
+		if (!moduleGraph.isAsync(peer)) continue;
+		asyncPeerCount++;
+		const id = chunkGraph.getModuleId(peer);
+		if (id !== null && (groupId === null || `${id}` < `${groupId}`)) {
+			groupId = id;
+		}
+	}
+	if (asyncPeerCount === 0) return null;
+	const ownId = chunkGraph.getModuleId(module);
+	if (ownId !== null && (groupId === null || `${ownId}` < `${groupId}`)) {
+		groupId = ownId;
+	}
+	return groupId;
+};
+
 HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate extends (
 	NullDependency.Template
 ) {
@@ -56,6 +95,7 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate
 			module,
 			runtimeTemplate,
 			moduleGraph,
+			chunkGraph,
 			initFragments,
 			runtimeRequirements,
 			runtime,
@@ -99,9 +139,23 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate
 		}
 		if (moduleGraph.isAsync(module)) {
 			runtimeRequirements.add(RuntimeGlobals.module);
-			const hasAwait = /** @type {BuildMeta} */ (module.buildMeta).async
-				? ", 1"
-				: "";
+			// Only `strictModuleErrorHandling` keeps a recorded error for later
+			// requires, so the component's peers are worth naming only then.
+			const cycleGroupId = runtimeTemplate.outputOptions
+				.strictModuleErrorHandling
+				? getAsyncCycleGroupId(moduleGraph, chunkGraph, module)
+				: null;
+			// The group is keyed by module id, so the runtime needs `module.id`.
+			if (cycleGroupId !== null) {
+				runtimeRequirements.add(RuntimeGlobals.moduleId);
+			}
+			const isAsyncBody = /** @type {BuildMeta} */ (module.buildMeta).async;
+			const hasAwait =
+				cycleGroupId === null
+					? isAsyncBody
+						? ", 1"
+						: ""
+					: `, ${isAsyncBody ? 1 : 0}, ${JSON.stringify(cycleGroupId)}`;
 			// A module-scope `await using` is disposed when its scope ends, so the body
 			// needs a block that closes before the module reports completion —
 			// otherwise dependents run before disposal is awaited.

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -218,14 +218,19 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						: undefined,
 				constValue
 			);
+			const isAnonymousClass =
+				(node.type === "ClassDeclaration" || node.type === "ClassExpression") &&
+				!node.id;
 			dep.isAnonymousDefault =
 				this.options.anonymousDefaultExportName !== false &&
 				(node.type === "ArrowFunctionExpression" ||
+					isAnonymousClass ||
 					((node.type === "FunctionDeclaration" ||
-						node.type === "FunctionExpression" ||
-						node.type === "ClassDeclaration" ||
-						node.type === "ClassExpression") &&
+						node.type === "FunctionExpression") &&
 						!node.id));
+			// A class observes its own name from a static initializer, which runs
+			// before the name could be patched afterwards, so it is named in place.
+			dep.isAnonymousDefaultClass = dep.isAnonymousDefault && isAnonymousClass;
 			dep.setLocWithIndex(parser.getLocation(statement), -1);
 			parser.state.current.addDependency(dep);
 			getInnerGraphUtils(parser.state.compilation).addVariableUsage(

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -12,8 +12,11 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const { InlinedUsedName } = require("../optimize/InlineExports");
 const makeSerializable = require("../util/makeSerializable");
 const { propertyAccess } = require("../util/property");
-const ExportBindingInitFragment = require("./ExportBindingInitFragment");
+
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
+
+const { ExportBindingType } = HarmonyExportInitFragment;
+
 const NullDependency = require("./NullDependency");
 
 const DEFAULT_EXPORT_NAME = "default";
@@ -26,8 +29,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]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, string, DeclarationId | undefined, boolean]>} ObjectSerializerContext */
+/** @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" */
 /**
  * @import {
@@ -54,6 +57,8 @@ class HarmonyExportExpressionDependency extends NullDependency {
 		this.constValue = constValue;
 		/** @type {boolean} */
 		this.isAnonymousDefault = false;
+		/** @type {boolean} */
+		this.isAnonymousDefaultClass = false;
 	}
 
 	get type() {
@@ -126,6 +131,7 @@ class HarmonyExportExpressionDependency extends NullDependency {
 			.write(this.prefix)
 			.write(this.declarationId)
 			.write(this.isAnonymousDefault)
+			.write(this.isAnonymousDefaultClass)
 			.write(this.constValue);
 		super.serialize(context);
 	}
@@ -145,8 +151,10 @@ class HarmonyExportExpressionDependency extends NullDependency {
 		const c4 = c3.rest;
 		this.isAnonymousDefault = c4.read();
 		const c5 = c4.rest;
-		this.constValue = c5.read();
-		super.deserialize(c5.rest);
+		this.isAnonymousDefaultClass = c5.read();
+		const c6 = c5.rest;
+		this.constValue = c6.read();
+		super.deserialize(c6.rest);
 	}
 }
 
@@ -208,7 +216,10 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 			} else if (used) {
 				/** @type {ExportMap} */
 				const map = new Map();
-				map.set(used, `/* export default binding */ ${name}`);
+				map.set(used, {
+					value: `/* export default binding */ ${name}`,
+					type: ExportBindingType.Getter
+				});
 				initFragments.push(new HarmonyExportInitFragment(exportsName, map));
 			}
 
@@ -253,31 +264,19 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 						defaultIsUsed = true;
 						runtimeRequirements.add(RuntimeGlobals.exports);
 						// `export default <expr>` binds an immutable const declaration
-						const canUseValueBinding =
+						const valueFormat =
 							/** @type {import("../Module").BuildInfo} */ (module.buildInfo)
 								.isCircular === false;
-						if (canUseValueBinding) {
-							initFragments.push(
-								new ExportBindingInitFragment(
-									exportsName,
-									[
-										{
-											name: used,
-											value: `/* export default binding */ ${name}`,
-											bindingType: "value"
-										}
-									],
-									true
-								)
-							);
-						} else {
-							/** @type {ExportMap} */
-							const map = new Map();
-							map.set(used, name);
-							initFragments.push(
-								new HarmonyExportInitFragment(exportsName, map)
-							);
-						}
+
+						/** @type {ExportMap} */
+						const map = new Map();
+						map.set(used, {
+							value: name,
+							type: valueFormat
+								? ExportBindingType.Value
+								: ExportBindingType.Getter
+						});
+						initFragments.push(new HarmonyExportInitFragment(exportsName, map));
 					} else {
 						content = `/* unused harmony default export */ var ${name} = `;
 					}
@@ -308,6 +307,22 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 			}
 
 			if (dep.range) {
+				// `export default class {}` names the class "default", and a static
+				// initializer reads that name before any later fix-up could run, so
+				// the class is created as a property of that name instead.
+				if (dep.isAnonymousDefaultClass) {
+					source.replace(
+						dep.rangeStatement[0],
+						dep.range[0] - 1,
+						`${content}{ ${DEFAULT_EXPORT_NAME}: (${dep.prefix}`
+					);
+					source.replace(
+						dep.range[1],
+						dep.rangeStatement[1] - 0.5,
+						`) }.${DEFAULT_EXPORT_NAME};`
+					);
+					return;
+				}
 				source.replace(
 					dep.rangeStatement[0],
 					dep.range[0] - 1,