Commit bacf54cd authored by moZLeo's avatar moZLeo Committed by 陈帅

sweet the prettier scripts (#3177)

* alter lint-prettier

* add prettier file
parent d9ae08dc
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
*----------*****-------------- *----------*****--------------
*/ */
const glob = require('glob');
const prettier = require('prettier'); const prettier = require('prettier');
const fs = require('fs'); const fs = require('fs');
const prettierConfigPath = require.resolve('../.prettierrc'); const prettierConfigPath = require.resolve('../.prettierrc');
...@@ -17,30 +16,37 @@ let didError = false; ...@@ -17,30 +16,37 @@ let didError = false;
let didWarn = false; let didWarn = false;
files.forEach(file => { files.forEach(file => {
const options = prettier.resolveConfig.sync(file, { Promise.all([
config: prettierConfigPath, prettier.resolveConfig(file, {
}); config: prettierConfigPath,
try { }),
const fileInfo = prettier.getFileInfo.sync(file); prettier.getFileInfo(file),
if (fileInfo.ignored) { ])
return; .then(resolves => {
} const [options, fileInfo] = resolves;
const input = fs.readFileSync(file, 'utf8'); if (fileInfo.ignored) {
const withParserOptions = { return;
...options, }
parser: fileInfo.inferredParser, const input = fs.readFileSync(file, 'utf8');
}; const withParserOptions = {
const isPrettier = prettier.check(input, withParserOptions); ...options,
if (!isPrettier) { parser: fileInfo.inferredParser,
console.log(`\x1b[31m ${file} is no prettier, please use npm run prettier and git add !\x1b[0m`); };
didWarn = true; const isPrettier = prettier.check(input, withParserOptions);
} if (!isPrettier) {
} catch (e) { console.log(
didError = true; `\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');
...@@ -17,10 +17,12 @@ let files = []; ...@@ -17,10 +17,12 @@ let files = [];
const jsFiles = glob.sync('src/**/*.js*', { ignore: ['**/node_modules/**', 'build/**'] }); const jsFiles = glob.sync('src/**/*.js*', { ignore: ['**/node_modules/**', 'build/**'] });
const tsFiles = glob.sync('src/**/*.ts*', { 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 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/**'] }); const lessFiles = glob.sync('src/**/*.less*', { ignore: ['**/node_modules/**', 'build/**'] });
files = files.concat(jsFiles); files = files.concat(jsFiles);
files = files.concat(tsFiles); files = files.concat(tsFiles);
files = files.concat(configFiles); files = files.concat(configFiles);
files = files.concat(scriptFiles);
files = files.concat(lessFiles); files = files.concat(lessFiles);
if (!files.length) { if (!files.length) {
return; return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment