update NoEmitOnErrorsPlugin to recognize child compilation errors, add tests

mikegreiling · mikegreiling · commit 71efc0db6319 · 2017-12-28T03:41:42.000-06:00
diff --git a/lib/NoEmitOnErrorsPlugin.js b/lib/NoEmitOnErrorsPlugin.js
@@ -7,12 +7,12 @@
 class NoEmitOnErrorsPlugin {
 	apply(compiler) {
 		compiler.plugin("should-emit", (compilation) => {
-			if(compilation.errors.length > 0)
+			if(compilation.getStats().hasErrors())
 				return false;
 		});
 		compiler.plugin("compilation", (compilation) => {
 			compilation.plugin("should-record", () => {
-				if(compilation.errors.length > 0)
+				if(compilation.getStats().hasErrors())
 					return false;
 			});
 		});
diff --git a/test/StatsTestCases.test.js b/test/StatsTestCases.test.js
@@ -52,7 +52,7 @@ describe("StatsTestCases", () => {
 				if(/error$/.test(testName)) {
 					stats.hasErrors().should.be.equal(true);
 				} else if(stats.hasErrors()) {
-					done(new Error(stats.toJson().errors.join("\n\n")));
+					return done(new Error(stats.toJson().errors.join("\n\n")));
 				}
 
 				let toStringOptions = {
diff --git a/test/statsCases/no-emit-on-errors-plugin-with-child-error/TestChildCompilationFailurePlugin.js b/test/statsCases/no-emit-on-errors-plugin-with-child-error/TestChildCompilationFailurePlugin.js
@@ -0,0 +1,25 @@
+"use strict";
+
+var SingleEntryPlugin = require("../../../lib/SingleEntryPlugin");
+
+/**
+ * Runs a child compilation which produces an error in order to test that NoEmitErrorsPlugin
+ * recognizes errors within child compilations.
+ */
+module.exports = class TestChildCompilationFailurePlugin {
+
+	constructor(output) {
+		this.output = output;
+	}
+
+	apply(compiler) {
+		compiler.plugin("make", (compilation, cb) => {
+			const child = compilation.createChildCompiler("child", this.output);
+			child.plugin("compilation", childCompilation => {
+				childCompilation.errors.push(new Error("forced error"));
+			});
+			child.apply(new SingleEntryPlugin(compiler.options.context, compiler.options.entry, "child"));
+			child.runAsChild(cb);
+		});
+	}
+};
diff --git a/test/statsCases/no-emit-on-errors-plugin-with-child-error/expected.txt b/test/statsCases/no-emit-on-errors-plugin-with-child-error/expected.txt
@@ -0,0 +1,12 @@
+Hash: fb0670ebd6884ae658dc
+Time: Xms
+    Asset     Size  Chunks  Chunk Names
+ child.js  2.47 kB          
+bundle.js  2.47 kB       0  main
+   [0] (webpack)/test/statsCases/no-emit-on-errors-plugin-with-child-error/index.js 0 bytes {0} [built]
+Child child:
+       Asset     Size  Chunks  Chunk Names
+    child.js  2.47 kB       0  child
+       [0] (webpack)/test/statsCases/no-emit-on-errors-plugin-with-child-error/index.js 0 bytes {0} [built]
+    
+    ERROR in forced error
diff --git a/test/statsCases/no-emit-on-errors-plugin-with-child-error/index.js b/test/statsCases/no-emit-on-errors-plugin-with-child-error/index.js
diff --git a/test/statsCases/no-emit-on-errors-plugin-with-child-error/webpack.config.js b/test/statsCases/no-emit-on-errors-plugin-with-child-error/webpack.config.js
@@ -0,0 +1,17 @@
+"use strict";
+
+var NoEmitOnErrorsPlugin = require("../../../lib/NoEmitOnErrorsPlugin");
+var TestChildCompilationFailurePlugin = require("./TestChildCompilationFailurePlugin");
+
+module.exports = {
+	entry: "./index",
+	output: {
+		filename: "bundle.js"
+	},
+	plugins: [
+		new NoEmitOnErrorsPlugin(),
+		new TestChildCompilationFailurePlugin({
+			filename: "child.js"
+		})
+	]
+};

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ describe("StatsTestCases", () => {`
`52`	`52`	`if(/error$/.test(testName)) {`
`53`	`53`	`stats.hasErrors().should.be.equal(true);`
`54`	`54`	`} else if(stats.hasErrors()) {`
`55`		`- done(new Error(stats.toJson().errors.join("\n\n")));`
	`55`	`+ return done(new Error(stats.toJson().errors.join("\n\n")));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`let toStringOptions = {`