Merge pull request webpack#4188 from webpack/bugfix/issue-4179

sokra · web-flow · commit 0de9fec8410d · 2017-02-08T09:39:31.000+01:00
fixes webpack#4179
diff --git a/lib/dependencies/HarmonyExportExpressionDependency.js b/lib/dependencies/HarmonyExportExpressionDependency.js
@@ -37,8 +37,8 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 		const content = this.getContent(dep.originModule, used);
 
 		if(dep.range) {
-			source.replace(dep.rangeStatement[0], dep.range[0] - 1, content);
-			source.replace(dep.range[1], dep.rangeStatement[1] - 1, ";");
+			source.replace(dep.rangeStatement[0], dep.range[0] - 1, content + "(");
+			source.replace(dep.range[1], dep.rangeStatement[1] - 1, ");");
 			return;
 		}
 
diff --git a/test/cases/parsing/issue-4179/index.js b/test/cases/parsing/issue-4179/index.js
@@ -0,0 +1,8 @@
+import def from "./module?harmony";
+import * as mod from "./module?harmony-start"
+
+it("should export a sequence expression correctly", function() {
+	require("./module?cjs").should.be.eql({ default: 2 });
+	def.should.be.eql(2);
+	mod.default.should.be.eql(2);
+});
diff --git a/test/cases/parsing/issue-4179/module.js b/test/cases/parsing/issue-4179/module.js
@@ -0,0 +1 @@
+export default (1, 2);
diff --git a/test/configCases/code-generation/use-strict/index.js b/test/configCases/code-generation/use-strict/index.js
@@ -19,7 +19,7 @@ it("should include only one use strict per module", function() {
 		"Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true });",
 		"Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true });",
 		"Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true });",
-		"/* unused harmony default export */ var _unused_webpack_default_export = \"a\";",
+		"/* unused harmony default export */ var _unused_webpack_default_export = (\"a\");",
 		"Object.defineProperty(__webpack_exports__, \"__esModule\", { value: true });",
 		"it(\"should include only one use strict per module\", function() {"
 	]);

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla`
`37`	`37`	`const content = this.getContent(dep.originModule, used);`
`38`	`38`
`39`	`39`	`if(dep.range) {`
`40`		`- source.replace(dep.rangeStatement[0], dep.range[0] - 1, content);`
`41`		`- source.replace(dep.range[1], dep.rangeStatement[1] - 1, ";");`
	`40`	`+ source.replace(dep.rangeStatement[0], dep.range[0] - 1, content + "(");`
	`41`	`+ source.replace(dep.range[1], dep.rangeStatement[1] - 1, ");");`
`42`	`42`	`return;`
`43`	`43`	`}`
`44`	`44`