Merge branch 'master' into bugfix/fix_stats_when_passed_array

sokra · sokra · commit 19c7260b57b0 · 2017-01-11T12:47:37.000+01:00
diff --git a/bin/config-yargs.js b/bin/config-yargs.js
@@ -154,12 +154,6 @@ module.exports = function(yargs) {
 				describe: "Watch the filesystem for changes",
 				group: BASIC_GROUP
 			},
-			"save": {
-				type: "boolean",
-				alias: "s",
-				describe: "Rebuilds on save regardless of changes in watch mode",
-				group: BASIC_GROUP
-			},
 			"watch-stdin": {
 				type: "boolean",
 				alias: "stdin",
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -346,9 +346,7 @@ function processOptions(options) {
 			process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");
 		} else if(stats.hash !== lastHash) {
 			lastHash = stats.hash;
-			process.stdout.write("\n" + new Date() + "\n" + "\n");
 			process.stdout.write(stats.toString(outputOptions) + "\n");
-			if(argv.s) lastHash = null;
 		}
 		if(!options.watch && stats.hasErrors()) {
 			process.on("exit", function() {
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -967,7 +967,13 @@ class Compilation extends Tapable {
 			hash.update(child.hash);
 		});
 		let chunk;
+		// clone needed as sort below is inplace mutation
 		const chunks = this.chunks.slice();
+		/**
+		 * sort here will bring all "falsy" values to the beginning
+		 * this is needed as the "hasRuntime()" chunks are dependent on the
+		 * hashes of the non-runtime chunks.
+		 */
 		chunks.sort((a, b) => {
 			const aEntry = a.hasRuntime();
 			const bEntry = b.hasRuntime();
@@ -979,7 +985,7 @@ class Compilation extends Tapable {
 			chunk = chunks[i];
 			const chunkHash = crypto.createHash(hashFunction);
 			if(outputOptions.hashSalt)
-				hash.update(outputOptions.hashSalt);
+				chunkHash.update(outputOptions.hashSalt);
 			chunk.updateHash(chunkHash);
 			if(chunk.hasRuntime()) {
 				this.mainTemplate.updateHashForChunk(chunkHash, chunk);
diff --git a/lib/dependencies/NullDependency.js b/lib/dependencies/NullDependency.js
@@ -6,10 +6,6 @@
 const Dependency = require("../Dependency");
 
 class NullDependency extends Dependency {
-	constructor() {
-		super();
-	}
-
 	get type() {
 		return "null";
 	}
diff --git a/test/binCases/stats/single-config/test.js b/test/binCases/stats/single-config/test.js
@@ -4,12 +4,12 @@ module.exports = function testAssertions(code, stdout, stderr) {
 	code.should.be.oneOf(0, 1);
 
 	stdout.should.be.ok();
-	stdout[3].should.containEql("Hash: ");
-	stdout[4].should.containEql("Version: ");
-	stdout[5].should.containEql("Time: ");
-	stdout[7].should.containEql("null.js");
-	stdout[8].should.containEql("./index.js");
-	stdout[8].should.containEql("[built]");
+	stdout[0].should.containEql("Hash: ");
+	stdout[1].should.containEql("Version: ");
+	stdout[2].should.containEql("Time: ");
+	stdout[4].should.containEql("null.js");
+	stdout[5].should.containEql("./index.js");
+	stdout[5].should.containEql("[built]");
 
 	stderr.should.be.empty();
 }
