Merge branch 'set-concat' of github.com:mohsen1/webpack into set-concat

Mohsen Azimi · Mohsen Azimi · commit 8001f03b1478 · 2018-04-05T23:04:57.000-07:00
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.add("default")) +
+						JSON.stringify(Array.from(activeExports.add("default"))) +
 						".indexOf(__WEBPACK_IMPORT_KEY__) < 0) ";
 				else content += "if(__WEBPACK_IMPORT_KEY__ !== 'default') ";
 				const exportsName = dep.originModule.exportsArgument;
