@apdesign/code-style-react 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apdesign/code-style-react",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "scripts": {},
   "bin": {
     "apdesign-code-style": "cli.js"
@@ -18,6 +18,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "@types/glob": "^8.1.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "css-color-names": "^1.0.1",
@@ -30,6 +31,7 @@
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^4.6.2",
+    "glob": "^11.0.3",
     "husky": "^9.1.7",
     "lint-staged": "^15.3.0",
     "postcss-less": "^6.0.0",

package/scripts/buildEslint.sh

@@ -5,19 +5,27 @@ echo "🔍 Starting ESLint check (Git diff files only)..."
 PROJECT_ROOT=$(git rev-parse --show-toplevel)
 cd "$PROJECT_ROOT" || exit 1
 
+# 参数：commitId（必填），路径（可选）
 TARGET_COMMIT=$1
 LATEST_COMMIT=$(git rev-parse HEAD)
 
 if [ -z "$TARGET_COMMIT" ]; then
   echo "❗ Error: Missing target commit ID."
-  echo "👉 Usage: $0 <target-commit-id>"
+  echo "👉 Usage: $0 <target-commit-id> [project-path]"
   exit 1
 fi
 
 echo "获取到上一次运行commit ID: $TARGET_COMMIT"
 echo "获取到当前最新的commit ID: $LATEST_COMMIT"
 
-DIFF_FILES=$(git diff --name-only "$TARGET_COMMIT" "$LATEST_COMMIT" -- '*.ts' '*.tsx' '*.js' '*.jsx')
+# 处理路径参数
+if [ -n "$FULL_PATH" ]; then
+  PROJECT_NAME=$(basename "$FULL_PATH")
+  echo "📂 检测子项目: $PROJECT_NAME"
+  DIFF_FILES=$(git diff --name-only "$TARGET_COMMIT" "$LATEST_COMMIT" -- "*/$PROJECT_NAME/*.{ts,tsx,js,jsx}")
+else
+  DIFF_FILES=$(git diff --name-only "$TARGET_COMMIT" "$LATEST_COMMIT" -- '*.ts' '*.tsx' '*.js' '*.jsx')
+fi
 
 if [ -z "$DIFF_FILES" ]; then
   echo "✅ No matching file changes detected, skipping ESLint check"

package/scripts/runEslint.js

@@ -4,22 +4,66 @@ let spawnSync;
 let spawn;
 let path;
 let fs;
+let os;
+let glob;
 
-async function runEslint(targetPathArg) {
+async function runEslint() {
   try {
     if (typeof require !== 'undefined') {
       // CommonJS
       ({ spawnSync, spawn } = require('child_process'));
       path = require('path');
       fs = require('fs');
+      os = require('os');
+      glob = require('glob');
     } else {
       // ESM
       ({ spawnSync, spawn } = await import('node:child_process'));
       path = await import('node:path');
       fs = await import('node:fs');
+      os = await import('node:os');
+      glob = (await import('glob')).default;
     }
 
-    const targetPath = targetPathArg || process.cwd();
+    // 参数解析
+    const args = process.argv.slice(2);
+
+    // 默认并发数为 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]) {
+      const val = parseInt(args[maxWorkersArgIndex + 1], 10);
+      if (!isNaN(val) && val > 0) {
+        maxWorkers = Math.min(val, 8); // 限制最大值为 8
+      }
+    }
+
+    // targetPath 是第一个不是 --max-workers 的参数
+    let targetPath = process.cwd();
+    for (let i = 0; i < args.length; i++) {
+      if (i === maxWorkersArgIndex || i === maxWorkersArgIndex + 1) continue;
+      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(`\n[ESLint 启动配置]`);
+    console.log(`- 检查路径: ${targetPath}`);
+    console.log(`- 并发进程数: ${maxWorkers}`);
+    console.log('');
+
+    // 路径解析
     let rootDir = path.resolve(targetPath);
 
     // 如果传的是单个目录名且路径不存在，则在 packages/ 下查找
@@ -34,7 +78,7 @@ async function runEslint(targetPathArg) {
       }
     }
 
-    console.log('目标路径:', rootDir);
+    console.log('目标路径解析为:', rootDir);
 
     const gitRootResult = spawnSync('git', ['rev-parse', '--show-toplevel'], {
       cwd: rootDir,
@@ -48,14 +92,12 @@ async function runEslint(targetPathArg) {
     }
 
     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'], {
@@ -70,11 +112,27 @@ async function runEslint(targetPathArg) {
     }
 
     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,
+      encoding: 'utf-8',
+      shell: true,
+    });
+    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',
@@ -84,9 +142,11 @@ async function runEslint(targetPathArg) {
         console.error(`切换分支失败`);
         process.exit(1);
       }
+    } else if (branchArg) {
+      console.log(`➡️ 使用指定分支 ${branchArg} `);
     }
 
-    console.log('拉取最新代码...');
+    console.log('⬇️ 正在拉取最新代码...');
     const pull = spawnSync('git', ['pull'], {
       cwd: gitRoot,
       stdio: 'inherit',
@@ -105,19 +165,49 @@ async function runEslint(targetPathArg) {
       console.log(`检查目录: ${eslintTarget}`);
     }
 
-    console.log('执行 ESLint...');
-    const eslint = spawn(
-      'npx',
-      ['eslint', eslintTarget, '--ext', 'ts,tsx,js,jsx', '--report-unused-disable-directives'],
-      {
-        cwd: rootDir,
-        stdio: 'inherit',
-        shell: true,
-      },
-    );
+    const allFiles = glob.sync('**/*.{js,jsx,ts,tsx}', { cwd: eslintTarget, absolute: true });
+    if (allFiles.length === 0) {
+      console.log('没有需要检查的文件');
+      return;
+    }
 
-    eslint.on('close', (code) => {
-      process.exit(code);
+    // 多进程拆分
+    const chunkSize = Math.max(1, Math.ceil(allFiles.length / maxWorkers)); // 最少一个文件
+    const chunks = [];
+    for (let i = 0; i < allFiles.length; i += chunkSize) {
+      chunks.push(allFiles.slice(i, i + chunkSize));
+    }
+
+    let finished = 0;
+    let hasError = false;
+
+    // 并行 ESLint
+    console.log(`[ESLint 执行]`);
+    console.log(`- 共计文件: ${allFiles.length}`);
+    console.log(`- 拆分任务: ${chunks.length} 个`);
+    console.log('');
+    console.log('🚀 开始并行执行 ESLint ...\n');
+
+    chunks.forEach((chunk) => {
+      const eslint = spawn(
+        'npx',
+        ['eslint', ...chunk, '--ext', 'ts,tsx,js,jsx', '--report-unused-disable-directives'],
+        {
+          cwd: rootDir,
+          stdio: 'inherit',
+          shell: true,
+        },
+      );
+
+      eslint.on('close', (code) => {
+        if (code !== 0 && code !== null) {
+          hasError = true;
+        }
+        finished++;
+        if (finished === chunks.length) {
+          process.exit(hasError ? 1 : 0);
+        }
+      });
     });
   } catch (err) {
     console.error('脚本执行出错:', err);

package/scripts/runStylelint.js

@@ -0,0 +1,137 @@
+#!/usr/bin/env node
+
+let spawnSync;
+let spawn;
+let path;
+let fs;
+
+async function runStylelint(targetPathArg) {
+  try {
+    if (typeof require !== 'undefined') {
+      // CommonJS
+      ({ spawnSync, spawn } = require('child_process'));
+      path = require('path');
+      fs = require('fs');
+    } else {
+      // ESM
+      ({ spawnSync, spawn } = await import('node:child_process'));
+      path = await import('node:path');
+      fs = await import('node:fs');
+    }
+
+    const targetPath = targetPathArg || process.cwd();
+    let rootDir = path.resolve(targetPath);
+
+    // 如果传的是单个目录名且路径不存在，则在 packages/ 下查找
+    if (!fs.existsSync(rootDir) && targetPath !== process.cwd()) {
+      const baseDir = process.cwd(); // 当前项目根目录
+      const fullPath = path.join(baseDir, 'packages', targetPath);
+      if (fs.existsSync(fullPath)) {
+        rootDir = fullPath;
+      } else {
+        console.error(`找不到目录: packages/${targetPath}`);
+        process.exit(1);
+      }
+    }
+
+    console.log('目标路径:', rootDir);
+
+    const gitRootResult = spawnSync('git', ['rev-parse', '--show-toplevel'], {
+      cwd: rootDir,
+      encoding: 'utf-8',
+      shell: true,
+    });
+
+    if (gitRootResult.status !== 0 || !gitRootResult.stdout) {
+      console.error('无法获取 Git 根目录，请确保路径在 Git 仓库内');
+      process.exit(1);
+    }
+
+    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'], {
+      cwd: gitRoot,
+      encoding: 'utf-8',
+      shell: true,
+    });
+
+    if (currentBranchResult.status !== 0 || !currentBranchResult.stdout) {
+      console.error('无法获取当前 Git 分支');
+      process.exit(1);
+    }
+
+    const currentBranch = currentBranchResult.stdout.trim();
+    console.log('当前分支:', currentBranch);
+
+    // 切换分支并拉取最新代码
+    if (currentBranch !== targetBranch) {
+      console.log(`切换到分支 ${targetBranch} ...`);
+      const checkout = spawnSync('git', ['checkout', targetBranch], {
+        cwd: gitRoot,
+        stdio: 'inherit',
+        shell: true,
+      });
+      if (checkout.status !== 0) {
+        console.error(`切换分支失败`);
+        process.exit(1);
+      }
+    }
+
+    console.log('拉取最新代码...');
+    const pull = spawnSync('git', ['pull'], {
+      cwd: gitRoot,
+      stdio: 'inherit',
+      shell: true,
+    });
+    if (pull.status !== 0) {
+      console.error('git pull 失败');
+      process.exit(1);
+    }
+
+    const srcPath = path.join(rootDir, 'src');
+    const stylelintTarget = fs.existsSync(srcPath)
+      ? `${srcPath}/**/*.{css,scss,less}`
+      : './**/*.{css,scss,less}';
+
+    if (!fs.existsSync(srcPath)) {
+      console.warn(`src 文件夹不存在，改为检查当前目录下样式文件: ${stylelintTarget}`);
+    } else {
+      console.log(`检查目录样式文件: ${stylelintTarget}`);
+    }
+
+    console.log('执行 Stylelint...');
+    const stylelint = spawn(
+      'npx',
+      [
+        'stylelint',
+        stylelintTarget,
+        '--allow-empty-input',
+        '--report-needless-disables',
+        '--report-invalid-scope-disables',
+      ],
+      {
+        cwd: rootDir,
+        stdio: 'inherit',
+        shell: true,
+      },
+    );
+
+    stylelint.on('close', (code) => {
+      process.exit(code);
+    });
+  } catch (err) {
+    console.error('脚本执行出错:', err);
+    process.exit(1);
+  }
+}
+
+module.exports = runStylelint;