keep commons chunk in mind when optimizing

sokra · sokra · commit 153be562db11 · 2013-12-03T11:28:00.000+01:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -146,7 +146,7 @@ Chunk.prototype.size = function(options) {
 	}).reduce(function(a, b) {
 		return a + b;
 	}, 0);
-	return modulesSize * (this.entry ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
+	return modulesSize * (this.id === 0 ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
 };
 
 Chunk.prototype.integratedSize = function(other, options) {
@@ -164,7 +164,7 @@ Chunk.prototype.integratedSize = function(other, options) {
 	}).reduce(function(a, b) {
 		return a + b;
 	}, 0);
-	return modulesSize * (this.entry || other.entry ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
+	return modulesSize * (this.id === 0 || other.id === 0 ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
 };
 
 Chunk.prototype.toString = function() {
diff --git a/lib/optimize/OccurenceOrderPlugin.js b/lib/optimize/OccurenceOrderPlugin.js
@@ -12,7 +12,7 @@ OccurenceOrderPlugin.prototype.apply = function(compiler) {
 		compilation.plugin("optimize-module-order", function(modules) {
 			function entryChunks(m) {
 				return m.chunks.filter(function(c) {
-					return c.entry;
+					return c.id === 0;
 				}).length;
 			}
 			function occursInEntry(m) {
@@ -46,7 +46,7 @@ OccurenceOrderPlugin.prototype.apply = function(compiler) {
 		compilation.plugin("optimize-chunk-order", function(chunks) {
 			function occursInEntry(c) {
 				return c.parents.filter(function(p) {
-					return p.entry;
+					return p.id === 0;
 				}).length;
 			}
 			function occurs(c) {
