generate await code for import without await too

fixes webpack#10194
earnubs · Dec 30, 2019 · bbace17 · bbace17
1 parent 2671b0b
commit bbace17
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/lib/dependencies/HarmonyImportDependency.js b/lib/dependencies/HarmonyImportDependency.js
@@ -236,7 +236,7 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 				key
 			)
 		);
-		if (dep.await) {
+		if (templateContext.moduleGraph.isAsync(referencedModule)) {
 			templateContext.initFragments.push(
 				new AwaitDependenciesInitFragment(
 					new Set([dep.getImportVar(templateContext.moduleGraph)])

diff --git a/test/TestCases.template.js b/test/TestCases.template.js
@@ -180,7 +180,8 @@ const describeCases = config => {
 									mjs: true,
 									asyncWebAssembly: true,
 									topLevelAwait: true,
-									importAwait: true
+									importAwait: true,
+									importAsync: true
 								}
 							};
 							beforeAll(done => {

diff --git a/test/cases/async-modules/top-level-await-import-async/index.js b/test/cases/async-modules/top-level-await-import-async/index.js
@@ -0,0 +1,6 @@
+it("should allow to use import await", () => {
+	return import("./reexport").then(({ default: value, other }) => {
+		expect(value).toBe(42);
+		expect(other).toBe(42);
+	});
+});
diff --git a/test/cases/async-modules/top-level-await-import-async/module.js b/test/cases/async-modules/top-level-await-import-async/module.js
@@ -0,0 +1,3 @@
+await new Promise(r => setTimeout(r, 100));
+
+export default 42;
diff --git a/test/cases/async-modules/top-level-await-import-async/reexport.js b/test/cases/async-modules/top-level-await-import-async/reexport.js
@@ -0,0 +1,4 @@
+export { default } from "./module";
+import value from "./module";
+
+export const other = value;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		await new Promise(r => setTimeout(r, 100));

		export default 42;