commit-pack 1.1.1 → 1.1.3

package/bin/chalkColor.js

@@ -0,0 +1,7 @@
+import chalk from 'chalk'
+
+export const log = {
+  success: chalk.hex('#CCFF99'),
+  error: chalk.hex('#FF6666'),
+  warn: chalk.hex('#FFFF66')
+}

package/bin/index.mjs

@@ -7,6 +7,8 @@ import chalk from 'chalk'
 import { execSync } from 'child_process'
 import path from 'path'
 import { fileURLToPath } from 'url'
+import { log } from './chalkColor.js'
+import { installWithProgress } from './installWithProgress.js'
 
 // 模拟 CommonJS 的 __dirname
 const __filename = fileURLToPath(import.meta.url)
@@ -30,7 +32,6 @@ function findProjectRootWithLockFile() {
 }
 
 const projectRoot = findProjectRootWithLockFile()
-console.log(chalk.green(`检测到项目根目录：${projectRoot}`))
 
 function detectPackageManager() {
   if (fs.existsSync(path.join(projectRoot, 'pnpm-lock.yaml'))) {
@@ -44,10 +45,10 @@ function detectPackageManager() {
   }
 }
 
-console.log('执行 postinstall 脚本:bin/index.js')
-
 const packageManager = detectPackageManager()
-console.log(chalk.green(`检测到使用的包管理器：${packageManager}`))
+console.log('')
+console.log(`🍀 包管理器:${packageManager}`)
+console.log(`📁 根目录:${projectRoot}`)
 
 const packageJsonPath = path.join(projectRoot, 'package.json')
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
@@ -55,7 +56,6 @@ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
 // 检查是否已经初始化过
 const initFlagPath = path.join(projectRoot, '.commit-pack-init')
 if (fs.existsSync(initFlagPath)) {
-  console.log(chalk.yellow('已检测到初始化标志文件，跳过初始化'))
   process.exit(0)
 }
 
@@ -81,7 +81,8 @@ const devDependencies = [
   '@commitlint/config-conventional',
   'commitlint-config-cz',
   'cz-customizable',
-  'cz-custom'
+  'cz-custom',
+  'prettier-plugin-tailwindcss'
 ]
 
 let dependenciesToInstall = []
@@ -99,31 +100,7 @@ for (const [dep, version] of Object.entries(devDependenciesWithVersion)) {
   }
 }
 
-// 安装缺失的依赖
-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.green(`正在安装开发依赖：${dependenciesToInstall.join(', ')}`))
-  console.log(chalk.green(`执行命令：${installCommand}`))
-  execSync(installCommand, { stdio: 'inherit', cwd: projectRoot })
-} else {
-  console.log(chalk.yellow('所有开发依赖已安装，无需安装'))
-}
+installWithProgress(dependenciesToInstall, packageManager, projectRoot)
 
 let isGitRepo = false
 
@@ -143,9 +120,9 @@ try {
 }
 
 if (isGitRepo) {
-  console.log(chalk.yellow('当前已是一个 Git 仓库'))
+  console.log(log.success('👍 Git仓库已存在'))
 } else {
-  console.log(chalk.red('未检测到 Git 仓库，正在初始化...'))
+  console.log(log.warn('👌 Git仓库初始化...'))
   execSync('git init', { stdio: 'inherit', cwd: projectRoot })
 }
 
@@ -166,11 +143,11 @@ switch (packageManager) {
     break
 }
 
-console.log(chalk.green(`执行 Husky 初始化命令：${huskyInitCommand}`))
+console.log(chalk.green(`🐶 Husky初始化...`))
 execSync(huskyInitCommand, { stdio: 'inherit', cwd: projectRoot })
 
 // 执行 setup-script 中的所有文件
