commit-pack 1.1.4 → 1.1.7

package/lib/index.mjs

@@ -11,10 +11,37 @@ var _url = require("url");
 var _chalkColor = require("./chalkColor.js");
 var _installWithProgress = require("./installWithProgress.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const printBanner = () => {
+  const top = '╭' + '─'.repeat(40) + '╮';
+  const bottom = '╰' + '─'.repeat(40) + '╯';
+  const middle = `│  ${_chalk.default.bold.cyan('🚀 Commit Pack 初始化中...')}  │`;
+  console.log('\n' + top);
+  console.log(middle);
+  console.log(bottom + '\n');
+};
+
 // 模拟 CommonJS 的 __dirname
 const _filename = (0, _url.fileURLToPath)(import.meta.url);
 const _dirname = _path.default.dirname(_filename);
 
+// 解析命令行参数
+const args = process.argv.slice(2);
+const workspaceArgIndex = args.findIndex(arg => arg.startsWith('--workspace=') || arg.startsWith('-w='));
+let workspaceName = '';
+if (workspaceArgIndex !== -1) {
+  const arg = args[workspaceArgIndex];
+  workspaceName = arg.split('=')[1];
+} else {
+  // 查找是否有单独的 -w 或 --workspace 参数
+  const wIndex = args.findIndex(arg => arg === '-w');
+  const workspaceIndex = args.findIndex(arg => arg === '--workspace');
+  if (wIndex !== -1 && wIndex + 1 < args.length) {
+    workspaceName = args[wIndex + 1];
+  } else if (workspaceIndex !== -1 && workspaceIndex + 1 < args.length) {
+    workspaceName = args[workspaceIndex + 1];
+  }
+}
+
 // 向上查找带锁文件的根目录
 function findProjectRootWithLockFile() {
   let dir = _dirname;
@@ -42,18 +69,92 @@ function detectPackageManager() {
   }
 }
 const packageManager = detectPackageManager();
