Merge pull request webpack#5501 from webpack/bugfix/hash-watch-warnings-errors

sokra · web-flow · commit 839915ccf737 · 2017-08-11T17:46:49.000+02:00
Warnings and Errors contribute to hash
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -1120,6 +1120,17 @@ class Compilation extends Tapable {
 		for(let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
 			chunks[indexChunk].sortItems();
 		}
+
+		const byMessage = (a, b) => {
+			const ma = `${a.message}`;
+			const mb = `${b.message}`;
+			if(ma < mb) return -1;
+			if(mb < ma) return 1;
+			return 0;
+		};
+
+		this.errors.sort(byMessage);
+		this.warnings.sort(byMessage);
 	}
 
 	summarizeDependencies() {
@@ -1188,6 +1199,12 @@ class Compilation extends Tapable {
 		this.children.forEach(function(child) {
 			hash.update(child.hash);
 		});
+		this.warnings.forEach(function(warning) {
+			hash.update(`${warning.message}`);
+		});
+		this.errors.forEach(function(error) {
+			hash.update(`${error.message}`);
+		});
 		// clone needed as sort below is inplace mutation
 		const chunks = this.chunks.slice();
 		/**
diff --git a/test/statsCases/module-trace-disabled-in-error/expected.txt b/test/statsCases/module-trace-disabled-in-error/expected.txt
@@ -1,4 +1,3 @@
-Hash: 6e950f2e83663cb6e9a6
 Time: Xms
   Asset     Size  Chunks             Chunk Names
 main.js  2.65 kB       0  [emitted]  main
diff --git a/test/statsCases/module-trace-disabled-in-error/webpack.config.js b/test/statsCases/module-trace-disabled-in-error/webpack.config.js
@@ -1,6 +1,7 @@
 module.exports = {
 	entry: "./index",
 	stats: {
+		hash: false,
 		moduleTrace: false
 	}
 };
diff --git a/test/statsCases/module-trace-enabled-in-error/expected.txt b/test/statsCases/module-trace-enabled-in-error/expected.txt
@@ -1,4 +1,3 @@
-Hash: 6e950f2e83663cb6e9a6
 Time: Xms
   Asset     Size  Chunks             Chunk Names
 main.js  2.65 kB       0  [emitted]  main
diff --git a/test/statsCases/module-trace-enabled-in-error/webpack.config.js b/test/statsCases/module-trace-enabled-in-error/webpack.config.js
@@ -1,6 +1,7 @@
 module.exports = {
 	entry: "./index",
 	stats: {
+		hash: false,
 		moduleTrace: true
 	}
 };
diff --git a/test/watchCases/warnings/warnings-contribute-to-hash/0/changing-file.js b/test/watchCases/warnings/warnings-contribute-to-hash/0/changing-file.js
@@ -0,0 +1 @@
+Warning1
diff --git a/test/watchCases/warnings/warnings-contribute-to-hash/0/index.js b/test/watchCases/warnings/warnings-contribute-to-hash/0/index.js
@@ -0,0 +1,12 @@
+require("./warning-loader!./changing-file");
+
+it("should detect a change on warnings change", function() {
+	switch(WATCH_STEP) {
+		case "0":
+			STATE.hash = STATS_JSON.hash;
+			break;
+		case "1":
+			STATS_JSON.hash.should.be.not.eql(STATE.hash);
+			break;
+	}
+});
diff --git a/test/watchCases/warnings/warnings-contribute-to-hash/0/warning-loader.js b/test/watchCases/warnings/warnings-contribute-to-hash/0/warning-loader.js
@@ -0,0 +1,4 @@
+module.exports = function(source) {
+	this.emitWarning(new Error(source.trim()));
+	return "";
+};
diff --git a/test/watchCases/warnings/warnings-contribute-to-hash/0/warnings.js b/test/watchCases/warnings/warnings-contribute-to-hash/0/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Warning1/]
+];
diff --git a/test/watchCases/warnings/warnings-contribute-to-hash/1/changing-file.js b/test/watchCases/warnings/warnings-contribute-to-hash/1/changing-file.js
@@ -0,0 +1 @@
+New Warning
diff --git a/test/watchCases/warnings/warnings-contribute-to-hash/1/warnings.js b/test/watchCases/warnings/warnings-contribute-to-hash/1/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/New Warning/]
+];

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-Hash: 6e950f2e83663cb6e9a6`
`2`	`1`	`Time: Xms`
`3`	`2`	`Asset Size Chunks Chunk Names`
`4`	`3`	`main.js 2.65 kB 0 [emitted] main`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`entry: "./index",`
`3`	`3`	`stats: {`
	`4`	`+ hash: false,`
`4`	`5`	`moduleTrace: false`
`5`	`6`	`}`
`6`	`7`	`};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/Warning1/]`
	`3`	`+];`