commit-pack 1.0.5 → 1.0.9

package/bin/{index.js → index.mjs}

@@ -1,16 +1,28 @@
+#!/usr/bin/env node
+
 /* eslint-env node */
 
 import fs from 'fs'
 import chalk from 'chalk'
 import { execSync } from 'child_process'
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+// 获取当前文件的目录名
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+// 获取用户项目的根目录
+const projectRoot = process.cwd()
+console.log(chalk.green(`当前工作目录：${projectRoot}`))
 
 // 检测包管理器
 function detectPackageManager() {
-  if (fs.existsSync('pnpm-lock.yaml')) {
+  if (fs.existsSync(path.join(projectRoot, 'pnpm-lock.yaml'))) {
     return 'pnpm'
-  } else if (fs.existsSync('yarn.lock')) {
+  } else if (fs.existsSync(path.join(projectRoot, 'yarn.lock'))) {
     return 'yarn'
-  } else if (fs.existsSync('bun.lockb')) {
+  } else if (fs.existsSync(path.join(projectRoot, 'bun.lockb'))) {
     return 'bun'
   } else {
     return 'npm'
@@ -20,7 +32,7 @@ function detectPackageManager() {
 const packageManager = detectPackageManager()
 console.log(chalk.green(`检测到使用的包管理器：${packageManager}`))
 
-const packageJsonPath = './package.json'
+const packageJsonPath = path.join(projectRoot, 'package.json')
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
 
 // 确保 devDependencies 存在
@@ -84,7 +96,7 @@ if (dependenciesToInstall.length > 0) {
 
   console.log(chalk.green(`正在安装开发依赖：${dependenciesToInstall.join(', ')}`))
   console.log(chalk.green(`执行命令：${installCommand}`))
-  execSync(installCommand, { stdio: 'inherit' })
+  execSync(installCommand, { stdio: 'inherit', cwd: projectRoot })
 } else {
   console.log(chalk.yellow('所有开发依赖已安装，无需安装'))
 }
@@ -93,43 +105,51 @@ if (dependenciesToInstall.length > 0) {
 console.log(chalk.green('初始化 Git 仓库'))
 try {
   // 检查是否已经是 Git 仓库
-  execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore' })
+  execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore', cwd: projectRoot })
   console.log(chalk.yellow('当前已是一个 Git 仓库'))
 } catch (error) {
   console.error(chalk.red('未检测到 Git 仓库，正在初始化...'), error)
   // 初始化 Git 仓库
-  execSync('git init', { stdio: 'inherit' })
+  execSync('git init', { stdio: 'inherit', cwd: projectRoot })
 }
 
 // 根据包管理器，执行对应的 Husky 初始化命令
 let huskyInitCommand = ''
 switch (packageManager) {
   case 'pnpm':
-    huskyInitCommand = 'pnpm exec husky init'
+    huskyInitCommand = 'pnpm husky install'
     break
   case 'yarn':
-    huskyInitCommand = 'yarn dlx husky-init'
+    huskyInitCommand = 'yarn husky install'
     break
   case 'bun':
-    huskyInitCommand = 'bunx husky init'
+    huskyInitCommand = 'bunx husky install'
     break
   default:
-    huskyInitCommand = 'npx husky init'
+    huskyInitCommand = 'npx husky install'
     break
 }
 
 console.log(chalk.green(`执行 Husky 初始化命令：${huskyInitCommand}`))
-execSync(huskyInitCommand, { stdio: 'inherit' })
+execSync(huskyInitCommand, { stdio: 'inherit', cwd: projectRoot })
 
 // 执行 setup-script 中的所有文件
 console.log(chalk.green('执行 setup-script 中的所有文件'))
 try {
-  execSync('sh ./prettier.sh', { stdio: 'inherit' })
-  execSync('sh ./lintstagedrc.sh', { stdio: 'inherit' })
-  execSync('sh ./eslint.sh', { stdio: 'inherit' })
-  execSync('sh ./czrc.sh', { stdio: 'inherit' })
-  execSync('sh ./husky.sh', { stdio: 'inherit' })
-  execSync('sh ./commitlintrc.sh', { stdio: 'inherit' })
+  const setupScripts = [
+    'prettier.sh',
+    'lintstagedrc.sh',
+    'eslint.sh',
+    'czrc.sh',
+    'husky.sh',
+    'commitlintrc.sh'
+  ]
+
+  for (const script of setupScripts) {
+    const scriptPath = path.join(__dirname, '..', 'setup-script', script)
+    console.log(chalk.green(`执行脚本：${scriptPath}`))
+    execSync(`sh ${scriptPath}`, { stdio: 'inherit', cwd: projectRoot })
+  }
   console.log(chalk.green('所有 setup-script 已执行完毕'))
 } catch (error) {
   console.error(chalk.red('执行 setup-script 时出错'), error)

package/lib/index.mjs

@@ -0,0 +1,183 @@
+#!/usr/bin/env node
+
+/* eslint-env node */
+"use strict";
+
+var _fs = _interopRequireDefault(require("fs"));
+var _chalk = _interopRequireDefault(require("chalk"));
+var _child_process = require("child_process");
+var _path = _interopRequireDefault(require("path"));
+var _url = require("url");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// 获取当前文件的目录名
+const _filename = (0, _url.fileURLToPath)(import.meta.url);
+const _dirname = _path.default.dirname(_filename);
+
+// 获取用户项目的根目录
+const projectRoot = process.cwd();
+console.log(_chalk.default.green(`当前工作目录：${projectRoot}`));
+
+// 检测包管理器
+function detectPackageManager() {
+  if (_fs.default.existsSync(_path.default.join(projectRoot, 'pnpm-lock.yaml'))) {
+    return 'pnpm';
+  } else if (_fs.default.existsSync(_path.default.join(projectRoot, 'yarn.lock'))) {
+    return 'yarn';
+  } else if (_fs.default.existsSync(_path.default.join(projectRoot, 'bun.lockb'))) {
+    return 'bun';
+  } else {
+    return 'npm';
+  }
+}
+const packageManager = detectPackageManager();
+console.log(_chalk.default.green(`检测到使用的包管理器：${packageManager}`));
+const packageJsonPath = _path.default.join(projectRoot, 'package.json');
+const packageJson = JSON.parse(_fs.default.readFileSync(packageJsonPath, 'utf8'));
+
+// 确保 devDependencies 存在
+if (!packageJson.devDependencies) {
+  packageJson.devDependencies = {};
+}
+const devDependenciesWithVersion = {
+  commitizen: '4.2.4',
+  eslint: '8.57.1'
+};
+const devDependencies = ['@typescript-eslint/parser', '@typescript-eslint/eslint-plugin', 'prettier', 'eslint-config-prettier', 'eslint-plugin-prettier', 'husky', 'lint-staged', '@commitlint/cli', '@commitlint/config-conventional', 'commitlint-config-cz', 'cz-customizable', 'cz-custom'];
+let dependenciesToInstall = [];
+
+// 检查并收集需要安装的依赖
+for (const dep of devDependencies) {
+  if (!packageJson.devDependencies[dep]) {
+    dependenciesToInstall.push(dep);
+  }
+}
+for (const [dep, version] of Object.entries(devDependenciesWithVersion)) {
+  if (!packageJson.devDependencies[dep]) {
+    dependenciesToInstall.push(`${dep}@${version}`);
+  }
+}
+
+// 安装缺失的依赖
+if (dependenciesToInstall.length > 0) {
+  let installCommand = '';
+  switch (packageManager) {
+    case 'pnpm':
+      installCommand = `pnpm add -D ${dependenciesToInstall.join(' ')}`;
+      break;
+    case 'yarn':
+      installCommand = `yarn add ${dependenciesToInstall.join(' ')} --dev`;
+      break;
+    case 'bun':
+      installCommand = `bun add -d ${dependenciesToInstall.join(' ')}`;
+      break;
+    default:
+      installCommand = `npm install ${dependenciesToInstall.join(' ')} --save-dev`;
+      break;
+  }
+  console.log(_chalk.default.green(`正在安装开发依赖：${dependenciesToInstall.join(', ')}`));
+  console.log(_chalk.default.green(`执行命令：${installCommand}`));
+  (0, _child_process.execSync)(installCommand, {
+    stdio: 'inherit',
+    cwd: projectRoot
+  });
+} else {
+  console.log(_chalk.default.yellow('所有开发依赖已安装，无需安装'));
+}
+
+// 初始化 Git 仓库
+console.log(_chalk.default.green('初始化 Git 仓库'));
+try {
+  // 检查是否已经是 Git 仓库
+  (0, _child_process.execSync)('git rev-parse --is-inside-work-tree', {
+    stdio: 'ignore',
+    cwd: projectRoot
+  });
+  console.log(_chalk.default.yellow('当前已是一个 Git 仓库'));
+} catch (error) {
+  console.error(_chalk.default.red('未检测到 Git 仓库，正在初始化...'), error);
+  // 初始化 Git 仓库
+  (0, _child_process.execSync)('git init', {
+    stdio: 'inherit',
+    cwd: projectRoot
+  });
+}
+
+// 根据包管理器，执行对应的 Husky 初始化命令
+let huskyInitCommand = '';
+switch (packageManager) {
+  case 'pnpm':
+    huskyInitCommand = 'pnpm husky install';
+    break;
+  case 'yarn':
+    huskyInitCommand = 'yarn husky install';
+    break;
+  case 'bun':
+    huskyInitCommand = 'bunx husky install';
+    break;
+  default:
+    huskyInitCommand = 'npx husky install';
+    break;
+}
+console.log(_chalk.default.green(`执行 Husky 初始化命令：${huskyInitCommand}`));
+(0, _child_process.execSync)(huskyInitCommand, {
+  stdio: 'inherit',
+  cwd: projectRoot
+});
+
+// 执行 setup-script 中的所有文件
+console.log(_chalk.default.green('执行 setup-script 中的所有文件'));
+try {
+  const setupScripts = ['prettier.sh', 'lintstagedrc.sh', 'eslint.sh', 'czrc.sh', 'husky.sh', 'commitlintrc.sh'];
+  for (const script of setupScripts) {
+    const scriptPath = _path.default.join(_dirname, '..', 'setup-script', script);
+    console.log(_chalk.default.green(`执行脚本：${scriptPath}`));
+    (0, _child_process.execSync)(`sh ${scriptPath}`, {
+      stdio: 'inherit',
+      cwd: projectRoot
+    });
+  }
+  console.log(_chalk.default.green('所有 setup-script 已执行完毕'));
+} catch (error) {
+  console.error(_chalk.default.red('执行 setup-script 时出错'), error);
+}
+
+// 创建或更新脚本
+if (!packageJson.scripts) {
+  packageJson.scripts = {};
+}
+let modified = false;
+if (!packageJson.scripts.lint) {
+  packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0';
+  console.log(_chalk.default.green('已添加 "lint" 脚本到 package.json'));
+  modified = true;
+} else {
+  console.log(_chalk.default.yellow('package.json 中已存在 "lint" 脚本，未作修改'));
+}
+if (!packageJson.scripts.format) {
+  packageJson.scripts.format = "prettier --config .prettierrc '.' --write";
+  console.log(_chalk.default.green('已添加 "format" 脚本到 package.json'));
+  modified = true;
+} else {
+  console.log(_chalk.default.yellow('package.json 中已存在 "format" 脚本，未作修改'));
+}
+
+// 添加或更新 "commit" 脚本
+packageJson.scripts.commit = 'cz';
+console.log(_chalk.default.green('已添加或更新 "commit" 脚本到 package.json'));
+modified = true;
+
+// 添加或更新 "config.commitizen" 配置
+if (!packageJson.config) {
+  packageJson.config = {};
+}
+packageJson.config.commitizen = {
+  path: 'node_modules/cz-customizable'
+};
+console.log(_chalk.default.green('已添加或更新 "config.commitizen" 到 package.json'));
+modified = true;
+
+// 写入修改后的 package.json
+if (modified) {
+  _fs.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
+  console.log(_chalk.default.green('已更新 package.json'));
+}

package/package.json

@@ -1,8 +1,16 @@
 {
   "name": "commit-pack",
-  "version": "1.0.5",
+  "version": "1.0.9",
   "description": "A setup package to automatly check project's style and commit configuration",
-  "main": "index.js",
+  "main": "lib/index.js",
+  "bin": {
+    "commit-pack": "./index.js"
+  },
+  "files": [
+    "bin/",
+    "setup-script/",
+    "lib/"
+  ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
@@ -48,11 +56,16 @@
     "shelljs": "^0.8.5",
     "standard-version": "^9.5.0"
   },
+  "vscode_custom_css.imports": [
+    "file:///Users/jett/code/Res/custom/custom.css",
+    "file:///Users/jett/code/Res/custom/custom.js"
+  ],
   "scripts": {
+    "postinstall": "node bin/index.mjs",
     "lint": "eslint ./ --ext .ts,.tsx,.json --max-warnings=0",
     "format": "prettier --config .prettierrc '.' --write",
     "commit": "cz",
-    "build": "babel bin/index.js --out-file lib/index.js",
+    "build": "babel bin/index.mjs --out-file lib/index.mjs",
     "release": "standard-version"
   }
 }

package/.babelrc

@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "node": "current"
-        },
-        "modules": "commonjs",
-        "exclude": ["transform-regenerator"]
-      }
-    ]
-  ]
-}

package/.commitlintrc.json

@@ -1,30 +0,0 @@
-{
-  "extends": ["@commitlint/config-conventional"],
-  "parserPreset": {
-    "parserOpts": {
-      "headerPattern": "^(.+?)\\((.+?)\\): (.+)$",
-      "headerCorrespondence": ["type", "scope", "subject"]
-    }
-  },
-  "rules": {
-    "scope-empty": [2, "never"],
-    "type-enum": [
-      2,
-      "always",
-      [
-        "✨ feat",
-        "🐛 fix",
-        "🎉 init",
-        "✏️ docs",
-        "💄 style",
-        "♻️ refactor",
-        "⚡️ perf",
-        "✅ test",
-        "⏪️ revert",
-        "📦 build",
-        "🚀 chore",
-        "👷 ci"
-      ]
-    ]
-  }
-}

package/.cz-config.js

@@ -1,41 +0,0 @@
-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
-
-  }

