Merge pull request webpack#6950 from mohsen1/set-concat

sokra · web-flow · commit 1d35f36e50f0 · 2018-04-09T09:41:30.000+02:00
Use add() to append items to activeExports set in HarmonyExportImporedSpecifierDependency
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -550,10 +550,10 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 
 				// Filter out exports which are defined by other exports
 				// and filter out default export because it cannot be reexported with *
-				if (activeExports.length > 0)
+				if (activeExports.size > 0)
 					content +=
 						"if(" +
-						JSON.stringify(activeExports.concat("default")) +
+						JSON.stringify(Array.from(activeExports).concat("default")) +
 						".indexOf(__WEBPACK_IMPORT_KEY__) < 0) ";
 				else content += "if(__WEBPACK_IMPORT_KEY__ !== 'default') ";
 				const exportsName = dep.originModule.exportsArgument;
diff --git a/test/cases/parsing/harmony-export-import-specifier/a.js b/test/cases/parsing/harmony-export-import-specifier/a.js
@@ -0,0 +1,2 @@
+export var x = 1;
+export * from "./cjs";
diff --git a/test/cases/parsing/harmony-export-import-specifier/cjs.js b/test/cases/parsing/harmony-export-import-specifier/cjs.js
@@ -0,0 +1 @@
+module.exports = { x: 2, y: 3 };
diff --git a/test/cases/parsing/harmony-export-import-specifier/index.js b/test/cases/parsing/harmony-export-import-specifier/index.js
@@ -0,0 +1,8 @@
+"use strict";
+
+import {x, y} from "./a";
+
+it("namespace export as from commonjs should override named export", function() {
+	x.should.be.eql(1);
+	y.should.be.eql(3);
+});
