@apdesign/code-style-react 1.1.7 → 1.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apdesign/code-style-react",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "scripts": {},
   "bin": {
     "apdesign-code-style": "cli.js"

package/scripts/runEslint.js

@@ -3,39 +3,30 @@
 let spawnSync;
 let path;
 let fs;
-let os;
 let glob;
+let ESLint;
 
 async function runEslint() {
   try {
     if (typeof require !== 'undefined') {
       // CommonJS
-      ({ spawnSync, spawn } = require('child_process'));
+      spawnSync = require('child_process').spawnSync;
       path = require('path');
       fs = require('fs');
-      os = require('os');
       glob = require('glob');
+      ESLint = require('eslint').ESLint; 
     } else {
       // ESM
-      ({ spawnSync, spawn } = await import('node:child_process'));
+      spawnSync = await import('node:child_process').spawnSync;
       path = await import('node:path');
       fs = await import('node:fs');
-      os = await import('node:os');
       glob = (await import('glob')).default;
+      ESLint = (await import('eslint')).ESLint;
     }
 
     // 参数解析
     const args = process.argv.slice(2);
 
-    let maxWorkers = null; // 默认由 ESLint API 决定
-    const maxWorkersArgIndex = args.indexOf('--max-workers');
-    if (maxWorkersArgIndex !== -1 && args[maxWorkersArgIndex + 1]) {
-      const val = parseInt(args[maxWorkersArgIndex + 1], 10);
-      if (!isNaN(val) && val > 0) {
-        maxWorkers = val;
-      }
-    }
-
     // 检查是否有分支参数 (--branch <branchName>)
     let branchArg = null;
     const branchIndex = args.indexOf('--branch');
@@ -43,23 +34,16 @@ async function runEslint() {
       branchArg = args[branchIndex + 1];
     }
 
-    // targetPath 是第一个不是 --max-workers 的参数
+    // targetPath 是第一个不是 --branch 的参数
     let targetPath = process.cwd();
     for (let i = 0; i < args.length; i++) {
-      if (
-        i === maxWorkersArgIndex ||
-        i === maxWorkersArgIndex + 1 ||
-        i === branchIndex ||
-        i === branchIndex + 1
-      )
-        continue;
+      if (i === branchIndex || i === branchIndex + 1) continue;
       targetPath = args[i] || targetPath;
       break;
     }
 
     console.log(`\n[ESLint 配置]`);
     console.log(`路径: ${targetPath}`);
-    console.log(`并发线程数: ${maxWorkers || 'ESLint 默认'}`);
     console.log('');
 
     // 路径解析
@@ -115,7 +99,7 @@ async function runEslint() {
     console.log(`[Git 信息]`);
     console.log(`仓库根目录: ${gitRoot}`);
     console.log(`当前分支: ${currentBranch}`);
-    console.log(`目标分支: ${branchArg || targetBranch}`);
+    console.log(`目标分支: ${branchToUse}`);
     console.log('');
 
     if (currentBranch !== branchToUse) {
@@ -164,41 +148,25 @@ async function runEslint() {
       console.log(`🔍 检查目录: ${eslintTarget}`);
     }
 
-    const allFiles = glob.sync('**/*.{js,jsx,ts,tsx}', { cwd: eslintTarget, absolute: true });
-    if (!allFiles.length) {
+    const eslint = new ESLint({ cwd: rootDir });
+    const files = glob.sync('**/*.{js,jsx,ts,tsx}', { cwd: eslintTarget, absolute: true });
+    if (files.length === 0) {
       console.log('- 没有需要检查的文件');
       return;
     }
 
-    const cpuCount = os.cpus().length;
-    const workers = maxWorkers || cpuCount;
-    const chunkSize = Math.ceil(allFiles.length / workers);
-    const chunks = [];
-    for (let i = 0; i < allFiles.length; i += chunkSize) {
-      chunks.push(allFiles.slice(i, i + chunkSize));
-    }
-
     console.log(`[ESLint 执行]`);
     console.log(`文件总数: ${files.length}`);
     console.log('');
     console.log('🚀 开始执行 ESLint ...\n');
 
-    let finished = 0;
-    let hasError = false;
-
-    chunks.forEach((chunk) => {
-      const eslintProcess = require('child_process').spawn(
-        'npx',
-        ['eslint', ...chunk, '--ext', 'js,jsx,ts,tsx', '--report-unused-disable-directives'],
-        { cwd: rootDir, stdio: 'inherit', shell: true },
-      );
+    const results = await eslint.lintFiles(files);
+    const formatter = await eslint.loadFormatter('stylish');
+    const resultText = formatter.format(results);
+    console.log(resultText);
 
-      eslintProcess.on('close', (code) => {
-        if (code !== 0) hasError = true;
-        finished++;
-        if (finished === chunks.length) process.exit(hasError ? 1 : 0);
-      });
-    });
+    const hasError = results.some((r) => r.errorCount > 0);
+    process.exit(hasError ? 1 : 0);
   } catch (err) {
     console.error('❌ 脚本执行出错:', err);
     process.exit(1);