webpack 5.108.4 → 5.109.1

package/lib/dependencies/HarmonyDetectionParserPlugin.js

@@ -10,10 +10,16 @@ const EnvironmentNotSupportAsyncWarning = require("../errors/EnvironmentNotSuppo
 const DynamicExports = require("./DynamicExports");
 const HarmonyCompatibilityDependency = require("./HarmonyCompatibilityDependency");
 const HarmonyExports = require("./HarmonyExports");
-const { IMPORT_META_NAMES } = require("./ImportMetaPlugin");
+const {
+	IMPORT_META_NAMES,
+	IMPORT_META_STAGE_ESM_DETECTION
+} = require("./ImportMetaPlugin");
+const TopLevelAwaitDependency = require("./TopLevelAwaitDependency");
 
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 const PLUGIN_NAME = "HarmonyDetectionParserPlugin";
 
@@ -68,34 +74,58 @@ module.exports = class HarmonyDetectionParserPlugin {
 			}
 		});
 
-		parser.hooks.topLevelAwait.tap(PLUGIN_NAME, () => {
+		parser.hooks.topLevelAwait.tap(PLUGIN_NAME, (node) => {
 			const module = parser.state.module;
 			enableHarmony(false);
 			/** @type {BuildMeta} */
 			(module.buildMeta).async = true;
-			EnvironmentNotSupportAsyncWarning.check(
-				module,
-				parser.state.compilation.runtimeTemplate,
-				"topLevelAwait"
-			);
+			const buildInfo = /** @type {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`).
+				module.addPresentationalDependency(
+					new TopLevelAwaitDependency(
+						/** @type {Range} */ (node.range),
+						/** @type {Range} */ (node.argument.range)
+					)
+				);
+			} else {
+				// `for await…of` can't be expressed as a generator; never lower it.
+				buildInfo.usesTopLevelAwaitForOf = true;
+			}
+			const { runtimeTemplate } = parser.state.compilation;
+			if (
+				!runtimeTemplate.supportsAsyncFunction() &&
+				(!runtimeTemplate.supportsGenerator() ||
+					buildInfo.usesTopLevelAwaitForOf)
+			) {
+				module.addWarning(
+					new EnvironmentNotSupportAsyncWarning(module, "topLevelAwait")
+				);
+			}
 		});
 
 		// Using `import.meta` only parses as a module, so it marks the module ESM.
-		// Non-bailing and run before ImportMetaPlugin so its handling still runs;
-		// unknown members go through `unhandledExpressionMemberChain`.
+		// Non-bailing; staged before the bailing DefinePlugin and ImportMetaPlugin
+		// replacement taps so it observes every access; unknown members go
+		// through `unhandledExpressionMemberChain`.
 		const onImportMeta = () => {
 			enableHarmony(false);
 		};
+		const earlyTapOptions = {
+			name: PLUGIN_NAME,
+			stage: IMPORT_META_STAGE_ESM_DETECTION
+		};
 		for (const name of IMPORT_META_NAMES) {
-			parser.hooks.expression.for(name).tap(PLUGIN_NAME, onImportMeta);
-			parser.hooks.typeof.for(name).tap(PLUGIN_NAME, onImportMeta);
+			parser.hooks.expression.for(name).tap(earlyTapOptions, onImportMeta);
+			parser.hooks.typeof.for(name).tap(earlyTapOptions, onImportMeta);
 		}
 		parser.hooks.expressionMemberChain
 			.for("import.meta")
-			.tap(PLUGIN_NAME, onImportMeta);
+			.tap(earlyTapOptions, onImportMeta);
 		parser.hooks.unhandledExpressionMemberChain
 			.for("import.meta")
-			.tap(PLUGIN_NAME, onImportMeta);
+			.tap(earlyTapOptions, onImportMeta);
 
 		/**
 		 * Returns true if in harmony.

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -179,7 +179,8 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 				dep,
 				source,
 				templateContext,
-				ids.slice(0, -1)
+				ids.slice(0, -1),
+				connection
 			);
 			source.replace(
 				dep.range[0],

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -70,10 +70,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				),
 				/** @type {Range} */ (statement.range)
 			);
-			dep.setLocWithIndex(
-				/** @type {DependencyLocation} */ (statement.loc),
-				-1
-			);
+			dep.setLocWithIndex(parser.getLocation(statement), -1);
 			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		});
@@ -84,10 +81,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				"",
 				/** @type {Range} */ (statement.range)
 			);
