Merge pull request webpack#3599 from webpack/bugfix/harmony-reexport

sokra · web-flow · commit ee3d53cb9314 · 2016-12-28T13:30:49.000+01:00
fixes webpack#3584
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -137,10 +137,11 @@ HarmonyExportImportedSpecifierDependency.Template.prototype.apply = function(dep
 	var content;
 	var activeExports;
 	var items;
-	var importIsHarmony = importedModule && (!importedModule.meta || importedModule.meta.harmonyModule);
+	var importsExportsUnknown = !importedModule || !Array.isArray(importedModule.providedExports);
 
 	function getReexportStatement(key, valueKey) {
-		return(importIsHarmony || !valueKey ? "" : "if(__webpack_require__.o(" + name + ", " + valueKey + ")) ") +
+		var conditional = !importsExportsUnknown || !valueKey ? "" : "if(__webpack_require__.o(" + name + ", " + valueKey + ")) ";
+		return conditional +
 			"__webpack_require__.d(exports, " + key + ", " +
 			"function() { return " + name + (valueKey === null ? "_default.a" : valueKey && "[" + valueKey + "]") + "; });\n"
 	}
diff --git a/test/cases/parsing/harmony-commonjs/b.js b/test/cases/parsing/harmony-commonjs/b.js
@@ -0,0 +1,2 @@
+export * from "./c";
+export * from "./c2";
diff --git a/test/cases/parsing/harmony-commonjs/c.js b/test/cases/parsing/harmony-commonjs/c.js
@@ -0,0 +1 @@
+export * from "./d";
diff --git a/test/cases/parsing/harmony-commonjs/c2.js b/test/cases/parsing/harmony-commonjs/c2.js
@@ -0,0 +1 @@
+export var x = "x";
diff --git a/test/cases/parsing/harmony-commonjs/d.js b/test/cases/parsing/harmony-commonjs/d.js
@@ -0,0 +1 @@
+exports.y = "y";
diff --git a/test/cases/parsing/harmony-commonjs/index.js b/test/cases/parsing/harmony-commonjs/index.js
@@ -1,3 +1,5 @@
+import { x, y } from "./b";
+
 it("should pass when required by CommonJS module", function () {
 	var test1 = require('./a').default;
 	test1().should.be.eql("OK");
@@ -12,4 +14,9 @@ it("should pass when use babeljs transpiler", function() {
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	var test2 = (0, _test2.default)();
 	test2.should.be.eql("OK");
-})
+});
+
+it("should double reexport from non-harmony modules correctly", function() {
+	y.should.be.eql("y");
+	x.should.be.eql("x");
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from "./c";`
	`2`	`+export * from "./c2";`