fixed webpack#2443

sokra · sokra · commit 93f38132d118 · 2016-05-14T14:41:31.000+02:00
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
@@ -136,9 +136,10 @@ ContextModule.prototype.source = function() {
 			return a.userRequest < b.userRequest ? -1 : 1;
 		}).forEach(function(item) {
 			if(item.dependency.module) {
-				if(item.block.chunks.length > 1)
+				var chunks = item.block.chunks || [];
+				if(chunks.length !== 1)
 					hasMultipleChunks = true;
-				map[item.userRequest] = [item.dependency.module.id].concat(item.block.chunks.map(function(chunk) {
+				map[item.userRequest] = [item.dependency.module.id].concat(chunks.map(function(chunk) {
 					return chunk.id;
 				}));
 			}
diff --git a/test/cases/chunks/issue-2443/dir/one/file.js b/test/cases/chunks/issue-2443/dir/one/file.js
@@ -0,0 +1 @@
+module.exports = 1;
diff --git a/test/cases/chunks/issue-2443/dir/three/file.js b/test/cases/chunks/issue-2443/dir/three/file.js
@@ -0,0 +1 @@
+module.exports = 3;
diff --git a/test/cases/chunks/issue-2443/dir/two/file.js b/test/cases/chunks/issue-2443/dir/two/file.js
@@ -0,0 +1 @@
+module.exports = 2;
diff --git a/test/cases/chunks/issue-2443/index.js b/test/cases/chunks/issue-2443/index.js
@@ -0,0 +1,20 @@
+it("should be able to use expressions in System.import (directory)", function(done) {
+	function load(name, expected, callback) {
+		System.import("./dir/" + name + "/file.js").then(function(result) {
+			result.should.be.eql(expected);
+			callback();
+		}).catch(function(err) {
+			done(err);
+		});
+	}
+	require.include("./dir/three/file");
+	load("one", 1, function() {
+		load("two", 2, function() {
+			load("three", 3, function() {
+				load("two", 2, function() {
+					done();
+				});
+			});
+		});
+	});
+});
