refactor(bin/webpack): use err.name for error handling

michael-ciniawsky · michael-ciniawsky · commit a88fdc74bfc9 · 2017-11-07T10:37:09.000+01:00
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -333,16 +333,19 @@ yargs.parse(process.argv.slice(2), (err, argv, output) => {
 		var compiler;
 		try {
 			compiler = webpack(options);
-		} catch(e) {
-			var WebpackOptionsValidationError = require("../lib/WebpackOptionsValidationError");
-			if(e instanceof WebpackOptionsValidationError) {
+		} catch(err) {
+			if(err.name === "WebpackOptionsValidationError") {
 				if(argv.color)
-					console.error("\u001b[1m\u001b[31m" + e.message + "\u001b[39m\u001b[22m");
+					console.error(
+						`\u001b[1m\u001b[31m${err.message}\u001b[39m\u001b[22m`
+					);
 				else
-					console.error(e.message);
-				process.exit(1); // eslint-disable-line no-process-exit
+					console.error(err.message);
+				// eslint-disable-next-line no-process-exit
+				process.exit(1);
 			}
-			throw e;
+
+			throw err;
 		}
 
 		if(argv.progress) {
diff --git a/test/Validation.test.js b/test/Validation.test.js
@@ -2,8 +2,8 @@
 "use strict";
 
 require("should");
+
 const webpack = require("../lib/webpack");
-const WebpackOptionsValidationError = require("../lib/WebpackOptionsValidationError");
 
 describe("Validation", () => {
 	const testCases = [{
@@ -207,30 +207,33 @@ describe("Validation", () => {
 				foobar: true
 			}
 		},
-		test(e) {
-			e.message.should.startWith("Invalid configuration object.");
-			e.message.split("\n").slice(1)[0].should.be.eql(
+		test(err) {
+			err.message.should.startWith("Invalid configuration object.");
+			err.message.split("\n").slice(1)[0].should.be.eql(
 				" - configuration.stats should be one of these:"
 			);
 		}
 	}];
+
 	testCases.forEach((testCase) => {
 		it("should fail validation for " + testCase.name, () => {
 			try {
 				webpack(testCase.config);
-			} catch(e) {
-				if(!(e instanceof WebpackOptionsValidationError))
-					throw e;
+			} catch(err) {
+				if(err.name !== 'WebpackOptionsValidationError') throw err;
 
 				if(testCase.test) {
-					testCase.test(e);
+					testCase.test(err);
+
 					return;
 				}
 
-				e.message.should.startWith("Invalid configuration object.");
-				e.message.split("\n").slice(1).should.be.eql(testCase.message);
+				err.message.should.startWith("Invalid configuration object.");
+				err.message.split("\n").slice(1).should.be.eql(testCase.message);
+
 				return;
 			}
+
 			throw new Error("Validation didn't fail");
 		});
 	});
