Merge pull request webpack#6806 from webpack/bugfix/json-reexport

sokra · web-flow · commit c6b9b9ee6946 · 2018-03-20T13:05:49.000+01:00
handle reexporting json default export correctly
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -53,25 +53,33 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			};
 		}
 
-		const isNotAHarmonyModule =
-			importedModule.buildMeta && !importedModule.buildMeta.exportsType;
 		const strictHarmonyModule = this.originModule.buildMeta.strictHarmonyModule;
-		if (name && id === "default" && isNotAHarmonyModule) {
-			if (strictHarmonyModule) {
-				return {
-					type: "reexport-non-harmony-default-strict",
-					module: importedModule,
-					name
-				};
-			} else {
+		if (name && id === "default" && importedModule.buildMeta) {
+			if (!importedModule.buildMeta.exportsType) {
+				if (strictHarmonyModule) {
+					return {
+						type: "reexport-non-harmony-default-strict",
+						module: importedModule,
+						name
+					};
+				} else {
+					return {
+						type: "reexport-non-harmony-default",
+						module: importedModule,
+						name
+					};
+				}
+			} else if (importedModule.buildMeta.exportsType === "named") {
 				return {
-					type: "reexport-non-harmony-default",
+					type: "reexport-named-default",
 					module: importedModule,
 					name
 				};
 			}
 		}
 
+		const isNotAHarmonyModule =
+			importedModule.buildMeta && !importedModule.buildMeta.exportsType;
 		if (name) {
 			// export { name as name }
 			if (id) {
@@ -209,6 +217,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				return null;
 
 			case "reexport-non-harmony-default":
+			case "reexport-named-default":
 				return {
 					module: mode.module,
 					importedNames: ["default"]
@@ -459,6 +468,17 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					)
 				);
 
+			case "reexport-named-default":
+				return (
+					"/* harmony reexport (default from named exports) */ " +
+					this.getReexportStatement(
+						module,
+						module.isUsed(mode.name),
+						importVar,
+						""
+					)
+				);
+
 			case "reexport-fake-namespace-object":
 				return (
 					"/* harmony reexport (fake namespace object from non-harmony) */ " +
diff --git a/test/cases/scope-hoisting/json-reexport-6700/a.json b/test/cases/scope-hoisting/json-reexport-6700/a.json
@@ -0,0 +1,3 @@
+{
+  "a": "A"
+}
diff --git a/test/cases/scope-hoisting/json-reexport-6700/b.json b/test/cases/scope-hoisting/json-reexport-6700/b.json
@@ -0,0 +1,3 @@
+{
+  "b": "B"
+}
diff --git a/test/cases/scope-hoisting/json-reexport-6700/index.js b/test/cases/scope-hoisting/json-reexport-6700/index.js
@@ -0,0 +1,9 @@
+import { a, b, aa, bb } from './json.js'
+
+it("should reexport json data correctly", () => {
+	aa.should.be.eql({ a: "A" });
+	bb.should.be.eql({ b: "B" });
+	a.should.be.eql("A");
+	b.should.be.eql("B");
+});
+
diff --git a/test/cases/scope-hoisting/json-reexport-6700/json.js b/test/cases/scope-hoisting/json-reexport-6700/json.js
@@ -0,0 +1,11 @@
+import aa from './a.json';
+
+export { aa };
+
+export { default as bb } from './b.json';
+
+import { a } from './a.json';
+
+export { a };
+
+export { b } from './b.json';
