Merge pull request webpack#4816 from webpack/bugfix/hoist-immutable-export

sokra · web-flow · commit 7bc08e1aa0b0 · 2017-05-04T13:27:13.000+02:00
hoist exports
diff --git a/lib/dependencies/HarmonyCompatibilityDependency.js b/lib/dependencies/HarmonyCompatibilityDependency.js
@@ -22,7 +22,7 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate
 		if(usedExports && !Array.isArray(usedExports)) {
 			const exportName = dep.originModule.exportsArgument || "exports";
 			const content = `Object.defineProperty(${exportName}, \"__esModule\", { value: true });\n`;
-			source.insert(-1, content);
+			source.insert(-10, content);
 		}
 	}
 };
diff --git a/lib/dependencies/HarmonyExportDependencyParserPlugin.js b/lib/dependencies/HarmonyExportDependencyParserPlugin.js
@@ -45,7 +45,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			} else {
 				const immutable = statement.declaration && isImmutableStatement(statement.declaration);
 				const hoisted = statement.declaration && isHoistedStatement(statement.declaration);
-				dep = new HarmonyExportSpecifierDependency(parser.state.module, id, name, !immutable || hoisted ? -0.5 : (statement.range[1] + 0.5), immutable);
+				dep = new HarmonyExportSpecifierDependency(parser.state.module, id, name, !immutable || hoisted ? -2 : (statement.range[1] + 0.5), immutable);
 			}
 			dep.loc = Object.create(statement.loc);
 			dep.loc.index = idx;
diff --git a/test/cases/parsing/harmony-export-hoist/bar.js b/test/cases/parsing/harmony-export-hoist/bar.js
@@ -0,0 +1,6 @@
+import { foo, foo2 } from "./foo";
+
+export default {
+	foo: foo,
+	foo2: foo2
+};
diff --git a/test/cases/parsing/harmony-export-hoist/foo.js b/test/cases/parsing/harmony-export-hoist/foo.js
@@ -0,0 +1,12 @@
+import {bar} from "./bar";
+
+export function foo() {
+	return "ok";
+}
+
+function foo2() {
+	return "ok";
+}
+export { foo2 }
+
+export { default } from "./bar";
diff --git a/test/cases/parsing/harmony-export-hoist/index.js b/test/cases/parsing/harmony-export-hoist/index.js
@@ -0,0 +1,9 @@
+"use strict";
+
+it("should hoist exports", function() {
+	var result = require("./foo").default;
+	(typeof result.foo).should.have.eql("function");
+	(typeof result.foo2).should.have.eql("function");
+	result.foo().should.be.eql("ok");
+	result.foo2().should.be.eql("ok");
+});

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate`
`22`	`22`	`if(usedExports && !Array.isArray(usedExports)) {`
`23`	`23`	`const exportName = dep.originModule.exportsArgument \|\| "exports";`
`24`	`24`	const content = `Object.defineProperty(${exportName}, \"__esModule\", { value: true });\n`;
`25`		`- source.insert(-1, content);`
	`25`	`+ source.insert(-10, content);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`};`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {`
`45`	`45`	`} else {`
`46`	`46`	`const immutable = statement.declaration && isImmutableStatement(statement.declaration);`
`47`	`47`	`const hoisted = statement.declaration && isHoistedStatement(statement.declaration);`
`48`		`- dep = new HarmonyExportSpecifierDependency(parser.state.module, id, name, !immutable \|\| hoisted ? -0.5 : (statement.range[1] + 0.5), immutable);`
	`48`	`+ dep = new HarmonyExportSpecifierDependency(parser.state.module, id, name, !immutable \|\| hoisted ? -2 : (statement.range[1] + 0.5), immutable);`
`49`	`49`	`}`
`50`	`50`	`dep.loc = Object.create(statement.loc);`
`51`	`51`	`dep.loc.index = idx;`