fixed webpack#2019

sokra · sokra · commit 5189d9a321be · 2016-02-09T14:27:21.000+01:00
diff --git a/lib/dependencies/HarmonyExportExpressionDependency.js b/lib/dependencies/HarmonyExportExpressionDependency.js
@@ -34,7 +34,7 @@ HarmonyExportExpressionDependency.Template.prototype.apply = function(dep, sourc
 		content = "/* unused harmony default export */ var _unused_webpack_default_export = ";
 	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.range[1], dep.rangeStatement[1] - 1, ";");
 	} else {
 		source.replace(dep.rangeStatement[0], dep.rangeStatement[1] - 1, content);
 	}
diff --git a/test/cases/parsing/harmony/index.js b/test/cases/parsing/harmony/index.js
@@ -17,6 +17,12 @@ import { specA, specB } from "exports-specifier";
 import Thing, { Other } from "commonjs";
 import Thing2, { Other as Other2 } from "commonjs-trans";
 
+import defaultExport from "def";
+
+
+it("should import a default export from a module", function() {
+	defaultExport.should.be.eql("def");
+});
 
 it("should import an identifier from a module", function() {
 	a.should.be.eql("a");
diff --git a/test/cases/parsing/issue-2019/file.js b/test/cases/parsing/issue-2019/file.js
@@ -0,0 +1,3 @@
+var CONSTANT = "const";
+var def = "default";
+export default def; export { CONSTANT };
diff --git a/test/cases/parsing/issue-2019/index.js b/test/cases/parsing/issue-2019/index.js
@@ -0,0 +1,4 @@
+it("should not fail on default export before export", function() {
+	require("./file").default.should.be.eql("default");
+	require("./file").CONSTANT.should.be.eql("const");
+});

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ HarmonyExportExpressionDependency.Template.prototype.apply = function(dep, sourc`
`34`	`34`	`content = "/* unused harmony default export */ var _unused_webpack_default_export = ";`
`35`	`35`	`if(dep.range) {`
`36`	`36`	`source.replace(dep.rangeStatement[0], dep.range[0] - 1, content);`
`37`		`- source.replace(dep.range[1], dep.rangeStatement[1] - 1, "");`
	`37`	`+ source.replace(dep.range[1], dep.rangeStatement[1] - 1, ";");`
`38`	`38`	`} else {`
`39`	`39`	`source.replace(dep.rangeStatement[0], dep.rangeStatement[1] - 1, content);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var CONSTANT = "const";`
	`2`	`+var def = "default";`
	`3`	`+export default def; export { CONSTANT };`