@apdesign/code-style-react 1.1.4 → 1.1.5

package/package.json

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

package/scripts/runEslint.js

@@ -31,6 +31,8 @@ async function runEslint() {
     // 默认并发数为 CPU 核心数，但不超过 8
     let maxWorkers = Math.min(os.cpus().length, 8);
 
+    let branchArg = null;
+
     // 找到 --max-workers 参数
     const maxWorkersArgIndex = args.indexOf('--max-workers');
     if (maxWorkersArgIndex !== -1 && args[maxWorkersArgIndex + 1]) {
@@ -44,12 +46,22 @@ async function runEslint() {
     let targetPath = process.cwd();
     for (let i = 0; i < args.length; i++) {
       if (i === maxWorkersArgIndex || i === maxWorkersArgIndex + 1) continue;
-      targetPath = args[i] || process.cwd();
-      break;
+      if (!targetPath || targetPath === process.cwd()) {
+        targetPath = args[i];
+        continue;
+      }
+    }
+
+    // 检查是否有分支参数 (--branch <branchName>)
+    const branchIndex = args.indexOf('--branch');
+    if (branchIndex !== -1 && args[branchIndex + 1]) {
+      branchArg = args[branchIndex + 1];
     }
 
-    console.log(`目标路径: ${targetPath}`);
-    console.log(`使用并发数: ${maxWorkers}`);
+    console.log(`\n[ESLint 启动配置]`);
+    console.log(`- 检查路径: ${targetPath}`);
+    console.log(`- 并发进程数: ${maxWorkers}`);
+    console.log('');
 
     // 路径解析
     let rootDir = path.resolve(targetPath);
@@ -80,14 +92,12 @@ async function runEslint() {
     }
 
     const gitRoot = gitRootResult.stdout.trim();
-    console.log('Git 根目录:', gitRoot);
 
     let targetBranch = 'master';
     if (targetPath !== process.cwd()) {
       const lastDir = path.basename(rootDir);
       targetBranch = `master-${lastDir.split('-').pop()}`;
     }
-    console.log('目标分支:', targetBranch);
 
     // 获取当前分支
     const currentBranchResult = spawnSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
@@ -102,7 +112,12 @@ async function runEslint() {
     }
 
     const currentBranch = currentBranchResult.stdout.trim();
-    console.log('当前分支:', currentBranch);
+
+    console.log(`[Git 信息]`);
+    console.log(`- 仓库根目录: ${gitRoot}`);
+    console.log(`- 当前分支: ${currentBranch}`);
+    console.log(`- 目标分支: ${branchArg || targetBranch}`);
+    console.log('');
 
     const statusResult = spawnSync('git', ['status', '--porcelain'], {
       cwd: gitRoot,
@@ -111,13 +126,13 @@ async function runEslint() {
     });
     if (statusResult.status === 0 && statusResult.stdout.trim()) {
       console.warn(
-        '当前分支有未提交的更改，切换分支可能失败或覆盖未提交内容，请确保已保存或提交更改！',
+        '⚠️ 检测到当前分支有未提交的更改，切换分支可能失败或导致代码丢失，请先提交或暂存更改！\n',
       );
     }
 
     // 切换分支并拉取最新代码
-    if (currentBranch !== targetBranch) {
-      console.log(`切换到分支 ${targetBranch} ...`);
+    if (!branchArg && currentBranch !== targetBranch) {
+      console.log(`➡️ 切换到分支 ${targetBranch} ...`);
       const checkout = spawnSync('git', ['checkout', targetBranch], {
         cwd: gitRoot,
         stdio: 'inherit',
@@ -127,9 +142,11 @@ async function runEslint() {
         console.error(`切换分支失败`);
         process.exit(1);
       }
+    } else if (branchArg) {
+      console.log(`➡️ 使用指定分支 ${branchArg} `);
     }
 
-    console.log('拉取最新代码...');
+    console.log('⬇️ 正在拉取最新代码...');
     const pull = spawnSync('git', ['pull'], {
       cwd: gitRoot,
       stdio: 'inherit',
@@ -148,8 +165,6 @@ async function runEslint() {
       console.log(`检查目录: ${eslintTarget}`);
     }
 
-    // 并行 ESLint
-    console.log('并行执行 ESLint...');
     const allFiles = glob.sync('**/*.{js,jsx,ts,tsx}', { cwd: eslintTarget, absolute: true });
     if (allFiles.length === 0) {
       console.log('没有需要检查的文件');
@@ -166,7 +181,12 @@ async function runEslint() {
     let finished = 0;
     let hasError = false;
 
-    console.log(`总文件数: ${allFiles.length}, 分成 ${chunks.length} 个 chunk 并行执行`);
+    // 并行 ESLint
+    console.log(`[ESLint 执行]`);
+    console.log(`- 共计文件: ${allFiles.length}`);
+    console.log(`- 拆分任务: ${chunks.length} 个`);
+    console.log('');
+    console.log('🚀 开始并行执行 ESLint ...\n');
 
     chunks.forEach((chunk) => {
       const eslint = spawn(