use chunk ids in entry chunks too

sokra · sokra · commit 8851427ea27d · 2013-12-11T08:41:43.000+01:00
this fixes a unnecessary download in mutli-entry compilations
diff --git a/lib/JsonpMainTemplate.js b/lib/JsonpMainTemplate.js
@@ -20,9 +20,14 @@ JsonpMainTemplate.prototype.renderLocalVars = function(hash, chunk) {
 			"// object to store loaded and loading chunks",
 			'// "0" means "already loaded"',
 			'// Array means "loading", array contains callbacks',
-			chunk.modules.some(function(m) { return m.id === 0; }) ?
-			"var installedChunks = {0:0};" :
-			"var installedChunks = {0:[function(require){require(0);}]};"
+			"var installedChunks = {",
+			this.indent(
+				(chunk.ids.indexOf(0) < 0 ? "0:[function(require){require(0);}],\n" : "") +
+				chunk.ids.map(function(id) {
+					return id + ":0"
+				}).join(",\n")
+			),
+			"};"
 		);
 	}
 	return buf;
diff --git a/lib/node/NodeMainTemplate.js b/lib/node/NodeMainTemplate.js
@@ -20,7 +20,13 @@ NodeMainTemplate.prototype.renderLocalVars = function(hash, chunk) {
 			"",
 			"// object to store loaded chunks",
 			'// "1" means "already loaded"',
-			"var installedChunks = {0:1};"
+			"var installedChunks = {",
+			this.indent(
+				chunk.ids.map(function(id) {
+					return id + ":1"
+				}).join(",\n")
+			),
+			"};"
 		);
 	}
 	return buf;
diff --git a/lib/webworker/WebWorkerMainTemplate.js b/lib/webworker/WebWorkerMainTemplate.js
@@ -19,7 +19,13 @@ WebWorkerMainTemplate.prototype.renderLocalVars = function(hash, chunk) {
 			"",
 			"// object to store loaded chunks",
 			'// "1" means "already loaded"',
-			"var installedChunks = {0:1};"
+			"var installedChunks = {",
+			this.indent(
+				chunk.ids.map(function(id) {
+					return id + ":1"
+				}).join(",\n")
+			),
+			"};"
 		);
 	}
 	return buf;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.11.11",
+	"version": "0.11.12",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs/AMD/Labeled Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.11.11",`
	`3`	`+ "version": "0.11.12",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD/Labeled Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",`
`6`	`6`	`"dependencies": {`