Merge pull request webpack#6408 from ocombe/fix/webpack#6407-empty-array

sokra · web-flow · commit ddb1fad582bf · 2018-01-29T21:40:05.000+01:00
fix(ConcatenatedModule): don't throw on arrays with empty values
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -143,6 +143,7 @@ function getPathInAst(ast, node) {
 	}
 
 	function enterNode(n) {
+		if(!n) return undefined;
 		const r = n.range;
 		if(r) {
 			if(r[0] <= nr[0] && r[1] >= nr[1]) {
diff --git a/test/cases/scope-hoisting/issue-6407/import-one.js b/test/cases/scope-hoisting/issue-6407/import-one.js
@@ -0,0 +1,4 @@
+function foo(n) {
+  return 'bar';
+}
+export default [, foo];
diff --git a/test/cases/scope-hoisting/issue-6407/import-two.js b/test/cases/scope-hoisting/issue-6407/import-two.js
@@ -0,0 +1,4 @@
+function foo(n) {
+  return 'bar';
+}
+export default [, foo];
diff --git a/test/cases/scope-hoisting/issue-6407/index.js b/test/cases/scope-hoisting/issue-6407/index.js
@@ -0,0 +1,11 @@
+import importOne from './import-one';
+import importTwo from './import-two';
+
+it("should concatenate modules default exports and empty array values", function() {
+	importOne.length.should.be.eql(2);
+	(typeof importOne[0]).should.be.eql('undefined');
+	(typeof importOne[1]).should.be.eql('function');
+	importTwo.length.should.be.eql(2);
+	(typeof importTwo[0]).should.be.eql('undefined');
+	(typeof importTwo[1]).should.be.eql('function');
+});

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ function getPathInAst(ast, node) {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`function enterNode(n) {`
	`146`	`+ if(!n) return undefined;`
`146`	`147`	`const r = n.range;`
`147`	`148`	`if(r) {`
`148`	`149`	`if(r[0] <= nr[0] && r[1] >= nr[1]) {`