From 7d205647be5e824955c42532c18cc3e41971c280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?= Date: Fri, 4 Aug 2017 22:06:01 +0800 Subject: [PATCH 1/3] Update: add eslint version to error output. (fixes #9037) --- bin/eslint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/eslint.js b/bin/eslint.js index 10a7f73dae1..3aa1c8dcb72 100755 --- a/bin/eslint.js +++ b/bin/eslint.js @@ -45,7 +45,7 @@ process.once("uncaughtException", err => { const template = lodash.template(fs.readFileSync(path.resolve(__dirname, `../messages/${err.messageTemplate}.txt`), "utf-8")); console.error("\nOops! Something went wrong! :("); - console.error(`\n${template(err.messageData || {})}`); + console.error(`\nESLint: ${cli.execute("-v")}.${template(err.messageData || {})}`); } else { console.error(err.message); From 038f382294636b23ecf47d904eecf12c66c467a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?= Date: Sat, 5 Aug 2017 00:15:04 +0800 Subject: [PATCH 2/3] use pkg.version. --- bin/eslint.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/eslint.js b/bin/eslint.js index 3aa1c8dcb72..01a10b2821a 100755 --- a/bin/eslint.js +++ b/bin/eslint.js @@ -43,9 +43,10 @@ process.once("uncaughtException", err => { if (typeof err.messageTemplate === "string" && err.messageTemplate.length > 0) { const template = lodash.template(fs.readFileSync(path.resolve(__dirname, `../messages/${err.messageTemplate}.txt`), "utf-8")); + const pkg = require("../package.json"); console.error("\nOops! Something went wrong! :("); - console.error(`\nESLint: ${cli.execute("-v")}.${template(err.messageData || {})}`); + console.error(`\nESLint: ${pkg.version}.${template(err.messageData || {})}`); } else { console.error(err.message); From e21b374f9c9372a509a61d1807f3c3dda7b4927c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?= Date: Thu, 24 Aug 2017 09:57:17 +0800 Subject: [PATCH 3/3] Fix: accept review suggestions. --- bin/eslint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/eslint.js b/bin/eslint.js index 01a10b2821a..1a298047aed 100755 --- a/bin/eslint.js +++ b/bin/eslint.js @@ -46,7 +46,7 @@ process.once("uncaughtException", err => { const pkg = require("../package.json"); console.error("\nOops! Something went wrong! :("); - console.error(`\nESLint: ${pkg.version}.${template(err.messageData || {})}`); + console.error(`\nESLint: ${pkg.version}.\n${template(err.messageData || {})}`); } else { console.error(err.message);