fixed webpack#1239

sokra · sokra · commit ea7fd67ec167 · 2015-07-22T22:34:25.000+02:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -227,15 +227,15 @@ Chunk.prototype.integratedSize = function(other, options) {
 	return modulesSize * (this.initial || other.initial ? ENTRY_CHUNK_MULTIPLICATOR : 1) + CHUNK_OVERHEAD;
 };
 
-Chunk.prototype.getChunkMaps = function(includeEntries) {
+Chunk.prototype.getChunkMaps = function(includeEntries, realHash) {
 	var chunksProcessed = [];
 	var chunkHashMap = {};
 	var chunkNameMap = {};
 	(function addChunk(c) {
 		if(chunksProcessed.indexOf(c) >= 0) return;
 		chunksProcessed.push(c);
 		if(!c.entry || includeEntries) {
-			chunkHashMap[c.id] = c.renderedHash;
+			chunkHashMap[c.id] = realHash ? c.hash : c.renderedHash;
 			if(c.name)
 				chunkNameMap[c.id] = c.name;
 		}
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -770,8 +770,14 @@ Compilation.prototype.createHash = function createHash() {
 	this.chunkTemplate.updateHash(hash);
 	this.moduleTemplate.updateHash(hash);
 	var i, chunk;
-	for(i = 0; i < this.chunks.length; i++) {
-		chunk = this.chunks[i];
+	var chunks = this.chunks.slice();
+	chunks.sort(function(a, b) {
+		if(a.entry && !b.entry) return 1;
+		if(!a.entry && b.entry) return -1;
+		return 0;
+	});
+	for(i = 0; i < chunks.length; i++) {
+		chunk = chunks[i];
 		var chunkHash = require("crypto").createHash(hashFunction);
 		chunk.updateHash(chunkHash);
 		if(chunk.entry) {
diff --git a/lib/TemplatedPathPlugin.js b/lib/TemplatedPathPlugin.js
@@ -88,7 +88,7 @@ TemplatedPathPlugin.prototype.apply = function(compiler) {
 			var outputOptions = this.outputOptions;
 			var publicPath = outputOptions.publicPath || "";
 			var filename = outputOptions.filename || "";
-			var chunkFilename = outputOptions.chunkFilename || "";
+			var chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
 			if(REGEXP_HASH_FOR_TEST.test(publicPath) || REGEXP_CHUNKHASH_FOR_TEST.test(publicPath) || REGEXP_NAME_FOR_TEST.test(publicPath))
 				return true;
 			if(REGEXP_HASH_FOR_TEST.test(filename))
@@ -101,11 +101,11 @@ TemplatedPathPlugin.prototype.apply = function(compiler) {
 
 		mainTemplate.plugin("hash-for-chunk", function(hash, chunk) {
 			var outputOptions = this.outputOptions;
-			var chunkFilename = outputOptions.chunkFilename || "";
+			var chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
 			if(REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename))
-				hash.update(JSON.stringify(chunk.getChunkMaps(true).hash));
+				hash.update(JSON.stringify(chunk.getChunkMaps(true, true).hash));
 			if(REGEXP_NAME_FOR_TEST.test(chunkFilename))
-				hash.update(JSON.stringify(chunk.getChunkMaps(true).name));
+				hash.update(JSON.stringify(chunk.getChunkMaps(true, true).name));
 		});
 	});
 };
diff --git a/test/statsCases/chunks/expected.txt b/test/statsCases/chunks/expected.txt
@@ -1,4 +1,4 @@
-Hash: 50078353b18e95d51f49
+Hash: 27b51279f30c19c26769
 Time: Xms
       Asset       Size  Chunks             Chunk Names
   bundle.js    3.83 kB       0  [emitted]  main

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Hash: 50078353b18e95d51f49`
	`1`	`+Hash: 27b51279f30c19c26769`
`2`	`2`	`Time: Xms`
`3`	`3`	`Asset Size Chunks Chunk Names`
`4`	`4`	`bundle.js 3.83 kB 0 [emitted] main`