diff --git a/package.json b/package.json index 7b39ad7b792b1e336f47a9c1c5f82afea2c904f6..24e87d06b87c45fbf070d950594b952a33f76c90 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "antd": "^3.11.6", "bizcharts": "^3.4.2", "bizcharts-plugin-slider": "^2.1.1-beta.1", + "chalk": "^2.4.2", "classnames": "^2.2.6", "dva": "^2.4.0", "enquire-js": "^0.2.1", diff --git a/scripts/lint-prettier.js b/scripts/lint-prettier.js index 24c4df407f1f410bf5984a742e24fad01d510826..677f793bee1ee17eda4d41b2b0d05ba7c10336bf 100644 --- a/scripts/lint-prettier.js +++ b/scripts/lint-prettier.js @@ -8,12 +8,12 @@ const prettier = require('prettier'); const fs = require('fs'); +const chalk = require('chalk'); const prettierConfigPath = require.resolve('../.prettierrc'); const files = process.argv.slice(2); let didError = false; -let didWarn = false; files.forEach(file => { Promise.all([ @@ -32,21 +32,19 @@ files.forEach(file => { ...options, parser: fileInfo.inferredParser, }; - const isPrettier = prettier.check(input, withParserOptions); - if (!isPrettier) { - console.log( - `\x1b[31m ${file} is no prettier, please use npm run prettier and git add !\x1b[0m` - ); - didWarn = true; + const output = prettier.format(input, withParserOptions); + if (output !== input) { + fs.writeFileSync(file, output, 'utf8'); + console.log(chalk.green(`${file} is prettier`)); } }) .catch(e => { didError = true; }) .finally(() => { - if (didWarn || didError) { + if (didError) { process.exit(1); } - console.log('\x1b[32m lint prettier success!\x1b[0m'); + console.log(chalk.hex('#1890FF')('prettier success!')); }); }); diff --git a/scripts/prettier.js b/scripts/prettier.js index 9ce7813a1e4ddf73957f3082fe1135ff3ad512f0..17ded6c500f4233ae5e998d0535992617f82e666 100644 --- a/scripts/prettier.js +++ b/scripts/prettier.js @@ -6,11 +6,11 @@ *----------*****-------------- */ -const glob = require('glob'); const prettier = require('prettier'); const fs = require('fs'); const getPrettierFiles = require('./getPrettierFiles'); const prettierConfigPath = require.resolve('../.prettierrc'); +const chalk = require('chalk'); let didError = false; @@ -33,7 +33,7 @@ files.forEach(file => { const output = prettier.format(input, withParserOptions); if (output !== input) { fs.writeFileSync(file, output, 'utf8'); - console.log(`\x1b[34m ${file} is prettier`); + console.log(chalk.green(`${file} is prettier`)); } } catch (e) { didError = true; @@ -43,4 +43,4 @@ files.forEach(file => { if (didError) { process.exit(1); } -console.log('\x1b[32m prettier success!'); +console.log(chalk.hex('#1890FF')('prettier success!'));