@apdesign/code-style-react 1.2.3 → 1.2.5

package/package.json

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

package/scripts/runEslint.js

@@ -75,16 +75,6 @@ async function runEslint(targetPathArg) {
 
     const gitRoot = gitRootResult.stdout.trim();
 
-    let targetBranch = 'master';
-    if (targetPath !== process.cwd()) {
-      const pkgName = path.basename(targetPath); // 直接取传入的目录名
-      if (pkgName && pkgName.includes('-')) {
-        const suffix = pkgName.split('-').pop();
-        targetBranch = `master-${suffix}`;
-      }
-    }
-
-    // 获取当前分支
     const currentBranchResult = spawnSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
       cwd: gitRoot,
       encoding: 'utf-8',
@@ -98,12 +88,14 @@ async function runEslint(targetPathArg) {
 
     const currentBranch = currentBranchResult.stdout.trim();
 
-    const branchToUse = branchArg || targetBranch;
+    const branchToUse = branchArg || currentBranch;
 
     console.log(`[Git 信息]`);
     console.log(`仓库根目录: ${gitRoot}`);
     console.log(`当前分支: ${currentBranch}`);
-    console.log(`目标分支: ${branchToUse}`);
+    if (branchArg) {
+      console.log(`目标分支: ${branchToUse}`);
+    }
     console.log('');
 
     if (currentBranch !== branchToUse) {
@@ -161,7 +153,7 @@ async function runEslint(targetPathArg) {
     const files = glob.sync('**/*.{js,jsx,ts,tsx}', { cwd: eslintTarget, absolute: true });
     if (files.length === 0) {
       console.log('- 没有需要检查的文件');
-      return;
+      return [];
     }
 
     console.log(`[ESLint 执行]`);
@@ -170,16 +162,11 @@ async function runEslint(targetPathArg) {
     console.log('🚀 开始执行 ESLint ...\n');
 
     const results = await eslint.lintFiles(files);
-    const errorsOnly = results.map((result) => {
-      result.messages = result.messages.filter((message) => message.severity === 2); // 只保留错误
-      return result;
-    });
+
     const formatter = await eslint.loadFormatter('stylish');
-    const resultText = formatter.format(errorsOnly);
+    const resultText = formatter.format(results);
     console.log(resultText);
-
-    const hasError = results.some((r) => r.errorCount > 0);
-    process.exit(hasError ? 1 : 0);
+    return results;
   } catch (err) {
     console.error('❌ 脚本执行出错:', err);
     process.exit(1);