-			clearDep.setLocWithIndex(
-				/** @type {DependencyLocation} */ (statement.loc),
-				-1
-			);
+			clearDep.setLocWithIndex(parser.getLocation(statement), -1);
 			parser.state.module.addPresentationalDependency(clearDep);
 
 			const phase = getImportPhase(parser, statement);
@@ -95,7 +89,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				const error = new WebpackError(
 					"Deferred re-export (`export defer * as namespace from '...'`) is not a part of the Import Defer proposal.\nUse the following code instead:\n    import defer * as namespace from '...';\n    export { namespace };"
 				);
-				error.loc = statement.loc || undefined;
+				error.loc = parser.getLocation(statement) || undefined;
 				parser.state.current.addError(error);
 			}
 			const sideEffectDep = new HarmonyImportSideEffectDependency(
@@ -104,10 +98,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				phase,
 				getImportAttributes(statement)
 			);
-			sideEffectDep.setLocWithIndex(
-				/** @type {DependencyLocation} */ (statement.loc),
-				-1
-			);
+			sideEffectDep.setLocWithIndex(parser.getLocation(statement), -1);
 			// lazy barrel: defer at parse time when the importing module is side-effect-free
 			const moduleFactoryMeta = parser.state.module.factoryMeta;
 			if (moduleFactoryMeta !== undefined && moduleFactoryMeta.sideEffectFree) {
@@ -168,10 +159,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						node.type === "ClassDeclaration" ||
 						node.type === "ClassExpression") &&
 						!node.id));
