Merge pull request #11244 from webpack/bugfix/dynamic-reexport-default

ignore default export when reexporting a dynamic module
webpack · Jul 30, 2020 · 7895778 · 7895778
2 parents 91e81c8 + 46304c8
commit 7895778
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -215,6 +215,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		const mode = new ExportMode("dynamic-reexport");
 		mode.module = importedModule;
 		mode.ignored = new Set([
+			"default",
 			...this.activeExports,
 			...activeFromOtherStarExports
 		]);
@@ -586,18 +587,18 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					.join("");
 
 			case "dynamic-reexport": {
-				const activeExports = mode.ignored;
+				const ignoredExports = mode.ignored;
 				let content =
 					"/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in " +
 					importVar +
 					") ";
 
 				// Filter out exports which are defined by other exports
 				// and filter out default export because it cannot be reexported with *
-				if (activeExports.size > 0) {
+				if (ignoredExports.size > 0) {
 					content +=
 						"if(" +
-						JSON.stringify(Array.from(activeExports).concat("default")) +
+						JSON.stringify(Array.from(ignoredExports)) +
 						".indexOf(__WEBPACK_IMPORT_KEY__) < 0) ";
 				} else {
 					content += "if(__WEBPACK_IMPORT_KEY__ !== 'default') ";

diff --git a/test/cases/side-effects/dynamic-reexports/dynamic-reexport-default/dynamic.js b/test/cases/side-effects/dynamic-reexports/dynamic-reexport-default/dynamic.js
@@ -0,0 +1 @@
+Object(exports).default = "dynamic";
diff --git a/test/cases/side-effects/dynamic-reexports/dynamic-reexport-default/index.js b/test/cases/side-effects/dynamic-reexports/dynamic-reexport-default/index.js
@@ -0,0 +1,2 @@
+export * from "./dynamic";
+export default "static";
diff --git a/test/cases/side-effects/dynamic-reexports/index.js b/test/cases/side-effects/dynamic-reexports/index.js
@@ -1,11 +1,16 @@
 import { value as valueStatic } from "./dedupe-target-static";
 import { value } from "./dedupe-target";
 import * as DefaultExport from "./default-export";
-import { value as valueDirect, value2 as value2Direct } from "./direct-export";
+import {
+	value as valueDirect,
+	value2 as value2Direct,
+	default as Default1
+} from "./direct-export";
 import {
 	value as valueChecked,
 	value2 as value2Checked
 } from "./checked-export";
+import Default2 from "./dynamic-reexport-default";
 
 it("should dedupe static reexport target", () => {
 	expect(valueStatic).toBe(42);
@@ -36,3 +41,8 @@ it("should handle checked dynamic export when reexporting", () => {
 	expect(valueChecked).toBe(42);
 	expect(value2Checked).toBe(42);
 });
+
+it("should handle default export correctly", () => {
+	expect(Default1).toBe(undefined);
+	expect(Default2).toBe("static");
+});