Merge pull request webpack#5370 from polomsky/master

sokra · web-flow · commit a15d4a9936fe · 2017-07-27T13:46:21.000+02:00
Fix exit code and ELIFECYCLE error
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -350,16 +350,14 @@ function processOptions(options) {
 				process.stdout.write(statsString + "\n");
 		}
 		if(!options.watch && stats.hasErrors()) {
-			process.on("exit", function() {
-				process.exit(2); // eslint-disable-line
-			});
+			process.exitCode = 2;
 		}
 	}
 	if(firstOptions.watch || options.watch) {
 		var watchOptions = firstOptions.watchOptions || firstOptions.watch || options.watch || {};
 		if(watchOptions.stdin) {
 			process.stdin.on("end", function() {
-				process.exit(0); // eslint-disable-line
+				process.exit(); // eslint-disable-line
 			});
 			process.stdin.resume();
 		}
diff --git a/test/binCases/errors/parse/index.js b/test/binCases/errors/parse/index.js
@@ -0,0 +1 @@
+}
diff --git a/test/binCases/errors/parse/test.js b/test/binCases/errors/parse/test.js
@@ -0,0 +1,18 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	code.should.be.eql(2);
+
+	console.log(stdout);
+	stdout[0].should.containEql("Hash: ");
+	stdout[1].should.containEql("Version: ");
+	stdout[2].should.containEql("Time: ");
+	stdout[5].should.containEql("./index.js");
+	stdout[5].should.containEql("[built]");
+	stdout[5].should.containEql("[failed]");
+	stdout[5].should.containEql("[1 error]");
+	stdout[7].should.containEql("ERROR in ./index.js");
+	stdout[8].should.containEql("Module parse failed:");
+
+	stderr.should.be.empty();
+};
diff --git a/test/binCases/errors/parse/webpack.config.js b/test/binCases/errors/parse/webpack.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+	context: __dirname,
+	entry: "./index"
+};

Original file line number	Diff line number	Diff line change
`@@ -350,16 +350,14 @@ function processOptions(options) {`
`350`	`350`	`process.stdout.write(statsString + "\n");`
`351`	`351`	`}`
`352`	`352`	`if(!options.watch && stats.hasErrors()) {`
`353`		`- process.on("exit", function() {`
`354`		`- process.exit(2); // eslint-disable-line`
`355`		`- });`
	`353`	`+ process.exitCode = 2;`
`356`	`354`	`}`
`357`	`355`	`}`
`358`	`356`	`if(firstOptions.watch \|\| options.watch) {`
`359`	`357`	`var watchOptions = firstOptions.watchOptions \|\| firstOptions.watch \|\| options.watch \|\| {};`
`360`	`358`	`if(watchOptions.stdin) {`
`361`	`359`	`process.stdin.on("end", function() {`
`362`		`- process.exit(0); // eslint-disable-line`
	`360`	`+ process.exit(); // eslint-disable-line`
`363`	`361`	`});`
`364`	`362`	`process.stdin.resume();`
`365`	`363`	`}`