+
+// 计算实际的工作目录
+let actualProjectRoot = projectRoot;
+if (workspaceName) {
+  const packageJsonContent = JSON.parse(_fs.default.readFileSync(_path.default.join(projectRoot, 'package.json'), 'utf8'));
+
+  // 根据包管理器确定工作spaces路径
+  let workspaces = [];
+  if (packageJsonContent.workspaces) {
+    if (Array.isArray(packageJsonContent.workspaces)) {
+      workspaces = packageJsonContent.workspaces;
+    } else if (packageJsonContent.workspaces.packages) {
+      workspaces = packageJsonContent.workspaces.packages;
+    }
+  }
+
+  // 查找workspace包的路径
+  if (workspaces.length > 0) {
+    for (const workspacePattern of workspaces) {
+      // 处理通配符模式，例如 'packages/*'
+      if (workspacePattern.includes('*')) {
+        const basePath = workspacePattern.replace('/*', '');
+        const packagesDir = _path.default.join(projectRoot, basePath);
+        if (_fs.default.existsSync(packagesDir)) {
+          const packageDirs = _fs.default.readdirSync(packagesDir);
+          for (const dir of packageDirs) {
+            const dirPath = _path.default.join(packagesDir, dir);
+            if (_fs.default.statSync(dirPath).isDirectory()) {
+              try {
+                const pkgPath = _path.default.join(dirPath, 'package.json');
+                if (_fs.default.existsSync(pkgPath)) {
+                  const pkg = JSON.parse(_fs.default.readFileSync(pkgPath, 'utf8'));
+                  if (pkg.name === workspaceName || dir === workspaceName) {
+                    actualProjectRoot = dirPath;
+                    break;
+                  }
+                }
+              } catch (e) {
+                console.log(e);
+              }
+            }
+          }
+        }
+      } else {
+        // 直接路径匹配
+        const dirPath = _path.default.join(projectRoot, workspacePattern);
+        if (_fs.default.existsSync(dirPath) && _fs.default.statSync(dirPath).isDirectory()) {
+          try {
+            const pkgPath = _path.default.join(dirPath, 'package.json');
+            if (_fs.default.existsSync(pkgPath)) {
+              const pkg = JSON.parse(_fs.default.readFileSync(pkgPath, 'utf8'));
+              if (pkg.name === workspaceName || _path.default.basename(dirPath) === workspaceName) {
+                actualProjectRoot = dirPath;
+                break;
+              }
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        }
+      }
+    }
+  }
+}
+console.log('');
+printBanner();
+console.log('');
 console.log('');
 console.log(`🍀 包管理器:${packageManager}`);
-console.log(`📁 根目录:${projectRoot}`);
-const packageJsonPath = _path.default.join(projectRoot, 'package.json');
+console.log(`📁 根目录:${actualProjectRoot}`);
+if (workspaceName) {
+  console.log(`📦 工作空间: ${workspaceName}`);
+}
+const packageJsonPath = _path.default.join(actualProjectRoot, 'package.json');
 const packageJson = JSON.parse(_fs.default.readFileSync(packageJsonPath, 'utf8'));
 
 // 检查是否已经初始化过
-const initFlagPath = _path.default.join(projectRoot, '.commit-pack-init');
+const initFlagPath = _path.default.join(actualProjectRoot, '.commit-pack-init');
 if (_fs.default.existsSync(initFlagPath)) {
+  console.log(_chalkColor.log.warn('⚠️ 该工作空间/项目已被初始化，跳过初始化'));
   process.exit(0);
 }
 
+// 回滚机制：记录初始状态
+const initialPackageJson = JSON.stringify(packageJson, null, 2);
+
 // 确保 devDependencies 存在
 if (!packageJson.devDependencies) {
   packageJson.devDependencies = {};
@@ -76,114 +177,193 @@ for (const [dep, version] of Object.entries(devDependenciesWithVersion)) {
     dependenciesToInstall.push(`${dep}@${version}`);
   }
 }
-(0, _installWithProgress.installWithProgress)(dependenciesToInstall, packageManager, projectRoot);
-let isGitRepo = false;
 try {
-  // 获取 Git 仓库的顶级目录
-  const gitTopLevel = (0, _child_process.execSync)('git rev-parse --show-toplevel', {
-    cwd: projectRoot
-  }).toString().trim();
-  // 比较顶级目录与当前项目目录
-  if (_path.default.resolve(gitTopLevel) === _path.default.resolve(projectRoot)) {
-    isGitRepo = true;
-  } else {
+  (0, _installWithProgress.installWithProgress)(dependenciesToInstall, packageManager, actualProjectRoot);
+  let isGitRepo = false;
+  try {
+    // 获取 Git 仓库的顶级目录
+    const gitTopLevel = (0, _child_process.execSync)('git rev-parse --show-toplevel', {
+      cwd: actualProjectRoot
+    }).toString().trim();
+    // 比较顶级目录与当前项目目录
+    if (_path.default.resolve(gitTopLevel) === _path.default.resolve(actualProjectRoot)) {
+      isGitRepo = true;
+    } else {
+      isGitRepo = false;
+    }
+  } catch {
     isGitRepo = false;
   }
-} catch {
-  isGitRepo = false;
-}
-if (isGitRepo) {
-  console.log(_chalkColor.log.success('👍 Git仓库已存在'));
-} else {
-  console.log(_chalkColor.log.warn('👌 Git仓库初始化...'));
-  (0, _child_process.execSync)('git init', {
+  if (isGitRepo) {
+    console.log(_chalkColor.log.success('👍 Git仓库已存在'));
+  } else {
+    console.log(_chalkColor.log.warn('👌 Git仓库初始化...'));
+    (0, _child_process.execSync)('git init', {
+      stdio: 'inherit',
+      cwd: actualProjectRoot
+    });
+  }
+
+  // 根据包管理器，执行对应的 Husky 初始化命令
+  let huskyInitCommand = '';
+  switch (packageManager) {
+    case 'pnpm':
+      huskyInitCommand = 'pnpm exec husky init';
+      break;
+    case 'yarn':
+      huskyInitCommand = 'yarn dlx husky init';
+      break;
+    case 'bun':
+      huskyInitCommand = 'bunx husky init';
+      break;
+    default:
+      huskyInitCommand = 'npx husky init';
+      break;
+  }
+  console.log(_chalk.default.green(`🐶 Husky初始化...`));
+  (0, _child_process.execSync)(huskyInitCommand, {
     stdio: 'inherit',
-    cwd: projectRoot
+    cwd: actualProjectRoot
   });
-}
 
-// 根据包管理器，执行对应的 Husky 初始化命令
-let huskyInitCommand = '';
-switch (packageManager) {
-  case 'pnpm':
-    huskyInitCommand = 'pnpm exec husky init';
-    break;
-  case 'yarn':
-    huskyInitCommand = 'yarn dlx husky init';
-    break;
-  case 'bun':
-    huskyInitCommand = 'bunx husky init';
-    break;
-  default:
-    huskyInitCommand = 'npx husky init';
-    break;
-}
-console.log(_chalk.default.green(`🐶 Husky初始化...`));
-(0, _child_process.execSync)(huskyInitCommand, {
-  stdio: 'inherit',
-  cwd: projectRoot
-});
-
-// 执行 setup-script 中的所有文件
-console.log('🚀 创建配置文件...');
-try {
+  // 执行 setup-script 中的所有文件
+  console.log('🚀 创建配置文件...');
   const setupScripts = ['prettier.sh', 'lintstagedrc.sh', 'eslint.sh', 'czrc.sh', 'husky.sh', 'cz-config.sh', 'commitlintrc.sh'];
   for (const script of setupScripts) {
     const scriptPath = _path.default.join(_dirname, '..', 'setup-script', script);
     (0, _child_process.execSync)(`sh ${scriptPath}`, {
       stdio: 'inherit',
-      cwd: projectRoot
+      cwd: actualProjectRoot
     });
   }
-} catch (error) {
-  console.error(_chalkColor.log.warn('❌ 文件创建出错'), error);
-}
 
-// 创建或更新脚本
-if (!packageJson.scripts) {
-  packageJson.scripts = {};
-  console.log('🔥 创建或更新脚本...');
-}
-let modified = false;
-if (!packageJson.scripts.lint) {
-  packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0';
-  console.log(_chalkColor.log.success('已添加 "lint" 至 package.json'));
-  modified = true;
-} else {
-  console.log(_chalkColor.log.warn('package.json 中已存在 "lint" 未作修改'));
-}
-if (!packageJson.scripts.format) {
-  packageJson.scripts.format = "prettier --config .prettierrc '.' --write";
-  console.log(_chalkColor.log.success('已添加 "format" 至 package.json'));
+  // 创建或更新脚本
+  if (!packageJson.scripts) {
+    packageJson.scripts = {};
+    console.log('🔥 创建或更新脚本...');
+  }
+  let modified = false;
+  if (!packageJson.scripts.lint) {
+    if (workspaceName) {
+      // 为workspace项目使用工作空间命令
+      if (packageManager === 'pnpm') {
+        packageJson.scripts.lint = `pnpm -F ${workspaceName} exec eslint ./ --ext .ts,.tsx,.json --max-warnings=0`;
+      } else if (packageManager === 'yarn') {
+        packageJson.scripts.lint = `yarn workspace ${workspaceName} exec eslint ./ --ext .ts,.tsx,.json --max-warnings=0`;
+      } else {
+        packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0';
+      }
+    } else {
+      packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0';
+    }
+    console.log(_chalkColor.log.success('✅ 已添加 "lint" 至 package.json'));
+    modified = true;
+  } else {
+    console.log(_chalkColor.log.warn('⚠️ package.json 中已存在 "lint" 未作修改'));
+  }
+  if (!packageJson.scripts.format) {
+    if (workspaceName) {
+      // 为workspace项目使用工作空间命令
+      if (packageManager === 'pnpm') {
+        packageJson.scripts.format = `pnpm -F ${workspaceName} exec prettier --config .prettierrc '.' --write`;
+      } else if (packageManager === 'yarn') {
+        packageJson.scripts.format = `yarn workspace ${workspaceName} exec prettier --config .prettierrc '.' --write`;
+      } else {
+        packageJson.scripts.format = "prettier --config .prettierrc '.' --write";
+      }
+    } else {
+      packageJson.scripts.format = "prettier --config .prettierrc '.' --write";
+    }
+    console.log(_chalkColor.log.success('✅ 已添加 "format" 至 package.json'));
+    modified = true;
+  } else {
+    console.log(_chalkColor.log.warn('⚠️ package.json 中已存在 "format" 未作修改'));
+  }
+
+  // 添加或更新 "commit" 脚本
+  if (workspaceName) {
+    // 为workspace项目使用工作空间命令
+    if (packageManager === 'pnpm') {
+      packageJson.scripts.commit = `pnpm -F ${workspaceName} exec cz`;
+    } else if (packageManager === 'yarn') {
+      packageJson.scripts.commit = `yarn workspace ${workspaceName} exec cz`;
+    } else {
+      packageJson.scripts.commit = 'cz';
+    }
+  } else {
+    packageJson.scripts.commit = 'cz';
+  }
+  console.log(_chalkColor.log.success('✅ 已添加 "commit" 至 package.json'));
   modified = true;
-} else {
-  console.log(_chalkColor.log.warn('package.json 中已存在 "format" 未作修改'));
-}
 
-// 添加或更新 "commit" 脚本
-packageJson.scripts.commit = 'cz';
-console.log(_chalkColor.log.success('已添加或更新 "commit" 脚本到 package.json'));
-modified = true;
+  // 添加或更新 "config.commitizen" 配置
+  if (!packageJson.config) {
+    packageJson.config = {};
+  }
+  packageJson.config.commitizen = {
+    path: 'node_modules/cz-customizable'
+  };
+  modified = true;
 
-// 添加或更新 "config.commitizen" 配置
-if (!packageJson.config) {
-  packageJson.config = {};
-}
-packageJson.config.commitizen = {
-  path: 'node_modules/cz-customizable'
-};
-modified = true;
+  // 写入修改后的 package.json
+  if (modified) {
+    _fs.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
+    console.log(_chalk.default.green('✅ 已更新 package.json'));
+    console.log('');
+    console.log('');
+  }
 
-// 写入修改后的 package.json
-if (modified) {
-  _fs.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
-  console.log(_chalk.default.green('已更新 package.json'));
-  console.log('');
+  // 创建初始化标志文件
+  _fs.default.writeFileSync(initFlagPath, 'initialized', 'utf8');
+  console.log(_chalkColor.log.success('   🎉🎉🎉 完成啦!'));
   console.log('');
-}
+  if (workspaceName) {
+    console.log(`   在 ${workspaceName} 工作空间中，运行: git add . && ${packageManager} run commit`);
+  } else {
+    console.log(`   运行 git add 后 | 运行 ${packageManager} run commit 即可`);
+  }
+} catch (error) {
+  console.error(_chalkColor.log.error('❌ 初始化过程中发生错误，正在执行回滚...'));
+  console.error('错误详情:', error.message);
+  console.error('错误堆栈:', error.stack);
+  if (error.stdout) console.error('标准输出:', error.stdout.toString());
+  if (error.stderr) console.error('错误输出:', error.stderr.toString());
+  try {
+    // 回滚：恢复原始的package.json
+    _fs.default.writeFileSync(packageJsonPath, initialPackageJson, 'utf8');
+    console.log(_chalkColor.log.warn('✅ 已恢复原始 package.json'));
 
-// 创建初始化标志文件
-// fs.writeFileSync(initFlagPath, 'initialized', 'utf8')
-console.log(_chalkColor.log.success('   🎉🎉🎉 完成啦!'));
-console.log('');
-console.log(`   运行 git add 后 | 运行 ${packageManager} run commit 即可`);
+    // 删除可能创建的配置文件
+    const configFiles = ['.prettierrc', '.eslintrc', '.commitlintrc.json', '.cz-config.js', '.czrc', '.lintstagedrc', '.prettierignore', '.eslintignore'];
+    for (const configFile of configFiles) {
+      const configPath = _path.default.join(actualProjectRoot, configFile);
+      if (_fs.default.existsSync(configPath)) {
+        _fs.default.unlinkSync(configPath);
+        console.log(_chalkColor.log.warn(`✅ 已删除临时配置文件: ${configFile}`));
+      }
+    }
+
+    // 删除可能创建的.husky目录
+    const huskyDir = _path.default.join(actualProjectRoot, '.husky');
+    if (_fs.default.existsSync(huskyDir)) {
+      _fs.default.rmSync(huskyDir, {
+        recursive: true,
+        force: true
+      });
+      console.log(_chalkColor.log.warn('✅ 已删除临时 .husky 目录'));
+    }
+
+    // 删除初始化标志文件
+    if (_fs.default.existsSync(initFlagPath)) {
+      _fs.default.unlinkSync(initFlagPath);
+    }
+    console.log(_chalkColor.log.success('   🔄 回滚完成'));
+  } catch (rollbackError) {
+    console.error(_chalkColor.log.error('❌ 回滚过程中也发生了错误，请手动检查项目状态'));
+    console.error('回滚错误详情:', rollbackError.message);
+    console.error('回滚错误堆栈:', rollbackError.stack);
+    if (rollbackError.stdout) console.error('回滚标准输出:', rollbackError.stdout.toString());
+    if (rollbackError.stderr) console.error('回滚错误输出:', rollbackError.stderr.toString());
+  }
+  process.exit(1); // 确保进程以错误码退出
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commit-pack",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "description": "A setup package to automatly check project's style and commit configuration",
   "main": "lib/index.js",
   "bin": {
@@ -77,6 +77,6 @@
     "format": "prettier --config .prettierrc '.' --write",
     "commit": "cz",
     "build": "babel bin/index.mjs --out-file lib/index.mjs",
-    "release": "standard-version"
+    "release": "HUSKY=0 standard-version"
   }
 }

package/setup-script/husky.sh

@@ -1,7 +1,25 @@
-echo '
-npx lint-staged
+echo '#!/usr/bin/env sh
+set -e
+if [ -n "$PNPM_PACKAGE_NAME" ]; then
+  # 在工作空间环境中运行 pnpm 命令
+  pnpm exec lint-staged
+else
+  # 在普通环境中运行
+  npx lint-staged
+fi
 ' > .husky/pre-commit
 
-echo '
-npx --no -- commitlint --edit "$1"
-' > .husky/commit-msg
+chmod +x .husky/pre-commit
+
+echo '#!/usr/bin/env sh
+set -e
+if [ -n "$PNPM_PACKAGE_NAME" ]; then
+  # 在工作空间环境中运行 pnpm 命令
+  pnpm exec -- commitlint --edit "$1"
+else
+  # 在普通环境中运行
+  npx --no -- commitlint --edit "$1"
+fi
+' > .husky/commit-msg
+
+chmod +x .husky/commit-msg

package/setup-script/lintstagedrc.sh

@@ -1,5 +1,5 @@
 echo '
 {
-  "*.{js,jsx,ts,tsx}": ["eslint --fix", "prettier --write"]
+  "*.{js,jsx,ts,tsx,json,md}": ["eslint --fix", "prettier --write"]
 }
 ' > .lintstagedrc