Add error helpers; Add try-catch to options evaluation

gribnoysup · gribnoysup · commit b0fe0138eeae · 2017-11-25T21:49:59.000+01:00
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -6,6 +6,8 @@
 */
 var path = require("path");
 
+var errorHelpers = require("../lib/ErrorHelpers");
+
 // Local version replace global one
 try {
 	var localWebpack = require.resolve(path.join(process.cwd(), "node_modules", "webpack", "bin", "webpack.js"));
@@ -168,7 +170,23 @@ yargs.parse(process.argv.slice(2), (err, argv, output) => {
 		argv["display"] = "verbose";
 	}
 
-	var options = require("./convert-argv")(yargs, argv);
+	try {
+		Error.stackTraceLimit = 30;
+		var options = require("./convert-argv")(yargs, argv);
+	} catch(err) {
+		var stack = errorHelpers.cutOffAfterFlag(err.stack, "webpack.config");
+		var message = err.message + "\n" + errorHelpers.cutOffMultilineMessage(stack, err.message);
+
+		if(argv.color)
+			console.error(
+				`\u001b[1m\u001b[31m${message}\u001b[39m\u001b[22m`
+			);
+		else
+			console.error(message);
+
+		process.exitCode = 1;
+		return;
+	}
 
 	function ifArg(name, fn, init) {
 		if(Array.isArray(argv[name])) {
diff --git a/lib/ErrorHelpers.js b/lib/ErrorHelpers.js
@@ -6,6 +6,13 @@
 
 const loaderFlag = "LOADER_EXECUTION";
 
+exports.cutOffAfterFlag = (stack, flag) => {
+	stack = stack.split("\n");
+	const idx = stack.findIndex(line => line.indexOf(flag) >= 0);
+	if(idx >= 0) stack.length = idx + 1;
+	return stack.join("\n");
+};
+
 exports.cutOffLoaderExecution = (stack) => {
 	stack = stack.split("\n");
 	for(let i = 0; i < stack.length; i++)
@@ -14,6 +21,13 @@ exports.cutOffLoaderExecution = (stack) => {
 	return stack.join("\n");
 };
 
+exports.cutOffMultilineMessage = (stack, message) => {
+	stack = stack.split("\n");
+	message = message.split("\n");
+
+	return stack.reduce((acc, line, idx) => line.indexOf(message[idx]) < 0 ? acc.concat(line) : acc, []).join("\n");
+};
+
 exports.cutOffMessage = (stack, message) => {
 	const nextLine = stack.indexOf("\n");
 	if(nextLine === -1) {