package/.czrc

@@ -1,3 +0,0 @@
-{
-  "path": "cz-customizable"
-}

package/.eslintignore

@@ -1,3 +0,0 @@
-node_modules/
-
-README.md

package/.eslintrc

@@ -1,15 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
-  ],
-  "plugins": ["@typescript-eslint", "prettier"],
-  "rules": {
-    "prettier/prettier": "error",
-    "arrow-body-style": "off",
-    "prefer-arrow-callback": "off"
-  }
-}

package/.github/workflows/publish.yml

@@ -1,73 +0,0 @@
-name: Publish to npm
-
-on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - 'pnpm-lock.yaml'
-
-permissions:
-  contents: write
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      # 1. 检出代码
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      # 2. 设置 Node.js 环境
-      - name: Sync node version and setup cache
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      # 3. 安装 pnpm
-      - name: Install PNPM
-        run: npm i -g pnpm
-
-      # 4. 验证 pnpm 安装
-      - name: Verify pnpm installation
-        run: pnpm --version
-
-      # 5. 安装依赖
-      - name: Install dependencies
-        run: pnpm install
-
-      # 6. 配置 Git 信息
-      - name: Configure Git
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-      # 7. 更新版本号并创建标签
-      - name: Bump version and create tag
-        run: pnpm run release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # 8. 配置 Git 身份验证
-      - name: 配置 Git 身份验证
-        run: |
-          git remote set-url origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-
-      # 9. 推送更改
-      - name: Push changes
-        run: |
-          git push origin main --follow-tags
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # 10. 运行构建脚本
-      - name: Run build
-        run: pnpm run build
-
-      # 11. 发布到 npm
-      - name: Publish to npm
-        run: pnpm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.husky/commit-msg

