feat: 支持 eslint 9 配置以及stylelint检测

chenjiajun79 · chenjiajun79 · commit 646a6994e582 · 2025-05-26T21:12:59.000+08:00
diff --git a/index.d.ts b/index.d.ts
@@ -1,4 +1,4 @@
-import { MessageKind, Message, ValidateResult } from './js-binding';
+import { Message, MessageKind, ValidateResult } from './js-binding';
 declare const _default: (ctx: any) => void;
 export default _default;
 export declare function validateConfig(projectConfig: any, helper: any): Promise<ValidateResult>;
@@ -11,4 +11,5 @@ export declare function validateRecommend(appPath: string): ValidateResult;
 export declare function validateRecommendPrint(appPath: string): boolean;
 export declare function validateEslint(projectConfig: any, chalk: any): Promise<ValidateResult>;
 export declare function validateEslintPrint(projectConfig: any, chalk: any): Promise<boolean>;
-export { MessageKind, ValidateResult, Message };
+export declare function validateStylelintPrint(projectConfig: any, chalk: any): Promise<boolean>;
+export { Message, MessageKind, ValidateResult };
diff --git a/index.js b/index.js
@@ -9,10 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateEslintPrint = exports.validateEslint = exports.validateRecommendPrint = exports.validateRecommend = exports.validatePackagePrint = exports.validatePackage = exports.validateEnvPrint = exports.validateEnv = exports.validateConfigPrint = exports.validateConfig = void 0;
+exports.validateStylelintPrint = exports.validateEslintPrint = exports.validateEslint = exports.validateRecommendPrint = exports.validateRecommend = exports.validatePackagePrint = exports.validatePackage = exports.validateEnvPrint = exports.validateEnv = exports.validateConfigPrint = exports.validateConfig = void 0;
 const path = require("path");
 const eslint_1 = require("eslint");
 const glob = require("glob");
+const stylelint = require("stylelint");
 const js_binding_1 = require("./js-binding");
 exports.default = (ctx) => {
     ctx.registerCommand({
@@ -30,6 +31,7 @@ exports.default = (ctx) => {
                 validatePackagePrint(appPath, nodeModulesPath);
                 validateRecommendPrint(appPath);
                 yield validateEslintPrint(ctx.initialConfig, chalk);
+                yield validateStylelintPrint(ctx.initialConfig, chalk);
             });
         },
     });
@@ -126,21 +128,77 @@ function validateEslintPrint(projectConfig, chalk) {
     });
 }
 exports.validateEslintPrint = validateEslintPrint;
+function validateStylelintPrint(projectConfig, chalk) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const result = yield validateStylelintCore(projectConfig, chalk);
+        let is_valid = result.isValid;
+        let report = result.messages[0].content;
+        console.log(`\u{1F3AF} 检查 Stylelint (以下为 Stylelint 的输出)！`);
+        if (is_valid) {
+            console.log(`${chalk.green('[\u{2713}]')} Stylelint 检查通过！`);
+        }
+        else {
+            console.log(report);
+        }
+        return is_valid;
+    });
+}
+exports.validateStylelintPrint = validateStylelintPrint;
+function validateStylelintCore(projectConfig, chalk) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appPath = process.cwd();
+        const linterResult = yield stylelint.lint({
+            files: path.join(appPath, projectConfig.sourceRoot, '**/*.{css,less,scss,sass}'),
+            configBasedir: appPath,
+            formatter: 'string'
+        });
+        let report = linterResult.report;
+        let is_valid = true;
+        for (const result of linterResult.results) {
+            if (result.warnings.length > 0) {
+                is_valid = false;
+                break;
+            }
+        }
+        if (is_valid) {
+            report = `${chalk.green('[\u{2713}]')} Stylelint 检查通过！`;
+        }
+        return {
+            isValid: is_valid,
+            messages: [
+                {
+                    kind: is_valid ? 2 /* MessageKind.Success */ : 1 /* MessageKind.Error */,
+                    content: report,
+                },
+            ],
+        };
+    });
+}
 function validateEslintCore(projectConfig, chalk) {
     return __awaiter(this, void 0, void 0, function* () {
         const appPath = process.cwd();
-        const globPattern = glob.sync(path.join(appPath, '.eslintrc*'));
-        const eslintCli = new eslint_1.ESLint({
-            cwd: process.cwd(),
-            useEslintrc: Boolean(globPattern.length),
+        const legacyConfigPattern = glob.sync(path.join(appPath, '.eslintrc*'));
+        const flatConfigPattern = glob.sync(path.join(appPath, 'eslint.config.{js,cjs,mjs}'));
+        const useFlatConfig = Boolean(flatConfigPattern.length);
+        const cwd = process.cwd();
+        const flatConfig = {
+            cwd,
+        };
+        // 兼容 eslint8
+        const legacyConfig = {
+            cwd,
+            useEslintrc: Boolean(legacyConfigPattern.length),
             baseConfig: {
                 extends: [`taro/${projectConfig.framework}`],
             },
-        });
-        const sourceFiles = path.join(process.cwd(), projectConfig.sourceRoot, '**/*.{js,ts,jsx,tsx}');
+        };
+        const ESLint = yield (0, eslint_1.loadESLint)({ useFlatConfig });
+        const options = useFlatConfig ? flatConfig : legacyConfig;
+        const eslintCli = new ESLint(options);
+        const sourceFiles = path.join(cwd, projectConfig.sourceRoot, '**/*.{js,ts,jsx,tsx}');
         const report = yield eslintCli.lintFiles([sourceFiles]);
         const formatter = yield eslintCli.loadFormatter();
-        let rawReport = formatter.format(report);
+        let rawReport = yield formatter.format(report);
         let is_valid = true;
         if (rawReport) {
             is_valid = false;
diff --git a/index.ts b/index.ts
@@ -1,19 +1,20 @@
 import * as path from 'path'
 
-import { ESLint } from 'eslint'
+import { ESLint, loadESLint } from 'eslint'
 import * as glob from 'glob'
 
+import * as stylelint from 'stylelint'
 import {
-  validateEnvPrint as validateEnvPrintBinding,
+  Message,
+  MessageKind,
+  validateConfig as validateConfigBinding,
   validateConfigPrint as validateConfigPrintBinding,
-  validatePackagePrint as validatePackagePrintBinding,
-  validateRecommendPrint as validateRecommendPrintBinding,
   validateEnv as validateEnvBinding,
-  validateConfig as validateConfigBinding,
+  validateEnvPrint as validateEnvPrintBinding,
   validatePackage as validatePackageBinding,
+  validatePackagePrint as validatePackagePrintBinding,
   validateRecommend as validateRecommendBinding,
-  MessageKind,
-  Message,
+  validateRecommendPrint as validateRecommendPrintBinding,
   ValidateResult,
 } from './js-binding'
 
@@ -33,6 +34,7 @@ export default (ctx) => {
       validatePackagePrint(appPath, nodeModulesPath)
       validateRecommendPrint(appPath)
       await validateEslintPrint(ctx.initialConfig, chalk)
+      await validateStylelintPrint(ctx.initialConfig, chalk)
     },
   })
 }
@@ -118,22 +120,77 @@ export async function validateEslintPrint(projectConfig, chalk): Promise<boolean
   return is_valid
 }
 
