@zjex/git-workflow 0.2.6 → 0.2.9

package/dist/index.js

@@ -1876,11 +1876,11 @@ async function performUpdate(packageName) {
   }).start();
   try {
     try {
-      execSync6("npm uninstall -g git-workflow", {
+      execSync6(`npm uninstall -g ${packageName}`, {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"]
       });
-      spinner.text = "\u5DF2\u5378\u8F7D\u65E7\u7248\u672C\uFF0C\u6B63\u5728\u5B89\u88C5\u65B0\u7248\u672C...";
+      spinner.text = "\u6B63\u5728\u5B89\u88C5\u65B0\u7248\u672C...";
     } catch {
     }
     execSync6(`npm install -g ${packageName}`, {
@@ -1889,17 +1889,31 @@ async function performUpdate(packageName) {
     });
     spinner.succeed(colors.green("\u66F4\u65B0\u6210\u529F\uFF01"));
     console.log("");
-    console.log(colors.cyan("  \u63D0\u793A: \u8BF7\u91CD\u65B0\u8FD0\u884C\u547D\u4EE4\u4EE5\u4F7F\u7528\u65B0\u7248\u672C"));
-    console.log("");
+    console.log(
+      boxen(
+        [
+          colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01"),
+          "",
+          colors.dim("\u8BF7\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u5237\u65B0\u5E76\u4F7F\u7528\u65B0\u7248\u672C:"),
+          "",
+          colors.yellow("  hash -r && gw --version"),
+          "",
+          colors.dim("\u6216\u8005\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF")
+        ].join("\n"),
+        {
+          padding: 1,
+          margin: { top: 0, bottom: 1, left: 2, right: 2 },
+          borderStyle: "round",
+          borderColor: "green",
+          align: "left"
+        }
+      )
+    );
     process.exit(0);
   } catch (error) {
     spinner.fail(colors.red("\u66F4\u65B0\u5931\u8D25"));
     console.log("");
     console.log(colors.dim("  \u4F60\u53EF\u4EE5\u624B\u52A8\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0:"));
-    console.log(colors.yellow("  # \u5982\u679C\u4E4B\u524D\u5B89\u88C5\u8FC7\u65E7\u7248\u672C\uFF0C\u5148\u5378\u8F7D:"));
-    console.log(colors.cyan("  npm uninstall -g git-workflow"));
-    console.log("");
-    console.log(colors.yellow("  # \u7136\u540E\u5B89\u88C5\u65B0\u7248\u672C:"));
     console.log(colors.cyan(`  npm install -g ${packageName}`));
     console.log("");
   }
@@ -1949,7 +1963,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.2.6" : "0.0.0-dev";
+var version = true ? "0.2.9" : "0.0.0-dev";
 async function mainMenu() {
   await checkForUpdates(version, "@zjex/git-workflow");
   console.log(

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.2.6",
-	"description": "个人常用的 Git 工作流工具，快速创建规范的开发分支和管理 Tag",
+	"version": "0.2.9",
+	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {
-		"git-flow": "./dist/index.js",
-		"gw": "./dist/index.js"
+		"git-flow": "dist/index.js",
+		"gw": "dist/index.js"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -52,4 +52,4 @@
 		"tsx": "^4.21.0",
 		"typescript": "^5.9.3"
 	}
-}
+}

package/scripts/publish-success.js

@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+
+import boxen from "boxen";
+
+const version = process.argv[2];
+
+if (!version) {
+  console.error("请提供版本号");
+  process.exit(1);
+}
+
+const message = [
+  "\x1b[1m🎉 发布成功！\x1b[0m",
+  "",
+  `\x1b[36m版本:\x1b[0m \x1b[1mv${version}\x1b[0m`,
+].join("\n");
+
+console.log("");
+console.log(
+  boxen(message, {
+    padding: { top: 1, bottom: 1, left: 8, right: 8 },
+    margin: { top: 0, bottom: 1, left: 0, right: 0 },
+    borderStyle: "round",
+    borderColor: "green",
+    align: "center",
+  })
+);
+
+console.log(
+  "\x1b[2m  🔗 \x1b[0m\x1b[36mGitHub:\x1b[0m \x1b[2m\x1b[4mhttps://github.com/iamzjt-front-end/git-workflow/releases/tag/v" +
+    version +
+    "\x1b[0m"
+);
+console.log(
+  "\x1b[2m  📦 \x1b[0m\x1b[36mnpm:\x1b[0m \x1b[2m\x1b[4mhttps://www.npmjs.com/package/@zjex/git-workflow\x1b[0m"
+);
+console.log("");

package/scripts/publish.sh

@@ -7,67 +7,115 @@ RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 CYAN='\033[0;36m'
+BLUE='\033[0;34m'
+DIM='\033[2m'
+BOLD='\033[1m'
 NC='\033[0m' # No Color
 
 # 打印带颜色的消息
 print_info() {
-  echo -e "${CYAN}ℹ ${1}${NC}"
-}
-
-print_success() {
-  echo -e "${GREEN}✔ ${1}${NC}"
+  echo -e "${CYAN}${1}${NC}"
 }
 
 print_error() {
   echo -e "${RED}✖ ${1}${NC}"
 }
 
-print_step() {
-  echo -e "${CYAN}▶ ${1}${NC}"
+print_dim() {
+  echo -e "${DIM}  ${1}${NC}"
+}
+
+# 执行步骤（带完成标记，折叠输出）
+run_step() {
+  local step_num=$1
+  local step_name=$2
+  local command=$3
+  
+  echo -ne "${BLUE}[${step_num}/${TOTAL_STEPS}]${NC} ${step_name}... "
+  
+  # 执行命令并捕获输出
+  if output=$(eval "$command" 2>&1); then
+    echo -e "${GREEN}✅${NC}"
+    return 0
+  else
+    echo -e "${RED}❌${NC}"
+    echo ""
+    echo -e "${RED}错误详情:${NC}"
+    echo "$output"
+    return 1
+  fi
 }
 
-# 检查是否在 git 仓库中
-if ! git rev-parse --git-dir > /dev/null 2>&1; then
+# 执行步骤（显示输出，用于交互式命令）
+run_step_interactive() {
+  local step_num=$1
+  local step_name=$2
+  local command=$3
+  
+  echo -e "${BLUE}[${step_num}/${TOTAL_STEPS}]${NC} ${step_name}..."
+  echo ""
+  
+  if eval "$command"; then
+    echo ""
+    return 0
+  else
+    echo -e "${RED}    ❌ 失败${NC}"
+    return 1
+  fi
+}
+
+# 总步骤数
+TOTAL_STEPS=11
+
+echo ""
+echo -e "${BOLD}🚀 开始发布流程${NC}"
+echo ""
+
+
+# [1] 检查是否在 git 仓库中
+if ! run_step "1" "检查 Git 仓库" "git rev-parse --git-dir"; then
   print_error "当前目录不是 git 仓库"
   exit 1
 fi
 
-# 检查是否有未提交的更改（发布前的脏工作区）
+# [2] 检查是否有未提交的更改
+echo -ne "${BLUE}[2/${TOTAL_STEPS}]${NC} 检查工作区状态... "
 if [[ -n $(git status --porcelain) ]]; then
+  echo -e "${RED}❌${NC}"
   echo ""
   print_error "检测到未提交的更改，请先提交后再发布"
   echo ""
   git status --short
   echo ""
-  print_info "提示: 可以使用 'gw c' 或 'git add . && git commit' 提交更改"
+  print_info "💡 提示: 可以使用 'gw c' 提交更改"
   exit 1
+else
+  echo -e "${GREEN}✅${NC}"
 fi
 
-# 检查 npm 登录状态
-print_step "检查 npm 登录状态..."
+# [3] 检查 npm 登录状态
+echo -ne "${BLUE}[3/${TOTAL_STEPS}]${NC} 检查 npm 登录状态... "
 if ! npm whoami &> /dev/null; then
+  echo -e "${RED}❌${NC}"
   print_error "未登录 npm，请先执行: npm login"
   exit 1
 fi
 NPM_USER=$(npm whoami)
-print_success "已登录 npm (用户: ${NPM_USER})"
+echo -e "${GREEN}✅${NC} ${DIM}(${NPM_USER})${NC}"
 
 # 获取当前分支
 CURRENT_BRANCH=$(git branch --show-current)
-print_info "当前分支: ${CURRENT_BRANCH}"
 
-# 拉取最新代码
-print_step "拉取最新代码..."
-git pull origin "$CURRENT_BRANCH"
-print_success "代码已更新"
+# [4] 拉取最新代码
+if ! run_step "4" "拉取最新代码" "git pull origin '$CURRENT_BRANCH'"; then
+  exit 1
+fi
 
 # 获取当前版本
 CURRENT_VERSION=$(node -p "require('./package.json').version")
-print_info "当前版本: ${CURRENT_VERSION}"
 
-# 交互式选择版本号
-print_step "选择新版本号..."
-npm run version
+# [5] 交互式选择版本号
+run_step_interactive "5" "选择新版本号" "npm run version"
 
 # 获取新版本
 NEW_VERSION=$(node -p "require('./package.json').version")
@@ -77,44 +125,59 @@ if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
   exit 0
 fi
 
-print_success "版本号已更新: ${CURRENT_VERSION} → ${NEW_VERSION}"
+# 显示版本升级信息
+echo -e "${GREEN}    ✅${NC} ${DIM}(${CURRENT_VERSION} → ${NEW_VERSION})${NC}"
 
-# 构建项目
-print_step "构建项目..."
-npm run build
-print_success "构建完成"
+# [6] 构建项目
+if ! run_step "6" "构建项目" "npm run build"; then
+  exit 1
+fi
 
-# 生成 changelog
-print_step "生成 CHANGELOG..."
-npm run changelog
-print_success "CHANGELOG 已更新"
+# [7] 生成 changelog
+if ! run_step "7" "生成 CHANGELOG" "npm run changelog"; then
+  exit 1
+fi
 
-# 提交版本更新和 changelog
-print_step "提交版本更新..."
-git add package.json CHANGELOG.md
-git commit -m "🔖 chore(release): 发布 v${NEW_VERSION}"
-print_success "版本更新已提交"
+# [8] 提交版本更新和 changelog
+echo -ne "${BLUE}[8/${TOTAL_STEPS}]${NC} 提交版本更新... "
+if output=$(git add package.json CHANGELOG.md && git commit -m "🔖 chore(release): 发布 v${NEW_VERSION}" 2>&1); then
+  echo -e "${GREEN}✅${NC} ${DIM}(🔖 chore(release): 发布 v${NEW_VERSION})${NC}"
+else
+  echo -e "${RED}❌${NC}"
+  echo ""
+  echo -e "${RED}错误详情:${NC}"
+  echo "$output"
+  exit 1
+fi
 
-# 创建 tag
-print_step "创建 tag: v${NEW_VERSION}..."
-git tag -a "v${NEW_VERSION}" -m "Release v${NEW_VERSION}"
-print_success "Tag 已创建"
+# [9] 创建 tag
+echo -ne "${BLUE}[9/${TOTAL_STEPS}]${NC} 创建 Git Tag... "
+if output=$(git tag -a "v${NEW_VERSION}" -m "Release v${NEW_VERSION}" 2>&1); then
+  echo -e "${GREEN}✅${NC} ${DIM}(v${NEW_VERSION})${NC}"
+else
+  echo -e "${RED}❌${NC}"
+  echo ""
+  echo -e "${RED}错误详情:${NC}"
+  echo "$output"
+  exit 1
+fi
 
-# 推送到远程
-print_step "推送到远程仓库..."
-git push origin "$CURRENT_BRANCH"
-git push origin "v${NEW_VERSION}"
-print_success "已推送到远程"
+# [10] 推送到远程
+echo -ne "${BLUE}[10/${TOTAL_STEPS}]${NC} 推送到远程仓库... "
+if output=$(git push origin "$CURRENT_BRANCH" && git push origin "v${NEW_VERSION}" 2>&1); then
+  echo -e "${GREEN}✅${NC} ${DIM}(${CURRENT_BRANCH}, v${NEW_VERSION})${NC}"
+else
+  echo -e "${RED}❌${NC}"
+  echo ""
+  echo -e "${RED}错误详情:${NC}"
+  echo "$output"
+  exit 1
+fi
 
-# 发布到 npm
-print_step "发布到 npm..."
-npm publish
-print_success "已发布到 npm"
+# [11] 发布到 npm
+if ! run_step "11" "发布到 npm" "npm publish"; then
+  exit 1
+fi
 
-echo ""
-print_success "🎉 发布成功！"
-echo ""
-echo "版本: v${NEW_VERSION}"
-echo "GitHub: https://github.com/iamzjt-front-end/git-workflow/releases/tag/v${NEW_VERSION}"
-echo "npm: https://www.npmjs.com/package/@zjex/git-workflow/v/${NEW_VERSION}"
-echo ""
+# 成功总结
+node scripts/publish-success.js "${NEW_VERSION}"

package/src/update-notifier.ts

@@ -145,18 +145,18 @@ async function performUpdate(packageName: string): Promise<void> {
   }).start();
 
   try {
-    // 先尝试卸载旧版本（无 scope 的版本）
+    // 先卸载当前版本，确保干净安装
     try {
-      execSync("npm uninstall -g git-workflow", {
+      execSync(`npm uninstall -g ${packageName}`, {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"],
       });
-      spinner.text = "已卸载旧版本，正在安装新版本...";
+      spinner.text = "正在安装新版本...";
     } catch {
-      // 旧版本不存在，忽略错误
+      // 当前版本不存在，忽略错误
     }
 
-    // 执行更新命令
+    // 执行安装命令
     execSync(`npm install -g ${packageName}`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
@@ -164,8 +164,26 @@ async function performUpdate(packageName: string): Promise<void> {
 
     spinner.succeed(colors.green("更新成功！"));
     console.log("");
-    console.log(colors.cyan("  提示: 请重新运行命令以使用新版本"));
-    console.log("");
+    console.log(
+      boxen(
+        [
+          colors.bold("✨ 更新完成！"),
+          "",
+          colors.dim("请运行以下命令刷新并使用新版本:"),
+          "",
+          colors.yellow("  hash -r && gw --version"),
+          "",
+          colors.dim("或者重新打开终端"),
+        ].join("\n"),
+        {
+          padding: 1,
+          margin: { top: 0, bottom: 1, left: 2, right: 2 },
+          borderStyle: "round",
+          borderColor: "green",
+          align: "left",
+        }
+      )
+    );
 
     // 更新成功后退出，让用户重新运行
     process.exit(0);
@@ -173,10 +191,6 @@ async function performUpdate(packageName: string): Promise<void> {
     spinner.fail(colors.red("更新失败"));
     console.log("");
     console.log(colors.dim("  你可以手动运行以下命令更新:"));
-    console.log(colors.yellow("  # 如果之前安装过旧版本，先卸载:"));
-    console.log(colors.cyan("  npm uninstall -g git-workflow"));
-    console.log("");
-    console.log(colors.yellow("  # 然后安装新版本:"));
     console.log(colors.cyan(`  npm install -g ${packageName}`));
     console.log("");
   }

package/test-box.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+GREEN='\033[0;32m'
+CYAN='\033[0;36m'
+BOLD='\033[1m'
+NC='\033[0m'
+
+NEW_VERSION="0.2.8"
+
+echo ""
+echo -e "${GREEN}╭──────────────────────────────╮${NC}"
+echo -e "${GREEN}│                              │${NC}"
+echo -e "${GREEN}│${NC}  ${BOLD}🎉 发布成功！${NC}           ${GREEN}│${NC}"
+echo -e "${GREEN}│                              │${NC}"
+echo -e "${GREEN}│${NC}  ${CYAN}版本:${NC} ${BOLD}v${NEW_VERSION}${NC}            ${GREEN}│${NC}"
+echo -e "${GREEN}│                              │${NC}"
+echo -e "${GREEN}╰──────────────────────────────╯${NC}"
+echo ""

package/test-full-publish.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+BLUE='\033[0;34m'
+GREEN='\033[0;32m'
+CYAN='\033[0;36m'
+DIM='\033[2m'
+BOLD='\033[1m'
+NC='\033[0m'
+
+TOTAL_STEPS=11
+NEW_VERSION="0.2.8"
+CURRENT_BRANCH="main"
+
+echo ""
+echo -e "${BOLD}🚀 开始发布流程${NC}"
+echo ""
+
+echo -e "${BLUE}[1/${TOTAL_STEPS}]${NC} 检查 Git 仓库... ${GREEN}✅${NC}"
+echo -e "${BLUE}[2/${TOTAL_STEPS}]${NC} 检查工作区状态... ${GREEN}✅${NC}"
+echo -e "${BLUE}[3/${TOTAL_STEPS}]${NC} 检查 npm 登录状态... ${GREEN}✅${NC} ${DIM}(zjex)${NC}"
+echo -e "${BLUE}[4/${TOTAL_STEPS}]${NC} 拉取最新代码... ${GREEN}✅${NC}"
+echo -e "${BLUE}[5/${TOTAL_STEPS}]${NC} 选择新版本号... ${GREEN}✅${NC} ${DIM}(0.2.7 → 0.2.8)${NC}"
+echo -e "${BLUE}[6/${TOTAL_STEPS}]${NC} 构建项目... ${GREEN}✅${NC}"
+echo -e "${BLUE}[7/${TOTAL_STEPS}]${NC} 生成 CHANGELOG... ${GREEN}✅${NC}"
+echo -e "${BLUE}[8/${TOTAL_STEPS}]${NC} 提交版本更新... ${GREEN}✅${NC} ${DIM}(🔖 chore(release): 发布 v${NEW_VERSION})${NC}"
+echo -e "${BLUE}[9/${TOTAL_STEPS}]${NC} 创建 Git Tag... ${GREEN}✅${NC} ${DIM}(v${NEW_VERSION})${NC}"
+echo -e "${BLUE}[10/${TOTAL_STEPS}]${NC} 推送到远程仓库... ${GREEN}✅${NC} ${DIM}(${CURRENT_BRANCH}, v${NEW_VERSION})${NC}"
+echo -e "${BLUE}[11/${TOTAL_STEPS}]${NC} 发布到 npm... ${GREEN}✅${NC}"
+
+node scripts/publish-success.js "${NEW_VERSION}"