webpack 5.93.0 → 5.95.0

package/lib/dependencies/CssExportDependency.js

@@ -58,9 +58,9 @@ class CssExportDependency extends NullDependency {
 	 */
 	getExports(moduleGraph) {
 		const module = /** @type {CssModule} */ (moduleGraph.getParentModule(this));
-		const convention = /** @type {CssGenerator | CssExportsGenerator} */ (
-			module.generator
-		).convention;
+		const convention =
+			/** @type {CssGenerator | CssExportsGenerator} */
+			(module.generator).convention;
 		const names = this.getExportsConventionNames(this.name, convention);
 		return {
 			exports: names.map(name => ({
@@ -81,14 +81,14 @@ class CssExportDependency extends NullDependency {
 		const module = /** @type {CssModule} */ (
 			chunkGraph.moduleGraph.getParentModule(this)
 		);
-		const generator = /** @type {CssGenerator | CssExportsGenerator} */ (
-			module.generator
-		);
+		const generator =
+			/** @type {CssGenerator | CssExportsGenerator} */
+			(module.generator);
 		const names = this.getExportsConventionNames(
 			this.name,
 			generator.convention
 		);
-		hash.update(`exportsConvention`);
+		hash.update("exportsConvention");
 		hash.update(JSON.stringify(names));
 	}
 

package/lib/dependencies/CssImportDependency.js

@@ -26,9 +26,7 @@ const ModuleDependency = require("./ModuleDependency");
 class CssImportDependency extends ModuleDependency {
 	/**
 	 * Example of dependency:
-	 *
 	 * \@import url("landscape.css") layer(forms) screen and (orientation: landscape) screen and (orientation: landscape);
-	 *
 	 * @param {string} request request
 	 * @param {Range} range range of the argument
 	 * @param {string | undefined} layer layer

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -141,9 +141,9 @@ class CssLocalIdentifierDependency extends NullDependency {
 			this.name,
 			generator.convention
 		);
-		hash.update(`exportsConvention`);
+		hash.update("exportsConvention");
 		hash.update(JSON.stringify(names));
-		hash.update(`localIdentName`);
+		hash.update("localIdentName");
 		hash.update(generator.localIdentName);
 	}
 
@@ -178,7 +178,7 @@ class CssLocalIdentifierDependency extends NullDependency {
 const escapeCssIdentifier = (str, omitUnderscore) => {
 	const escaped = `${str}`.replace(
 		// cspell:word uffff
-		/[^a-zA-Z0-9_\u0081-\uffff-]/g,
+		/[^a-zA-Z0-9_\u0081-\uFFFF-]/g,
 		s => `\\${s}`
 	);
 	return !omitUnderscore && /^(?!--)[0-9-]/.test(escaped)

package/lib/dependencies/CssSelfLocalIdentifierDependency.js

@@ -43,8 +43,9 @@ class CssSelfLocalIdentifierDependency extends CssLocalIdentifierDependency {
 	 * @returns {string | null} an identifier to merge equal requests
 	 */
 	getResourceIdentifier() {
-		return `self`;
+		return "self";
 	}
+
 	/**
 	 * Returns the exported names
 	 * @param {ModuleGraph} moduleGraph module graph

package/lib/dependencies/CssUrlDependency.js

@@ -25,9 +25,9 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
-const getIgnoredRawDataUrlModule = memoize(() => {
-	return new RawDataUrlModule("data:,", `ignored-asset`, `(ignored asset)`);
-});
+const getIgnoredRawDataUrlModule = memoize(
+	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
+);
 
 class CssUrlDependency extends ModuleDependency {
 	/**
@@ -106,9 +106,8 @@ const cssEscapeString = str => {
 		return str.replace(/[\n\t ()'"\\]/g, m => `\\${m}`);
 	} else if (countQuotation <= countApostrophe) {
 		return `"${str.replace(/[\n"\\]/g, m => `\\${m}`)}"`;
-	} else {
-		return `'${str.replace(/[\n'\\]/g, m => `\\${m}`)}'`;
 	}
+	return `'${str.replace(/[\n'\\]/g, m => `\\${m}`)}'`;
 };
 
 CssUrlDependency.Template = class CssUrlDependencyTemplate extends (

package/lib/dependencies/DynamicExports.js

@@ -15,7 +15,7 @@ const parserStateExportsState = new WeakMap();
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.bailout = parserState => {
+module.exports.bailout = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	parserStateExportsState.set(parserState, false);
 	if (value === true) {
@@ -29,7 +29,7 @@ exports.bailout = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.enable = parserState => {
+module.exports.enable = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	if (value === false) return;
 	parserStateExportsState.set(parserState, true);
@@ -44,7 +44,7 @@ exports.enable = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.setFlagged = parserState => {
+module.exports.setFlagged = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	if (value !== true) return;
 	const buildMeta = /** @type {BuildMeta} */ (parserState.module.buildMeta);
@@ -56,7 +56,7 @@ exports.setFlagged = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {void}
  */
-exports.setDynamic = parserState => {
+module.exports.setDynamic = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	if (value !== true) return;
 	/** @type {BuildMeta} */
@@ -67,7 +67,7 @@ exports.setDynamic = parserState => {
  * @param {ParserState} parserState parser state
  * @returns {boolean} true, when enabled
  */
-exports.isEnabled = parserState => {
+module.exports.isEnabled = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	return value === true;
 };

package/lib/dependencies/ExportsInfoDependency.js

@@ -72,7 +72,7 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 				case UsageState.Unused:
 					return false;
 				case UsageState.NoInfo:
-					return undefined;
+					return;
 				case UsageState.Unknown:
 					return null;
 				default:
@@ -82,7 +82,6 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 		case "provideInfo":
 			return moduleGraph.getExportsInfo(module).isExportProvided(exportName);
 	}
-	return undefined;
 };
 
 class ExportsInfoDependency extends NullDependency {

package/lib/dependencies/HarmonyAcceptImportDependency.js

@@ -18,7 +18,7 @@ class HarmonyAcceptImportDependency extends HarmonyImportDependency {
 	 * @param {string} request the request string
 	 */
 	constructor(request) {
-		super(request, NaN);
+		super(request, Number.NaN);
 		this.weak = true;
 	}
 

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -112,11 +112,10 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 				break;
 			}
 			case "namespace": {
-				if (ids[0] === "__esModule") {
-					value = ids.length === 1 || undefined;
-				} else {
-					value = exportsInfo.isExportProvided(ids);
-				}
+				value =
+					ids[0] === "__esModule"
+						? ids.length === 1 || undefined
+						: exportsInfo.isExportProvided(ids);
 				break;
 			}
 			case "dynamic": {

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -145,30 +145,34 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			"HarmonyExportDependencyParserPlugin",
 			(statement, id, name, idx) => {
 				const settings = parser.getTagData(id, harmonySpecifierTag);
-				let dep;
 				const harmonyNamedExports = (parser.state.harmonyNamedExports =
 					parser.state.harmonyNamedExports || new Set());
 				harmonyNamedExports.add(name);
 				InnerGraph.addVariableUsage(parser, id, name);
-				if (settings) {
-					dep = new HarmonyExportImportedSpecifierDependency(
-						settings.source,
-						settings.sourceOrder,
-						settings.ids,
-						name,
-						harmonyNamedExports,
-						null,
-						exportPresenceMode,
-						null,
-						settings.assertions
-					);
-				} else {
-					dep = new HarmonyExportSpecifierDependency(id, name);
-				}
+				const dep = settings
+					? new HarmonyExportImportedSpecifierDependency(
+							settings.source,
+							settings.sourceOrder,
+							settings.ids,
+							name,
+							harmonyNamedExports,
+							null,
+							exportPresenceMode,
+							null,
+							settings.assertions
+						)
+					: new HarmonyExportSpecifierDependency(id, name);
 				dep.loc = Object.create(
 					/** @type {DependencyLocation} */ (statement.loc)
 				);
 				dep.loc.index = idx;
+				const isAsiSafe = !parser.isAsiPosition(
+					/** @type {Range} */
+					(statement.range)[0]
+				);
+				if (!isAsiSafe) {
+					parser.setAsiPosition(/** @type {Range} */ (statement.range)[1]);
+				}
 				parser.state.current.addDependency(dep);
 				return true;
 			}
@@ -202,6 +206,13 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					/** @type {DependencyLocation} */ (statement.loc)
 				);
 				dep.loc.index = idx;
+				const isAsiSafe = !parser.isAsiPosition(
+					/** @type {Range} */
+					(statement.range)[0]
+				);
+				if (!isAsiSafe) {
+					parser.setAsiPosition(/** @type {Range} */ (statement.range)[1]);
+				}
 				parser.state.current.addDependency(dep);
 				return true;
 			}

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -193,7 +193,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				source.replace(
 					dep.rangeStatement[0],
 					dep.range[0] - 1,
-					content + "(" + dep.prefix
+					`${content}(${dep.prefix}`
 				);
 				source.replace(dep.range[1], dep.rangeStatement[1] - 0.5, ");");
 				return;

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const ConditionalInitFragment = require("../ConditionalInitFragment");
 const Dependency = require("../Dependency");
 const { UsageState } = require("../ExportsInfo");
 const HarmonyLinkingError = require("../HarmonyLinkingError");
@@ -16,7 +17,11 @@ const { first, combine } = require("../util/SetHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const propertyAccess = require("../util/propertyAccess");
 const { propertyName } = require("../util/propertyName");
-const { getRuntimeKey, keyToRuntime } = require("../util/runtime");
+const {
+	getRuntimeKey,
+	keyToRuntime,
+	filterRuntime
+} = require("../util/runtime");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
 const processExportInfo = require("./processExportInfo");
@@ -31,6 +36,7 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @typedef {import("../ExportsInfo").UsedName} UsedName */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
@@ -45,6 +51,7 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("./processExportInfo").ReferencedExports} ReferencedExports */
 
 /** @typedef {"missing"|"unused"|"empty-star"|"reexport-dynamic-default"|"reexport-named-default"|"reexport-namespace-object"|"reexport-fake-namespace-object"|"reexport-undefined"|"normal-reexport"|"dynamic-reexport"} ExportModeType */
 
@@ -69,6 +76,9 @@ class NormalReexportItem {
 	}
 }
 
+/** @typedef {Set<string>} ExportModeIgnored */
+/** @typedef {Set<string>} ExportModeHidden */
+
 class ExportMode {
 	/**
 	 * @param {ExportModeType} type type of the mode
@@ -88,11 +98,11 @@ class ExportMode {
 		this.partialNamespaceExportInfo = null;
 
 		// for "dynamic-reexport":
-		/** @type {Set<string> | null} */
+		/** @type {ExportModeIgnored | null} */
 		this.ignored = null;
 
 		// for "dynamic-reexport" | "empty-star":
-		/** @type {Set<string> | null} */
+		/** @type {ExportModeHidden | null} */
 		this.hidden = null;
 
 		// for "missing":
@@ -306,7 +316,8 @@ const getMode = (moduleGraph, dep, runtimeKey) => {
 				exportName,
 				[exportName],
 				exportsInfo.getReadOnlyExportInfo(exportName),
-				checked.has(exportName),
+				/** @type {Set<string>} */
+				(checked).has(exportName),
 				false
 			)
 	);
@@ -327,11 +338,17 @@ const getMode = (moduleGraph, dep, runtimeKey) => {
 	return mode;
 };
 
+/** @typedef {string[]} Ids */
+/** @typedef {Set<string>} Exports */
+/** @typedef {Set<string>} Checked */
+/** @typedef {Set<string>} Hidden */
+/** @typedef {Set<string>} IgnoredExports */
+
 class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	/**
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder the order in the original source file
-	 * @param {string[]} ids the requested export name of the imported module
+	 * @param {Ids} ids the requested export name of the imported module
 	 * @param {string | null} name the export name of for this module
 	 * @param {Set<string>} activeExports other named exports in the module
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency> | null} otherStarExports other star exports in the module before this import
@@ -388,7 +405,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {string[]} the imported id
+	 * @returns {Ids} the imported id
 	 */
 	getIds(moduleGraph) {
 		return moduleGraph.getMeta(this)[idsSymbol] || this.ids;
@@ -396,7 +413,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @param {string[]} ids the imported ids
+	 * @param {Ids} ids the imported ids
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
@@ -421,7 +438,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {ExportsInfo} exportsInfo exports info about the current module (optional)
 	 * @param {Module} importedModule the imported module (optional)
-	 * @returns {{exports?: Set<string>, checked?: Set<string>, ignoredExports: Set<string>, hidden?: Set<string>}} information
+	 * @returns {{exports?: Exports, checked?: Checked, ignoredExports: IgnoredExports, hidden?: Hidden}} information
 	 */
 	getStarReexports(
 		moduleGraph,
@@ -439,7 +456,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 		const ignoredExports = new Set(["default", ...this.activeExports]);
 
-		let hiddenExports = undefined;
+		let hiddenExports;
 		const otherStarExports =
 			this._discoverActiveExportsFromOtherStarExports(moduleGraph);
 		if (otherStarExports !== undefined) {
@@ -457,11 +474,11 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			};
 		}
 
-		/** @type {Set<string>} */
+		/** @type {Exports} */
 		const exports = new Set();
-		/** @type {Set<string>} */
+		/** @type {Checked} */
 		const checked = new Set();
-		/** @type {Set<string> | undefined} */
+		/** @type {Hidden | undefined} */
 		const hidden = hiddenExports !== undefined ? new Set() : undefined;
 
 		if (noExtraImports) {
@@ -489,7 +506,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				const exportInfo = exportsInfo.getReadOnlyExportInfo(name);
 				if (exportInfo.getUsed(runtime) === UsageState.Unused) continue;
 				if (hiddenExports !== undefined && hiddenExports.has(name)) {
-					/** @type {Set<string>} */
+					/** @type {ExportModeHidden} */
 					(hidden).add(name);
 					continue;
 				}
@@ -543,7 +560,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			case "reexport-named-default": {
 				if (!mode.partialNamespaceExportInfo)
 					return Dependency.EXPORTS_OBJECT_REFERENCED;
-				/** @type {string[][]} */
+				/** @type {ReferencedExports} */
 				const referencedExports = [];
 				processExportInfo(
 					runtime,
@@ -558,7 +575,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			case "reexport-fake-namespace-object": {
 				if (!mode.partialNamespaceExportInfo)
 					return Dependency.EXPORTS_OBJECT_REFERENCED;
-				/** @type {string[][]} */
+				/** @type {ReferencedExports} */
 				const referencedExports = [];
 				processExportInfo(
 					runtime,
@@ -574,6 +591,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				return Dependency.EXPORTS_OBJECT_REFERENCED;
 
 			case "normal-reexport": {
+				/** @type {ReferencedExports} */
 				const referencedExports = [];
 				for (const { ids, exportInfo, hidden } of mode.items) {
 					if (hidden) continue;
@@ -592,13 +610,13 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {{ names: string[], namesSlice: number, dependencyIndices: number[], dependencyIndex: number } | undefined} exported names and their origin dependency
 	 */
 	_discoverActiveExportsFromOtherStarExports(moduleGraph) {
-		if (!this.otherStarExports) return undefined;
+		if (!this.otherStarExports) return;
 
 		const i =
 			"length" in this.otherStarExports
 				? this.otherStarExports.length
 				: countIterable(this.otherStarExports);
-		if (i === 0) return undefined;
+		if (i === 0) return;
 
 		if (this.allStarExports) {
 			const { names, dependencyIndices } = moduleGraph.cached(
@@ -638,7 +656,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 		switch (mode.type) {
 			case "missing":
-				return undefined;
+				return;
 			case "dynamic-reexport": {
 				const from =
 					/** @type {ModuleGraphConnection} */
@@ -648,8 +666,11 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					from,
 					canMangle: false,
 					excludeExports: mode.hidden
-						? combine(mode.ignored, mode.hidden)
-						: mode.ignored,
+						? combine(
+								/** @type {ExportModeIgnored} */ (mode.ignored),
+								mode.hidden
+							)
+						: /** @type {ExportModeIgnored} */ (mode.ignored),
 					hideExports: mode.hidden,
 					dependencies: [from.module]
 				};
@@ -677,22 +698,20 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				};
 			}
 			case "reexport-dynamic-default": {
-				{
-					const from =
-						/** @type {ModuleGraphConnection} */
-						(moduleGraph.getConnection(this));
-					return {
-						exports: [
-							{
-								name: /** @type {string} */ (mode.name),
-								from,
-								export: ["default"]
-							}
-						],
-						priority: 1,
-						dependencies: [from.module]
-					};
-				}
+				const from =
+					/** @type {ModuleGraphConnection} */
+					(moduleGraph.getConnection(this));
+				return {
+					exports: [
+						{
+							name: /** @type {string} */ (mode.name),
+							from,
+							export: ["default"]
+						}
+					],
+					priority: 1,
+					dependencies: [from.module]
+				};
 			}
 			case "reexport-undefined":
 				return {
@@ -825,6 +844,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				const importedModule = moduleGraph.getModule(this);
 				if (importedModule) {
 					const exportsInfo = moduleGraph.getExportsInfo(importedModule);
+					/** @type {Map<string, string[]>} */
 					const conflicts = new Map();
 					for (const exportInfo of exportsInfo.orderedExports) {
 						if (exportInfo.provided !== true) continue;
@@ -841,12 +861,12 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 						if (!conflictingDependency) continue;
 						const target = exportInfo.getTerminalBinding(moduleGraph);
 						if (!target) continue;
-						const conflictingModule = moduleGraph.getModule(
-							conflictingDependency
-						);
+						const conflictingModule =
+							/** @type {Module} */
+							(moduleGraph.getModule(conflictingDependency));
 						if (conflictingModule === importedModule) continue;
 						const conflictingExportInfo = moduleGraph.getExportInfo(
-							/** @type {Module} */ (conflictingModule),
+							conflictingModule,
 							exportInfo.name
 						);
 						const conflictingTarget =
@@ -944,7 +964,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			switch (mode.type) {
 				case "reexport-undefined":
 					concatenationScope.registerRawExport(
-						mode.name,
+						/** @type {NonNullable<ExportMode["name"]>} */ (mode.name),
 						"/* reexport non-default export from non-harmony */ undefined"
 					);
 			}
@@ -1080,23 +1100,36 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				break;
 
 			case "normal-reexport":
-				for (const { name, ids, checked, hidden } of mode.items) {
+				for (const {
+					name,
+					ids,
+					checked,
+					hidden
+				} of /** @type {NormalReexportItem[]} */ (mode.items)) {
 					if (hidden) continue;
 					if (checked) {
+						const connection = moduleGraph.getConnection(dep);
+						const key = `harmony reexport (checked) ${importVar} ${name}`;
+						const runtimeCondition = dep.weak
+							? false
+							: connection
+								? filterRuntime(runtime, r => connection.isTargetActive(r))
+								: true;
 						initFragments.push(
-							new InitFragment(
-								"/* harmony reexport (checked) */ " +
-									this.getConditionalReexportStatement(
-										module,
-										name,
-										importVar,
-										ids,
-										runtimeRequirements
-									),
+							new ConditionalInitFragment(
+								`/* harmony reexport (checked) */ ${this.getConditionalReexportStatement(
+									module,
+									name,
+									importVar,
+									ids,
+									runtimeRequirements
+								)}`,
 								moduleGraph.isAsync(importedModule)
 									? InitFragment.STAGE_ASYNC_HARMONY_IMPORTS
 									: InitFragment.STAGE_HARMONY_IMPORTS,
-								dep.sourceOrder
+								dep.sourceOrder,
+								key,
+								runtimeCondition
 							)
 						);
 					} else {
@@ -1118,8 +1151,12 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 
 			case "dynamic-reexport": {
 				const ignored = mode.hidden
-					? combine(mode.ignored, mode.hidden)
-					: mode.ignored;
+					? combine(
+							/** @type {ExportModeIgnored} */
+							(mode.ignored),
+							mode.hidden
+						)
+					: /** @type {ExportModeIgnored} */ (mode.ignored);
 				const modern =
 					runtimeTemplate.supportsConst() &&
 					runtimeTemplate.supportsArrowFunction();
@@ -1132,22 +1169,19 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				// Filter out exports which are defined by other exports
 				// and filter out default export because it cannot be reexported with *
 				if (ignored.size > 1) {
-					content +=
-						"if(" +
-						JSON.stringify(Array.from(ignored)) +
-						".indexOf(__WEBPACK_IMPORT_KEY__) < 0) ";
+					content += `if(${JSON.stringify(
+						Array.from(ignored)
+					)}.indexOf(__WEBPACK_IMPORT_KEY__) < 0) `;
 				} else if (ignored.size === 1) {
 					content += `if(__WEBPACK_IMPORT_KEY__ !== ${JSON.stringify(
 						first(ignored)
 					)}) `;
 				}
 
-				content += `__WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = `;
-				if (modern) {
-					content += `() => ${importVar}[__WEBPACK_IMPORT_KEY__]`;
-				} else {
-					content += `function(key) { return ${importVar}[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)`;
-				}
+				content += "__WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = ";
+				content += modern
+					? `() => ${importVar}[__WEBPACK_IMPORT_KEY__]`
+					: `function(key) { return ${importVar}[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)`;
 
 				runtimeRequirements.add(RuntimeGlobals.exports);
 				runtimeRequirements.add(RuntimeGlobals.definePropertyGetters);
@@ -1170,6 +1204,15 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 		}
 	}
 
+	/**
+	 * @param {Module} module the current module
+	 * @param {string} comment comment
+	 * @param {UsedName} key key
+	 * @param {string} name name
+	 * @param {string | string[] | null | false} valueKey value key
+	 * @param {RuntimeRequirements} runtimeRequirements runtime requirements
+	 * @returns {HarmonyExportInitFragment} harmony export init fragment
+	 */
 	getReexportFragment(
 		module,
 		comment,

package/lib/dependencies/HarmonyExports.js

@@ -19,7 +19,7 @@ const parserStateExportsState = new WeakMap();
  * @param {boolean} isStrictHarmony strict harmony mode should be enabled
  * @returns {void}
  */
-exports.enable = (parserState, isStrictHarmony) => {
+module.exports.enable = (parserState, isStrictHarmony) => {
 	const value = parserStateExportsState.get(parserState);
 	if (value === false) return;
 	parserStateExportsState.set(parserState, true);
@@ -40,7 +40,7 @@ exports.enable = (parserState, isStrictHarmony) => {
  * @param {ParserState} parserState parser state
  * @returns {boolean} true, when enabled
  */
-exports.isEnabled = parserState => {
+module.exports.isEnabled = parserState => {
 	const value = parserStateExportsState.get(parserState);
 	return value === true;
 };