fixes webpack-contrib/extract-text-webpack-plugin#82

sokra · sokra · commit 79eb40425715 · 2016-07-15T21:59:24.000+02:00
fixes webpack-contrib/extract-text-webpack-plugin#115 fixes webpack-contrib/extract-text-webpack-plugin#170
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -209,7 +209,13 @@ Chunk.prototype.integrate = function(other, reason) {
 		} else if(origin.reasons[0] !== reason) {
 			origin.reasons.unshift(reason);
 		}
-	})
+	});
+	this.chunks = this.chunks.filter(function(c) {
+		return c !== other && c !== this;
+	});
+	this.parents = this.parents.filter(function(c) {
+		return c !== other && c !== this;
+	});
 	return true;
 };
 
@@ -331,3 +337,19 @@ Chunk.prototype.sortItems = function() {
 Chunk.prototype.toString = function() {
 	return "Chunk[" + this.modules.join() + "]";
 };
+
+Chunk.prototype.checkConstraints = function() {
+	var chunk = this;
+	chunk.chunks.forEach(function(child, idx) {
+		if(chunk.chunks.indexOf(child) !== idx)
+			console.log("checkConstraints: duplicate child in chunk", chunk.debugId, child.debugId);
+		if(child.parents.indexOf(chunk) < 0)
+			console.log("checkConstraints: child missing parent", chunk.debugId, "->", child.debugId);
+	});
+	chunk.parents.forEach(function(parent, idx) {
+		if(chunk.parents.indexOf(parent) !== idx)
+			console.log("checkConstraints: duplicate parent in chunk", chunk.debugId, parent.debugId);
+		if(parent.chunks.indexOf(chunk) < 0)
+			console.log("checkConstraints: parent missing child", parent.debugId, "<-", chunk.debugId);
+	});
+};
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -948,3 +948,11 @@ Compilation.prototype.getStats = function() {
 Compilation.prototype.createChildCompiler = function(name, outputOptions) {
 	return this.compiler.createChildCompiler(this, name, outputOptions);
 };
+
+Compilation.prototype.checkConstraints = function() {
+	this.chunks.forEach(function(chunk, idx) {
+		if(this.chunks.indexOf(chunk) !== idx)
+			console.log("checkConstraints: duplicate chunk in compilation", chunk.debugId);
+		chunk.checkConstraints();
+	}.bind(this));
+};
diff --git a/lib/optimize/CommonsChunkPlugin.js b/lib/optimize/CommonsChunkPlugin.js
@@ -168,7 +168,7 @@ CommonsChunkPlugin.prototype.apply = function(compiler) {
 						chunk.entrypoints.forEach(function(ep) {
 							ep.insertChunk(commonChunk, chunk);
 						});
-						commonChunk.chunks.push(chunk);
+						commonChunk.addChunk(chunk);
 					});
 				}
 				if(filenameTemplate)

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ CommonsChunkPlugin.prototype.apply = function(compiler) {`
`168`	`168`	`chunk.entrypoints.forEach(function(ep) {`
`169`	`169`	`ep.insertChunk(commonChunk, chunk);`
`170`	`170`	`});`
`171`		`- commonChunk.chunks.push(chunk);`
	`171`	`+ commonChunk.addChunk(chunk);`
`172`	`172`	`});`
`173`	`173`	`}`
`174`	`174`	`if(filenameTemplate)`