diff --git a/package-lock.json b/package-lock.json index cdd1ab3d3..5c9645ca4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -736,7 +736,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -1178,10 +1177,9 @@ "dev": true }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -1274,7 +1272,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "dev": true, "requires": { "color-name": "^1.1.1" } @@ -1282,8 +1279,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "combined-stream": { "version": "1.0.7", @@ -1637,8 +1633,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { "version": "1.11.1", @@ -2911,8 +2906,7 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { "version": "1.0.0", @@ -4420,7 +4414,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { @@ -6163,7 +6157,6 @@ "version": "5.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, "requires": { "has-flag": "^3.0.0" } diff --git a/package.json b/package.json index b73ed46e8..7466083bf 100644 --- a/package.json +++ b/package.json @@ -50,16 +50,17 @@ }, "homepage": "https://github.com/typicode/husky#readme", "dependencies": { + "chalk": "^2.4.2", "cosmiconfig": "^5.2.1", "execa": "^1.0.0", "get-stdin": "^7.0.0", "is-ci": "^2.0.0", + "opencollective-postinstall": "^2.0.2", "pkg-dir": "^4.2.0", "please-upgrade-node": "^3.1.1", "read-pkg": "^5.1.1", "run-node": "^1.0.0", - "slash": "^3.0.0", - "opencollective-postinstall": "^2.0.2" + "slash": "^3.0.0" }, "devDependencies": { "@types/cosmiconfig": "^5.0.3", diff --git a/src/installer/bin.ts b/src/installer/bin.ts index bf3f189f5..d0da0092d 100644 --- a/src/installer/bin.ts +++ b/src/installer/bin.ts @@ -1,3 +1,4 @@ +import chalk from 'chalk' import isCI from 'is-ci' import path from 'path' import debug from '../debug' @@ -34,6 +35,6 @@ try { uninstall(absoluteGitDir, huskyDir) } } catch (error) { - console.log(error.message.trim()) - console.log(`husky > Failed to ${action}`) + console.log(chalk.red(error.message.trim())) + console.log(chalk.red(`husky > Failed to ${action}`)) } diff --git a/src/installer/gitRevParse.ts b/src/installer/gitRevParse.ts index edf35b953..91689620c 100644 --- a/src/installer/gitRevParse.ts +++ b/src/installer/gitRevParse.ts @@ -5,16 +5,11 @@ export default function(): { topLevel: string absoluteGitDir: string } { - let result - try { - result = execa.sync('git', [ - 'rev-parse', - '--show-toplevel', - '--absolute-git-dir' - ]) - } catch (error) { - throw new Error(error.stderr) - } + const result = execa.sync('git', [ + 'rev-parse', + '--show-toplevel', + '--absolute-git-dir' + ]) const [topLevel, absoluteGitDir] = result.stdout .trim()