@apdesign/code-style-react 1.2.0 → 1.2.2

package/package.json

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

package/scripts/runEslint.js

@@ -37,7 +37,8 @@ async function runEslint(targetPathArg) {
     // targetPath 是第一个不是 --branch 的参数
     let targetPath = process.cwd();
     for (let i = 0; i < args.length; i++) {
-      if (i === branchIndex || i === branchIndex + 1) continue;
+      // 仅当确实存在 --branch 参数时才跳过它和它的值
+      if (branchIndex !== -1 && (i === branchIndex || i === branchIndex + 1)) continue;
       targetPath = args[i] || targetPath;
       break;
     }
@@ -76,8 +77,11 @@ async function runEslint(targetPathArg) {
 
     let targetBranch = 'master';
     if (targetPath !== process.cwd()) {
-      const lastDir = path.basename(rootDir);
-      targetBranch = `master-${lastDir.split('-').pop()}`;
+      const pkgName = path.basename(targetPath); // 直接取传入的目录名
+      if (pkgName && pkgName.includes('-')) {
+        const suffix = pkgName.split('-').pop();
+        targetBranch = `master-${suffix}`;
+      }
     }
 
     // 获取当前分支
@@ -143,7 +147,8 @@ async function runEslint(targetPathArg) {
     const srcPath = path.join(rootDir, 'src');
     const eslintTarget = fs.existsSync(srcPath) ? srcPath : '.';
     if (!fs.existsSync(srcPath)) {
-      console.warn(`🔍 src 文件夹不存在，改为检查当前目录: ${eslintTarget}`);
+      console.error(`❌ 当前目录下不存在 src 文件夹`);
+      process.exit(1);
     } else {
       console.log(`🔍 检查目录: ${eslintTarget}`);
     }