@@ -1 +0,0 @@
-npx --no -- commitlint --edit "$1"

package/.husky/pre-commit

@@ -1 +0,0 @@
-npx lint-staged

package/.lintstagedrc

@@ -1,3 +0,0 @@
-{
-  "*.{js,jsx,ts,tsx}": ["eslint --fix", "prettier --write"]
-}

package/.prettierignore

@@ -1,5 +0,0 @@
-node_modules/
-
-README.md
-
-.cz-config.js

package/.prettierrc

@@ -1,10 +0,0 @@
-{
-  "singleQuote": true,
-  "printWidth": 88,
-  "jsxSingleQuote": true,
-  "bracketSameLine": true,
-  "semi": false,
-  "tabWidth": 2,
-  "bracketSpacing": true,
-  "trailingComma": "none"
-}

package/CHANGELOG.md

@@ -1,21 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-## [1.0.5](https://github.com/Jett191/commit-pack/compare/v1.0.4...v1.0.5) (2024-11-05)
-
-
-
-## [1.0.4](https://github.com/Jett191/commit-pack/compare/v1.0.3...v1.0.4) (2024-11-05)
-
-
-
-## [1.0.3](https://github.com/Jett191/commit-pack/compare/v1.0.2...v1.0.3) (2024-11-05)
-
-
-
-## [1.0.2](https://github.com/Jett191/commit-pack/compare/v1.0.1...v1.0.2) (2024-11-05)
-
-
-
-## 1.0.1 (2024-11-05)