commit-pack 1.0.12 → 1.0.14

package/bin/index.mjs

@@ -103,15 +103,27 @@ if (dependenciesToInstall.length > 0) {
   console.log(chalk.yellow('所有开发依赖已安装，无需安装'))
 }
 
-// 初始化 Git 仓库
-console.log(chalk.green('初始化 Git 仓库'))
+let isGitRepo = false
+
 try {
-  // 检查是否已经是 Git 仓库
-  execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore', cwd: projectRoot })
+  // 获取 Git 仓库的顶级目录
+  const gitTopLevel = execSync('git rev-parse --show-toplevel', { cwd: projectRoot })
+    .toString()
+    .trim()
+  // 比较顶级目录与当前项目目录
+  if (path.resolve(gitTopLevel) === path.resolve(projectRoot)) {
+    isGitRepo = true
+  } else {
+    isGitRepo = false
+  }
+} catch {
+  isGitRepo = false
+}
+
+if (isGitRepo) {
   console.log(chalk.yellow('当前已是一个 Git 仓库'))
-} catch (error) {
-  console.error(chalk.red('未检测到 Git 仓库，正在初始化...'), error)
-  // 初始化 Git 仓库
+} else {
+  console.log(chalk.red('未检测到 Git 仓库，正在初始化...'))
   execSync('git init', { stdio: 'inherit', cwd: projectRoot })
 }
 