-			dep.setLocWithIndex(
-				/** @type {DependencyLocation} */ (statement.loc),
-				-1
-			);
+			dep.setLocWithIndex(parser.getLocation(statement), -1);
 			parser.state.current.addDependency(dep);
 			getInnerGraphUtils(parser.state.compilation).addVariableUsage(
 				parser,
@@ -241,7 +229,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					dep.setLazy(true);
 				}
 				dep.setLocWithIndex(
-					/** @type {DependencyLocation} */ (statement.loc),
+					parser.getLocation(statement),
 					/** @type {number} */ (idx)
 				);
 				const isAsiSafe = !parser.isAsiPosition(
@@ -296,7 +284,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					dep.setLazy(true);
 				}
 				dep.setLocWithIndex(
-					/** @type {DependencyLocation} */ (statement.loc),
+					parser.getLocation(statement),
 					/** @type {number} */ (idx)
 				);
 				const isAsiSafe = !parser.isAsiPosition(

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -191,8 +191,11 @@ const isStarReexportBackToParent = (moduleGraph, exportInfo, parentModule) => {
 	let current = moduleGraph
 		.getExportsInfo(firstTarget.module)
 		.getReadOnlyExportInfo(firstTarget.export[0]);
-	/** @type {Set<ExportInfo>} */
-	const visited = new Set([exportInfo, current]);
+	// Allocated lazily: a single-extra-hop chain that terminates (the common
+	// `barrel -> leaf local binding` case) returns before `next` is ever
+	// computed, so the visited set is pure waste there.
+	/** @type {Set<ExportInfo> | undefined} */
+	let visited;
 	for (;;) {
 		const target = current.findTarget(moduleGraph, RETURNS_TRUE);
 		if (!target || typeof target !== "object") return false;
@@ -210,6 +213,7 @@ const isStarReexportBackToParent = (moduleGraph, exportInfo, parentModule) => {
 		const next = moduleGraph
 			.getExportsInfo(target.module)
 			.getReadOnlyExportInfo(target.export[0]);
+		if (visited === undefined) visited = new Set([exportInfo, current]);
 		if (visited.has(next)) return false;
 		visited.add(next);
 		current = next;
@@ -635,7 +639,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused;
 
 		/** @type {IgnoredExports} */
-		const ignoredExports = new Set(["default", ...this.activeExports]);
+		const ignoredExports = new Set(this.activeExports);
+		ignoredExports.add("default");
 
 		/** @type {Hidden | undefined} */
 		let hiddenExports;
@@ -1387,7 +1392,12 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				);
 				break;
 
-			case "normal-reexport":
+			case "normal-reexport": {
+				// loop-invariants hoisted out of the per-item loop below (a barrel
+				// re-exporting N names otherwise repeats these lookups N times)
+				const connection = moduleGraph.getConnection(dep);
+				const selfExportsInfo = moduleGraph.getExportsInfo(module);
+				const importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
 				for (const {
 					name,
 					ids,
@@ -1396,7 +1406,6 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				} 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
@@ -1425,11 +1434,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 							this.getReexportFragment(
 								module,
 								"reexport safe",
-								moduleGraph.getExportsInfo(module).getUsedName(name, runtime),
+								selfExportsInfo.getUsedName(name, runtime),
 								importVar,
-								moduleGraph
-									.getExportsInfo(importedModule)
-									.getUsedName(ids, runtime),
+								importedExportsInfo.getUsedName(ids, runtime),
 								runtimeRequirements,
 								ids
 							)
@@ -1437,6 +1444,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					}
 				}
 				break;
+			}
 
 			case "dynamic-reexport": {
 				const ignored = mode.hidden

package/lib/dependencies/HarmonyImportDependency.js

@@ -10,6 +10,7 @@ const Dependency = require("../Dependency");
 const InitFragment = require("../InitFragment");
 const Template = require("../Template");
 const AwaitDependenciesInitFragment = require("../async-modules/AwaitDependenciesInitFragment");
+const isGeneratorLowered = require("../async-modules/isGeneratorLowered");
 const { filterRuntime, mergeRuntime } = require("../util/runtime");
 const HarmonyLinkingError = require("./HarmonyLinkingError");
 const { ImportPhase, ImportPhaseUtils } = require("./ImportPhase");
@@ -190,7 +191,7 @@ class HarmonyImportDependency extends ModuleDependency {
 
 		let importVar = importVarMap.get(importedModule);
 		if (importVar) return importVar;
-		importVar = `${Template.toIdentifier(`${this.userRequest}`)}__WEBPACK_${
+		importVar = `${Template.toIdentifier(this.userRequest)}__WEBPACK_${
 			isDeferred ? "DEFERRED_" : ""
 		}IMPORTED_MODULE_${importVarMap.size}__`;
 		importVarMap.set(importedModule, importVar);
@@ -475,8 +476,18 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 				)
 			);
 			const importVar = dep.getImportVar(templateContext.moduleGraph);
+			// When the consuming module is emitted as a generator (target without
+			// `async`/`await`), the dependency `await` must become `yield`.
+			const generatorLowered = isGeneratorLowered(
+				/** @type {Module} */ (module),
+				moduleGraph,
+				templateContext.runtimeTemplate
+			);
 			templateContext.initFragments.push(
-				new AwaitDependenciesInitFragment(new Map([[importVar, importVar]]))
+				new AwaitDependenciesInitFragment(
+					new Map([[importVar, importVar]]),
+					generatorLowered
+				)
 			);
 			templateContext.initFragments.push(
 				new ConditionalInitFragment(

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -237,7 +237,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					: "",
 				/** @type {Range} */ (statement.range)
 			);
-			clearDep.loc = /** @type {DependencyLocation} */ (statement.loc);
+			clearDep.loc = parser.getLocation(statement);
 			parser.state.module.addPresentationalDependency(clearDep);
 			parser.unsetAsiPosition(/** @type {Range} */ (statement.range)[1]);
 			const attributes = getImportAttributes(statement);
@@ -250,7 +250,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				const error = new WebpackError(
 					"Deferred import can only be used with `import * as namespace from '...'` syntax."
 				);
-				error.loc = statement.loc || undefined;
+				error.loc = parser.getLocation(statement) || undefined;
 				parser.state.current.addError(error);
 			}
 
@@ -260,7 +260,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				phase,
 				attributes
 			);
-			sideEffectDep.loc = /** @type {DependencyLocation} */ (statement.loc);
+			sideEffectDep.loc = parser.getLocation(statement);
 			parser.state.module.addDependency(sideEffectDep);
 			return true;
 		});
@@ -307,7 +307,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			dep.asiSafe = !parser.isAsiPosition(
 				/** @type {Range} */ (expression.range)[0]
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expression.loc);
+			dep.loc = parser.getLocation(expression);
 			parser.state.module.addDependency(dep);
 			getInnerGraphUtils(parser.state.compilation).onUsage(
 				parser.state,
@@ -353,7 +353,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				dep.asiSafe = !parser.isAsiPosition(
 					/** @type {Range} */ (expr.range)[0]
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				dep.call = parser.scope.inTaggedTemplateTag;
 				parser.state.module.addDependency(dep);
 				attachDependencyGuards(parser, dep);
@@ -406,7 +406,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						/** @type {Range} */
 						(expr.range)[0]
 					);
-					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+					dep.loc = parser.getLocation(expr);
 					parser.state.module.addDependency(dep);
 					attachDependencyGuards(parser, dep);
 					getInnerGraphUtils(parser.state.compilation).onUsage(
@@ -463,7 +463,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					dep.namespaceObjectAsContext =
 						members.length > 0 &&
 						/** @type {boolean} */ (this.strictThisContextOnImports);
-					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+					dep.loc = parser.getLocation(expr);
 					parser.state.module.addDependency(dep);
 					attachDependencyGuards(parser, dep);
 					if (args) parser.walkExpressions(args);
@@ -504,7 +504,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			}
 			const dependencies = requests.map((request) => {
 				const dep = new HarmonyAcceptImportDependency(request);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addDependency(dep);
 				return dep;
 			});
@@ -515,7 +515,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					dependencies,
 					true
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addDependency(dep);
 			}
 		});
@@ -526,7 +526,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			}
 			const dependencies = requests.map((request) => {
 				const dep = new HarmonyAcceptImportDependency(request);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addDependency(dep);
 				return dep;
 			});
@@ -537,7 +537,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					dependencies,
 					false
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				parser.state.module.addDependency(dep);
 			}
 		});

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -32,6 +32,7 @@ const { ImportPhaseUtils } = require("./ImportPhase");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../errors/WebpackError")} WebpackError */
 /** @typedef {import("../javascript/JavascriptParser").DestructuringAssignmentProperties} DestructuringAssignmentProperties */
@@ -475,7 +476,8 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 			dep,
 			source,
 			templateContext,
-			trimmedIds
+			trimmedIds,
+			connection
 		);
 		if (dep.shorthand) {
 			source.insert(trimmedRangeEnd, `: ${exportExpr}`);
@@ -521,13 +523,14 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 					});
 				}
 			);
+			// loop-invariant: resolve the imported module's exports info once
+			const destructuredExportsInfo = moduleGraph.getExportsInfo(
+				/** @type {Module} */ (moduleGraph.getModule(dep))
+			);
 			for (const { ids, shorthand, range } of replacementsInDestructuring) {
 				/** @type {Ids} */
 				const concatedIds = [...prefixedIds, ...ids];
-				const module = /** @type {Module} */ (moduleGraph.getModule(dep));
-				const used = moduleGraph
-					.getExportsInfo(module)
-					.getUsedName(concatedIds, runtime);
+				const used = destructuredExportsInfo.getUsedName(concatedIds, runtime);
 				if (!used) {
 					return;
 				} else if (used instanceof InlinedUsedName) {
@@ -559,12 +562,12 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 	 * @param {ReplaceSource} source source
 	 * @param {DependencyTemplateContext} templateContext context
 	 * @param {Ids} ids ids
+	 * @param {ModuleGraphConnection | undefined} connection the resolved connection for dep
 	 * @returns {string} generated code
 	 */
-	_getCodeForIds(dep, source, templateContext, ids) {
+	_getCodeForIds(dep, source, templateContext, ids, connection) {
 		const { moduleGraph, module, runtime, concatenationScope } =
 			templateContext;
-		const connection = moduleGraph.getConnection(dep);
 		/** @type {string} */
 		let exportExpr;
 

package/lib/dependencies/HarmonyModulesPlugin.js

@@ -25,6 +25,7 @@ const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDepe
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
 const HarmonyTopLevelThisParserPlugin = require("./HarmonyTopLevelThisParserPlugin");
+const TopLevelAwaitDependency = require("./TopLevelAwaitDependency");
 
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
@@ -62,6 +63,11 @@ class HarmonyModulesPlugin {
 					new HarmonyCompatibilityDependency.Template()
 				);
 
+				compilation.dependencyTemplates.set(
+					TopLevelAwaitDependency,
+					new TopLevelAwaitDependency.Template()
+				);
+
 				compilation.dependencyFactories.set(
 					HarmonyImportSideEffectDependency,
 					normalModuleFactory

package/lib/dependencies/HarmonyTopLevelThisParserPlugin.js

@@ -29,7 +29,7 @@ class HarmonyTopLevelThisParserPlugin {
 					/** @type {Range} */ (node.range),
 					null
 				);
-				dep.loc = /** @type {DependencyLocation} */ (node.loc);
+				dep.loc = parser.getLocation(node);
 				parser.state.module.addPresentationalDependency(dep);
 				return true;
 			}