webpack 5.108.4 → 5.109.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/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");
@@ -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/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;
 			}