@@ -119,16 +131,16 @@ try {
 let huskyInitCommand = ''
 switch (packageManager) {
   case 'pnpm':
-    huskyInitCommand = 'pnpm husky install'
+    huskyInitCommand = 'pnpm exec husky init'
     break
   case 'yarn':
-    huskyInitCommand = 'yarn husky install'
+    huskyInitCommand = 'yarn dlx husky init'
     break
   case 'bun':
-    huskyInitCommand = 'bunx husky install'
+    huskyInitCommand = 'bunx husky init'
     break
   default:
-    huskyInitCommand = 'npx husky install'
+    huskyInitCommand = 'npx husky init'
     break
 }
 
@@ -144,6 +156,7 @@ try {
     'eslint.sh',
     'czrc.sh',
     'husky.sh',
+    'cz-config.sh',
     'commitlintrc.sh'
   ]
 

package/lib/index.mjs

@@ -84,19 +84,25 @@ if (dependenciesToInstall.length > 0) {
 } else {
   console.log(_chalk.default.yellow('所有开发依赖已安装，无需安装'));
 }
-
-// 初始化 Git 仓库
-console.log(_chalk.default.green('初始化 Git 仓库'));
+let isGitRepo = false;
 try {
-  // 检查是否已经是 Git 仓库
-  (0, _child_process.execSync)('git rev-parse --is-inside-work-tree', {
-    stdio: 'ignore',
+  // 获取 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 {
+    isGitRepo = false;
+  }
+} catch {
+  isGitRepo = false;
+}
+if (isGitRepo) {
   console.log(_chalk.default.yellow('当前已是一个 Git 仓库'));
-} catch (error) {
-  console.error(_chalk.default.red('未检测到 Git 仓库，正在初始化...'), error);
-  // 初始化 Git 仓库
+} else {
+  console.log(_chalk.default.red('未检测到 Git 仓库，正在初始化...'));
   (0, _child_process.execSync)('git init', {
     stdio: 'inherit',
     cwd: projectRoot
@@ -107,16 +113,16 @@ try {
 let huskyInitCommand = '';
 switch (packageManager) {
   case 'pnpm':
-    huskyInitCommand = 'pnpm husky install';
+    huskyInitCommand = 'pnpm exec husky init';
     break;
   case 'yarn':
-    huskyInitCommand = 'yarn husky install';
+    huskyInitCommand = 'yarn dlx husky init';
     break;
   case 'bun':
-    huskyInitCommand = 'bunx husky install';
+    huskyInitCommand = 'bunx husky init';
     break;
   default:
-    huskyInitCommand = 'npx husky install';
+    huskyInitCommand = 'npx husky init';
     break;
 }
 console.log(_chalk.default.green(`执行 Husky 初始化命令：${huskyInitCommand}`));
@@ -128,7 +134,7 @@ console.log(_chalk.default.green(`执行 Husky 初始化命令：${huskyInitComm
 // 执行 setup-script 中的所有文件
 console.log(_chalk.default.green('执行 setup-script 中的所有文件'));
 try {
-  const setupScripts = ['prettier.sh', 'lintstagedrc.sh', 'eslint.sh', 'czrc.sh', 'husky.sh', 'commitlintrc.sh'];
+  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);
     console.log(_chalk.default.green(`执行脚本：${scriptPath}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commit-pack",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "A setup package to automatly check project's style and commit configuration",
   "main": "lib/index.js",
   "bin": {

package/setup-script/commitlintrc.sh

@@ -1,4 +1,4 @@
-echo '
+cat > .commitlintrc.json << 'EOF'
 {
   "extends": ["@commitlint/config-conventional"],
   "parserPreset": {
@@ -29,5 +29,4 @@ echo '
     ]
   }
 }
-
-' > .commitlintrc.json
+EOF

package/setup-script/cz-config.sh

@@ -0,0 +1,42 @@
+cat > .cz-config.js << 'EOF'
+module.exports = {
+  types: [
+    { value: '✨ feat',     name: '  ✨  feat: 新功能' },
+    { value: '🐛 fix',      name: '  🐛  fix: 修复bug' },
+    { value: '🎉 init',     name: '  🎉  init: 初始化' },
+    { value: '✏️ docs',     name: '  ✏️  docs: 文档变更' },
+    { value: '💄 style',    name: '  💄  style: 更改样式' },
+    { value: '♻️ refactor', name: '  ♻️  refactor: 重构' },
+    { value: '⚡️ perf',     name: '  ⚡️  perf: 性能优化' },
+    { value: '✅ test',     name: '  ✅  test: 测试' },
+    { value: '⏪️ revert',   name: '  ⏪️  revert: 回退' },
+    { value: '📦 build',    name: '  📦  build: 打包' },
+    { value: '🚀 chore',    name: '  🚀  chore: 构建/工程依赖/工具' },
+    { value: '👷 ci',       name: '  👷  ci: CI相关修改' }
+  ],
+
+  scopes: [
+    { name: 'components' },
+    { name: 'page' },
+    { name: 'css' },
+    { name: 'api' },
+    { name: 'README.md' },
+    { name: 'custom' }
+  ],
+
+  messages: {
+    type: '请选择提交类型(必填)',
+    scope: '请选择文件修改范围(必填):',
+    customScope: '请输入自定义文件修改范围(必填)',
+    subject: '请简要描述提交(必填)',
+    body: '请输入详细描述(可选)',
+    breaking: '列出任何破坏性更改(可选)',
+    footer: '请输入要关闭的issue(可选)',
+    confirmCommit: '确定提交吗？'
+  },
+
+  allowCustomScopes: true,
+  allowBreakingChanges: ['✨ feat', '🐛 fix'],
+  subjectLimit: 49
+}
+EOF

package/setup-script/czrc.sh

@@ -2,49 +2,4 @@ echo '
 {
     "path": "cz-customizable"
 }
-' > .czrc
-
-echo '
-module.exports = {
-    types: [
-      { value: '✨ feat',     name: '  ✨  feat: 新功能' },
-      { value: '🐛 fix',      name: '  🐛  fix: 修复bug' },
-      { value: '🎉 init',     name: '  🎉  init: 初始化' },
-      { value: '✏️ docs',     name: '  ✏️  docs: 文档变更' },
-      { value: '💄 style',    name: '  💄  style: 更改样式' },
-      { value: '♻️ refactor', name: '  ♻️  refactor: 重构' },
-      { value: '⚡️ perf',      name: '  ⚡️  perf: 性能优化' },
-      { value: '✅ test',     name: '  ✅  test: 测试' },
-      { value: '⏪️ revert',   name: '  ⏪️  revert: 回退' },
-      { value: '📦 build',    name: '  📦  build: 打包' },
-      { value: '🚀 chore',    name: '  🚀  chore: 构建/工程依赖/工具' },
-      { value: '👷 ci',       name: '  👷  ci: CI related changes' }
-    ],
-
-    scopes: [
-      { name: 'components' },
-      { name: 'page' },
-      { name: 'css' },
-      { name: 'api' },
-      { name: 'README.md' },
-      { name: 'custom' }
-    ],
-
-    messages: {
-      type: '请选择提交类型(必填)',
-      scope: '请选择文件修改范围(必填):',
-      customScope: '请输自定义文件修改范围(必填)',
-      subject: '请简要描述提交(必填)',
-      body: '请输入详细描述(可选)',
-      breaking: '列出任何breaking changes(可选)',
-      footer: '请输入要关闭的issue(可选)',
-      confirmCommit: '确定提交吗'
-    },
-
-    allowCustomScopes: true,
-    allowBreakingChanges: ['✨ feat', '🐛 fix'],
-    subjectLimit: 49
-
-  }
-
-' > .cz-config.js
+' > .czrc