+export async function validateStylelintPrint(projectConfig, chalk): Promise<boolean> {
+  const result = await validateStylelintCore(projectConfig, chalk)
+  let is_valid = result.isValid
+  let report = result.messages[0].content
+  console.log(`\u{1F3AF} 检查 Stylelint (以下为 Stylelint 的输出)！`)
+  if (is_valid) {
+    console.log(`${chalk.green('[\u{2713}]')} Stylelint 检查通过！`)
+  } else {
+    console.log(report)
+  }
+  return is_valid
+}
+
+async function validateStylelintCore(projectConfig, chalk): Promise<ValidateResult> {
+  const appPath = process.cwd()
+  const linterResult = await stylelint.lint({
+    files: path.join(appPath, projectConfig.sourceRoot, '**/*.{css,less,scss,sass}'),
+    configBasedir: appPath,
+    formatter: 'string'
+  })
+  let report = linterResult.report
+  let is_valid = true
+  for (const result of linterResult.results) {
+    if (result.warnings.length > 0) {
+      is_valid = false
+      break
+    }
+  }
+  if (is_valid) {
+    report = `${chalk.green('[\u{2713}]')} Stylelint 检查通过！`
+  }
+  return {
+    isValid: is_valid,
+    messages: [
+      {
+        kind: is_valid ? MessageKind.Success : MessageKind.Error,
+        content: report,
+      },
+    ],
+  }
+}
+
 async function validateEslintCore(projectConfig, chalk): Promise<ValidateResult> {
   const appPath = process.cwd()
-  const globPattern = glob.sync(path.join(appPath, '.eslintrc*'))
+  const legacyConfigPattern = glob.sync(path.join(appPath, '.eslintrc*'))
+  const flatConfigPattern = glob.sync(path.join(appPath, 'eslint.config.{js,cjs,mjs}'))
+  const useFlatConfig = Boolean(flatConfigPattern.length)
+
+  const cwd = process.cwd()
 
-  const eslintCli = new ESLint({
-    cwd: process.cwd(),
-    useEslintrc: Boolean(globPattern.length),
+  const flatConfig: ESLint.Options = {
+    cwd,
+  }
+
+  // 兼容 eslint8
+  const legacyConfig: ESLint.LegacyOptions = {
+    cwd,
+    useEslintrc: Boolean(legacyConfigPattern.length),
     baseConfig: {
       extends: [`taro/${projectConfig.framework}`],
     },
-  })
+  }
+
+  const ESLint = await loadESLint({ useFlatConfig })
+  const options = useFlatConfig ? flatConfig : legacyConfig
+  const eslintCli = new ESLint(options as any)
 
-  const sourceFiles = path.join(process.cwd(), projectConfig.sourceRoot, '**/*.{js,ts,jsx,tsx}')
+  const sourceFiles = path.join(cwd, projectConfig.sourceRoot, '**/*.{js,ts,jsx,tsx}')
   const report = await eslintCli.lintFiles([sourceFiles])
   const formatter = await eslintCli.loadFormatter()
-  let rawReport = formatter.format(report)
+  let rawReport = await formatter.format(report)
   let is_valid = true
   if (rawReport) {
     is_valid = false
@@ -152,8 +209,4 @@ async function validateEslintCore(projectConfig, chalk): Promise<ValidateResult>
   }
 }
 
-export {
-  MessageKind,
-  ValidateResult,
-  Message
-}
+export { Message, MessageKind, ValidateResult }
diff --git a/package.json b/package.json
@@ -20,8 +20,9 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "eslint": "8.41.0",
-    "glob": "10.2.6"
+    "eslint": "^9.12.0",
+    "glob": "10.2.6",
+    "stylelint": "^16.19.1"
   },
   "devDependencies": {
     "@napi-rs/cli": "^2.15.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
