allow multiple chunks for a dependency block webpack#640

sokra · sokra · commit de1ea9d15e5b · 2015-01-01T21:58:27.000+01:00
diff --git a/lib/AsyncDependenciesBlock.js b/lib/AsyncDependenciesBlock.js
@@ -7,9 +7,19 @@ var DependenciesBlock = require("./DependenciesBlock");
 function AsyncDependenciesBlock(name, module, loc) {
 	DependenciesBlock.call(this);
 	this.chunkName = name;
-	this.chunk = null;
+	this.chunks = null;
 	this.module = module;
 	this.loc = loc;
+
+	Object.defineProperty(this, "chunk", {
+		get: function() {
+			throw new Error("`chunk` was been renamed to `chunks` and is now an array");
+		},
+		set: function() {
+			throw new Error("`chunk` was been renamed to `chunks` and is now an array");
+		}
+	});
+
 }
 module.exports = AsyncDependenciesBlock;
 
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -98,7 +98,7 @@ Chunk.prototype.remove = function(reason) {
 		});
 	}, this);
 	this.blocks.forEach(function(b) {
-		b.chunk = null;
+		b.chunks = null;
 		b.chunkReason = reason;
 	}, this);
 };
@@ -138,7 +138,9 @@ Chunk.prototype.integrate = function(other, reason) {
 	}.bind(this));
 	other.chunks.length = 0;
 	other.blocks.forEach(function(b) {
-		b.chunk = this;
+		b.chunks = (b.chunks || [this]).map(function(c) {
+			return c === other ? this : c;
+		}, this);
 		b.chunkReason = reason;
 		this.addBlock(b);
 	}, this);
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -561,12 +561,12 @@ Compilation.prototype.processDependenciesBlockForChunk = function processDepende
 	if(block.blocks) {
 		block.blocks.forEach(function(b) {
 			var c;
-			if(!b.chunk) {
+			if(!b.chunks) {
 				c = this.addChunk(b.chunkName, b.module, b.loc);
-				b.chunk = c;
+				b.chunks = [c];
 				c.addBlock(b);
 			} else {
-				c = b.chunk;
+				c = b.chunks[0];
 			}
 			chunk.addChunk(c);
 			c.addParent(chunk);
@@ -598,10 +598,11 @@ Compilation.prototype.processDependenciesBlockForChunk = function processDepende
 
 Compilation.prototype.removeChunkFromDependencies = function removeChunkFromDependencies(block, chunk) {
 	block.blocks.forEach(function(b) {
-		var c = b.chunk;
-		chunk.removeChunk(c);
-		c.removeParent(chunk);
-		this.removeChunkFromDependencies(b, c);
+		b.chunks.forEach(function(c) {
+			chunk.removeChunk(c);
+			c.removeParent(chunk);
+			this.removeChunkFromDependencies(b, c);
+		}, this);
 	}, this);
 	function iteratorDependency(d) {
 		if(!d.module) {
diff --git a/lib/dependencies/DepBlockHelpers.js b/lib/dependencies/DepBlockHelpers.js
@@ -5,13 +5,33 @@
 var DepBlockHelpers = exports;
 
 DepBlockHelpers.getLoadDepBlockWrapper = function(depBlock, outputOptions, requestShortener, name) {
-	if(depBlock.chunk && !depBlock.chunk.entry && typeof depBlock.chunk.id === "number") {
-		return [
-			"__webpack_require__.e" + asComment(name) + "(" + depBlock.chunk.id + "" +
-			(outputOptions.pathinfo && depBlock.chunkName ? "/*! " + requestShortener.shorten(depBlock.chunkName) + " */" : "") +
-			asComment(depBlock.chunkReason) + ", ",
-			")"
-		];
+	if(depBlock.chunks) {
+		var chunks = depBlock.chunks.filter(function(chunk) {
+			return !chunk.entry && typeof chunk.id === "number";
+		});
+		if(chunks.length === 1) {
+			var chunk = chunks[0];
+			return [
+				"__webpack_require__.e" + asComment(name) + "(" + chunk.id + "" +
+				(outputOptions.pathinfo && depBlock.chunkName ? "/*! " + requestShortener.shorten(depBlock.chunkName) + " */" : "") +
+				asComment(depBlock.chunkReason) + ", ",
+				")"
+			];
+		} else if(chunks.length > 0) {
+			return [
+				"(function(" + asComment(name) + ") {"+
+				"var __WEBPACK_REMAINING_CHUNKS__ = " + chunks.length + ";" +
+				"var __WEBPACK_CALLBACK__ = function() {" +
+				"if(--__WEBPACK_REMAINING_CHUNKS__ < 1) (",
+
+				"(__webpack_require__));"+
+				"};"+
+				chunks.map(function(chunk) {
+					return "__webpack_require__.e(" + chunk.id + ", __WEBPACK_CALLBACK__);";
+				}).join("")+
+				"}())"
+			];
+		}
 	}
 };
 
