From bacf54cdf03647cd861d7d6a96de206843545241 Mon Sep 17 00:00:00 2001
From: moZLeo <Tommy-White@users.noreply.github.com>
Date: Fri, 21 Dec 2018 14:26:47 +0800
Subject: [PATCH] sweet the prettier scripts (#3177)

* alter lint-prettier

* add prettier file
---
 scripts/lint-prettier.js | 60 ++++++++++++++++++++++------------------
 scripts/prettier.js      |  2 ++
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/scripts/lint-prettier.js b/scripts/lint-prettier.js
index eef8a74a..24c4df40 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 86d1a3de..29cbe340 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;
-- 
GitLab