diff --git a/scripts/lint-prettier.js b/scripts/lint-prettier.js index eef8a74a6aca3573fa99300949f483a5d627bb06..24c4df407f1f410bf5984a742e24fad01d510826 100644 --- a/scripts/lint-prettier.js +++ b/scripts/lint-prettier.js @@ -6,7 +6,6 @@ *----------*****-------------- */ -const glob = require('glob'); const prettier = require('prettier'); const fs = require('fs'); const prettierConfigPath = require.resolve('../.prettierrc'); @@ -17,30 +16,37 @@ let didError = false; let didWarn = false; files.forEach(file => { - const options = prettier.resolveConfig.sync(file, { - config: prettierConfigPath, - }); - try { - const fileInfo = prettier.getFileInfo.sync(file); - if (fileInfo.ignored) { - return; - } - const input = fs.readFileSync(file, 'utf8'); - const withParserOptions = { - ...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; - } - } catch (e) { - didError = true; - } + Promise.all([ + prettier.resolveConfig(file, { + config: prettierConfigPath, + }), + prettier.getFileInfo(file), + ]) + .then(resolves => { + const [options, fileInfo] = resolves; + if (fileInfo.ignored) { + return; + } + const input = fs.readFileSync(file, 'utf8'); + const withParserOptions = { + ...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; + } + }) + .catch(e => { + didError = true; + }) + .finally(() => { + if (didWarn || didError) { + process.exit(1); + } + console.log('\x1b[32m lint prettier success!\x1b[0m'); + }); }); - -if (didWarn || didError) { - process.exit(1); -} -console.log('\x1b[32m lint prettier success!\x1b[0m'); diff --git a/scripts/prettier.js b/scripts/prettier.js index 86d1a3dec541ba73ef1d30781f3bbd5e8e1d8608..29cbe340a0aec50621a31821e4ec271823343b43 100644 --- a/scripts/prettier.js +++ b/scripts/prettier.js @@ -17,10 +17,12 @@ let files = []; const jsFiles = glob.sync('src/**/*.js*', { ignore: ['**/node_modules/**', 'build/**'] }); const tsFiles = glob.sync('src/**/*.ts*', { ignore: ['**/node_modules/**', 'build/**'] }); const configFiles = glob.sync('config/**/*.js*', { ignore: ['**/node_modules/**', 'build/**'] }); +const scriptFiles = glob.sync('scripts/**/*.js'); const lessFiles = glob.sync('src/**/*.less*', { ignore: ['**/node_modules/**', 'build/**'] }); files = files.concat(jsFiles); files = files.concat(tsFiles); files = files.concat(configFiles); +files = files.concat(scriptFiles); files = files.concat(lessFiles); if (!files.length) { return;