-console.log(chalk.green('执行 setup-script 中的所有文件'))
+console.log('🚀 创建配置文件...')
 try {
   const setupScripts = [
     'prettier.sh',
@@ -184,12 +161,11 @@ try {
 
   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 已执行完毕'))
+  console.log(chalk.green('✅ 文件创建完毕'))
 } catch (error) {
-  console.error(chalk.red('执行 setup-script 时出错'), error)
+  console.error(log.warn('❌ 文件创建出错'), error)
 }
 
 // 创建或更新脚本
@@ -201,23 +177,23 @@ let modified = false
 
 if (!packageJson.scripts.lint) {
   packageJson.scripts.lint = 'eslint ./ --ext .ts,.tsx,.json --max-warnings=0'
-  console.log(chalk.green('已添加 "lint" 脚本到 package.json'))
+  console.log(log.success('已添加 "lint" 至 package.json'))
   modified = true
 } else {
-  console.log(chalk.yellow('package.json 中已存在 "lint" 脚本，未作修改'))
+  console.log(log.warn('package.json 中已存在 "lint" 未作修改'))
 }
 
 if (!packageJson.scripts.format) {
   packageJson.scripts.format = "prettier --config .prettierrc '.' --write"
-  console.log(chalk.green('已添加 "format" 脚本到 package.json'))
+  console.log(log.success('已添加 "format" 至 package.json'))
   modified = true
 } else {
-  console.log(chalk.yellow('package.json 中已存在 "format" 脚本，未作修改'))
+  console.log(log.warn('package.json 中已存在 "format" 未作修改'))
 }
 
 // 添加或更新 "commit" 脚本
 packageJson.scripts.commit = 'cz'
-console.log(chalk.green('已添加或更新 "commit" 脚本到 package.json'))
+console.log(log.success('已添加或更新 "commit" 脚本到 package.json'))
 modified = true
 
 // 添加或更新 "config.commitizen" 配置
@@ -228,15 +204,18 @@ if (!packageJson.config) {
 packageJson.config.commitizen = {
   path: 'node_modules/cz-customizable'
 }
-console.log(chalk.green('已添加或更新 "config.commitizen" 到 package.json'))
 modified = true
 
 // 写入修改后的 package.json
 if (modified) {
   fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8')
   console.log(chalk.green('已更新 package.json'))
+  console.log('')
+  console.log('')
 }
 
 // 创建初始化标志文件
-fs.writeFileSync(initFlagPath, 'initialized', 'utf8')
-console.log(chalk.green('已创建初始化标志文件'))
+// fs.writeFileSync(initFlagPath, 'initialized', 'utf8')
+console.log(log.success('🎉🎉🎉 完成啦!'))
+console.log('')
+console.log('运行 git add 后 | 运行 ${packageManager} run commit 即可')

package/bin/installWithProgress.js

@@ -0,0 +1,52 @@
+/* eslint-env node */
+import chalk from 'chalk'
+import { execSync } from 'child_process'
+import cliProgress from 'cli-progress'
+
+export function installWithProgress(dependencies, packageManager, projectRoot) {
+  if (!dependencies || dependencies.length === 0) {
+    console.log(chalk.yellow('✅ 所有开发依赖已安装，跳过安装'))
+    return
+  }
+
+  console.log('')
+  console.log(chalk.cyan(`⬇️ 开始安装依赖...`))
+
+  const bar = new cliProgress.SingleBar({
+    format: `${chalk.green('📦 安装中')} {bar} {percentage}% | {value}/{total} | 正在安装: {dep}`,
+    barCompleteChar: '█',
+    barIncompleteChar: '░',
+    hideCursor: true
+  })
+
+  bar.start(dependencies.length, 0, { dep: '' })
+
+  try {
+    for (let i = 0; i < dependencies.length; i++) {
+      const dep = dependencies[i]
+
+      const installCommand = {
+        pnpm: `pnpm add -D ${dep}`,
+        yarn: `yarn add ${dep} --dev`,
+        bun: `bun add -d ${dep}`,
+        npm: `npm install ${dep} --save-dev`
+      }[packageManager]
+
+      bar.update(i, { dep })
+
+      execSync(installCommand, { cwd: projectRoot, stdio: 'ignore' })
+
+      bar.update(i + 1, { dep })
+    }
+
+    bar.stop()
+    console.log('')
+    console.log(chalk.green('✅ 所有开发依赖安装完成'))
+    console.log('')
+    console.log('')
+  } catch (err) {
+    bar.stop()
+    console.log(chalk.red('❌ 安装过程中出错'), err)
+    throw err
+  }
+}

package/lib/index.mjs

@@ -8,6 +8,8 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _child_process = require("child_process");
 var _path = _interopRequireDefault(require("path"));
 var _url = require("url");
+var _chalkColor = require("./chalkColor.js");
+var _installWithProgress = require("./installWithProgress.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // 模拟 CommonJS 的 __dirname
 const _filename = (0, _url.fileURLToPath)(import.meta.url);
@@ -28,7 +30,6 @@ function findProjectRootWithLockFile() {
   return process.cwd(); // fallback
 }
 const projectRoot = findProjectRootWithLockFile();
-console.log(_chalk.default.green(`检测到项目根目录：${projectRoot}`));
 function detectPackageManager() {
   if (_fs.default.existsSync(_path.default.join(projectRoot, 'pnpm-lock.yaml'))) {
     return 'pnpm';
@@ -40,16 +41,16 @@ function detectPackageManager() {
     return 'npm';
   }
 }
-console.log('执行 postinstall 脚本:bin/index.js');
 const packageManager = detectPackageManager();
-console.log(_chalk.default.green(`检测到使用的包管理器：${packageManager}`));
+console.log('');
+console.log(`🍀 包管理器:${packageManager}`);
+console.log(`📁 根目录:${projectRoot}`);
 const packageJsonPath = _path.default.join(projectRoot, 'package.json');
 const packageJson = JSON.parse(_fs.default.readFileSync(packageJsonPath, 'utf8'));
 
 // 检查是否已经初始化过
 const initFlagPath = _path.default.join(projectRoot, '.commit-pack-init');
 if (_fs.default.existsSync(initFlagPath)) {
-  console.log(_chalk.default.yellow('已检测到初始化标志文件，跳过初始化'));
   process.exit(0);
 }
 
@@ -61,7 +62,7 @@ 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'];
+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', 'prettier-plugin-tailwindcss'];
 let dependenciesToInstall = [];
 
 // 检查并收集需要安装的依赖
@@ -75,33 +76,7 @@ for (const [dep, version] of Object.entries(devDependenciesWithVersion)) {
     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('所有开发依赖已安装，无需安装'));
-}
+(0, _installWithProgress.installWithProgress)(dependenciesToInstall, packageManager, projectRoot);
 let isGitRepo = false;
 try {
   // 获取 Git 仓库的顶级目录
@@ -118,9 +93,9 @@ try {
   isGitRepo = false;
 }
 if (isGitRepo) {
-  console.log(_chalk.default.yellow('当前已是一个 Git 仓库'));
+  console.log(_chalkColor.log.success('👍 Git仓库已存在'));
 } else {
-  console.log(_chalk.default.red('未检测到 Git 仓库，正在初始化...'));
+  console.log(_chalkColor.log.warn('👌 Git仓库初始化...'));
   (0, _child_process.execSync)('git init', {
     stdio: 'inherit',
     cwd: projectRoot
@@ -143,27 +118,26 @@ switch (packageManager) {
     huskyInitCommand = 'npx husky init';
     break;
 }
-console.log(_chalk.default.green(`执行 Husky 初始化命令：${huskyInitCommand}`));
+console.log(_chalk.default.green(`🐶 Husky初始化...`));
 (0, _child_process.execSync)(huskyInitCommand, {
   stdio: 'inherit',
   cwd: projectRoot
 });
 
 // 执行 setup-script 中的所有文件
-console.log(_chalk.default.green('执行 setup-script 中的所有文件'));
+console.log('🚀 创建配置文件...');
 try {
   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}`));
     (0, _child_process.execSync)(`sh ${scriptPath}`, {
       stdio: 'inherit',
       cwd: projectRoot
     });
   }
-  console.log(_chalk.default.green('所有 setup-script 已执行完毕'));
+  console.log(_chalk.default.green('✅ 文件创建完毕'));
 } catch (error) {
-  console.error(_chalk.default.red('执行 setup-script 时出错'), error);
+  console.error(_chalkColor.log.warn('❌ 文件创建出错'), error);
 }
 
 // 创建或更新脚本
@@ -173,22 +147,22 @@ if (!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'));
+  console.log(_chalkColor.log.success('已添加 "lint" 至 package.json'));
   modified = true;
 } else {
-  console.log(_chalk.default.yellow('package.json 中已存在 "lint" 脚本，未作修改'));
+  console.log(_chalkColor.log.warn('package.json 中已存在 "lint" 未作修改'));
 }
 if (!packageJson.scripts.format) {
   packageJson.scripts.format = "prettier --config .prettierrc '.' --write";
-  console.log(_chalk.default.green('已添加 "format" 脚本到 package.json'));
+  console.log(_chalkColor.log.success('已添加 "format" 至 package.json'));
   modified = true;
 } else {
-  console.log(_chalk.default.yellow('package.json 中已存在 "format" 脚本，未作修改'));
+  console.log(_chalkColor.log.warn('package.json 中已存在 "format" 未作修改'));
 }
 
 // 添加或更新 "commit" 脚本
 packageJson.scripts.commit = 'cz';
-console.log(_chalk.default.green('已添加或更新 "commit" 脚本到 package.json'));
+console.log(_chalkColor.log.success('已添加或更新 "commit" 脚本到 package.json'));
 modified = true;
 
 // 添加或更新 "config.commitizen" 配置
@@ -198,15 +172,18 @@ if (!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'));
+  console.log('');
+  console.log('');
 }
 
 // 创建初始化标志文件
-_fs.default.writeFileSync(initFlagPath, 'initialized', 'utf8');
-console.log(_chalk.default.green('已创建初始化标志文件'));
+// fs.writeFileSync(initFlagPath, 'initialized', 'utf8')
+console.log(_chalkColor.log.success('🎉🎉🎉 完成啦!'));
+console.log('');
+console.log('运行 git add 后 | 运行 ${packageManager} run commit 即可');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commit-pack",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "A setup package to automatly check project's style and commit configuration",
   "main": "lib/index.js",
   "bin": {
@@ -34,18 +34,19 @@
   "author": "jett191",
   "license": "MIT",
   "dependencies": {
-    "@typescript-eslint/parser": "^8.12.2",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
     "@typescript-eslint/eslint-plugin": "^8.12.2",
-    "prettier": "^3.3.3",
+    "@typescript-eslint/parser": "^8.12.2",
+    "cli-progress": "^3.12.0",
+    "commitlint-config-cz": "^0.13.3",
+    "cz-custom": "^0.0.2",
+    "cz-customizable": "^7.2.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
-    "commitlint-config-cz": "^0.13.3",
-    "cz-custom": "^0.0.2",
-    "cz-customizable": "^7.2.1"
+    "prettier": "^3.3.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.9",

package/setup-script/prettier.sh

@@ -7,7 +7,8 @@ echo '
   "semi": false,
   "tabWidth": 2,
   "bracketSpacing": true,
-  "trailingComma": "none"
+  "trailingComma": "none",
+  "plugins": ["prettier-plugin-tailwindcss"]
 }
 ' > .prettierrc