@zjex/git-workflow 0.1.0 → 0.1.1

package/README.md

@@ -1,9 +1,9 @@
 # @zjex/git-workflow
 
 <p align="center">
-  <img src="https://img.shields.io/npm/v/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm version">
-  <img src="https://img.shields.io/npm/dm/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm downloads">
-  <img src="https://img.shields.io/npm/l/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="license">
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/v/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/dm/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm downloads"></a>
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/l/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="license"></a>
   <img src="https://img.shields.io/badge/node-%3E%3D18-28CF8D?style=flat&colorA=18181B" alt="node version">
 </p>
 

package/dist/index.js

@@ -82,7 +82,7 @@ Commit \u547D\u4EE4:
 \u5206\u652F\u547D\u540D\u683C\u5F0F:
   feature/${W}-<Story ID>-<\u63CF\u8FF0>
   hotfix/${W}-<Issue ID>-<\u63CF\u8FF0>
-`}process.on("uncaughtException",e=>{e instanceof z&&process.exit(0),console.error(e),process.exit(1)});var Wt="0.1.0";async function pu(){switch(console.log(l.green(`
+`}process.on("uncaughtException",e=>{e instanceof z&&process.exit(0),console.error(e),process.exit(1)});var Wt="0.1.1";async function pu(){switch(console.log(l.green(`
  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557     \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557
  \u255A\u2550\u2550\u2588\u2588\u2588\u2554\u255D     \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u255A\u2588\u2588\u2557\u2588\u2588\u2554\u255D
    \u2588\u2588\u2588\u2554\u255D      \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2557   \u255A\u2588\u2588\u2588\u2554\u255D 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"description": "个人常用的 Git 工作流工具，快速创建规范的开发分支和管理 Tag",
 	"type": "module",
 	"bin": {
@@ -17,7 +17,7 @@
 		"version": "node scripts/version.js",
 		"release": "./scripts/release.sh",
 		"release:dry": "./scripts/release.sh --dry-run",
-		"publish:npm": "npm run version && npm run build && npm run changelog && npm publish",
+		"publish:npm": "./scripts/publish.sh",
 		"prepublishOnly": "npm run build",
 		"prepare": "husky"
 	},

package/scripts/publish.sh

@@ -0,0 +1,120 @@
+#!/bin/bash
+
+set -e
+
+# 颜色定义
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+# 打印带颜色的消息
+print_info() {
+  echo -e "${CYAN}ℹ ${1}${NC}"
+}
+
+print_success() {
+  echo -e "${GREEN}✔ ${1}${NC}"
+}
+
+print_error() {
+  echo -e "${RED}✖ ${1}${NC}"
+}
+
+print_step() {
+  echo -e "${CYAN}▶ ${1}${NC}"
+}
+
+# 检查是否在 git 仓库中
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+  print_error "当前目录不是 git 仓库"
+  exit 1
+fi
+
+# 检查是否有未提交的更改（发布前的脏工作区）
+if [[ -n $(git status --porcelain) ]]; then
+  echo ""
+  print_error "检测到未提交的更改，请先提交后再发布"
+  echo ""
+  git status --short
+  echo ""
+  print_info "提示: 可以使用 'gw c' 或 'git add . && git commit' 提交更改"
+  exit 1
+fi
+
+# 检查 npm 登录状态
+print_step "检查 npm 登录状态..."
+if ! npm whoami &> /dev/null; then
+  print_error "未登录 npm，请先执行: npm login"
+  exit 1
+fi
+NPM_USER=$(npm whoami)
+print_success "已登录 npm (用户: ${NPM_USER})"
+
+# 获取当前分支
+CURRENT_BRANCH=$(git branch --show-current)
+print_info "当前分支: ${CURRENT_BRANCH}"
+
+# 拉取最新代码
+print_step "拉取最新代码..."
+git pull origin "$CURRENT_BRANCH"
+print_success "代码已更新"
+
+# 获取当前版本
+CURRENT_VERSION=$(node -p "require('./package.json').version")
+print_info "当前版本: ${CURRENT_VERSION}"
+
+# 交互式选择版本号
+print_step "选择新版本号..."
+npm run version
+
+# 获取新版本
+NEW_VERSION=$(node -p "require('./package.json').version")
+
+if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
+  print_info "版本号未更改，已取消发布"
+  exit 0
+fi
+
+print_success "版本号已更新: ${CURRENT_VERSION} → ${NEW_VERSION}"
+
+# 构建项目
+print_step "构建项目..."
+npm run build
+print_success "构建完成"
+
+# 生成 changelog
+print_step "生成 CHANGELOG..."
+npm run changelog
+print_success "CHANGELOG 已更新"
+
+# 提交版本更新和 changelog
+print_step "提交版本更新..."
+git add package.json CHANGELOG.md
+git commit -m "🔖 chore(release): 发布 v${NEW_VERSION}"
+print_success "版本更新已提交"
+
+# 创建 tag
+print_step "创建 tag: v${NEW_VERSION}..."
+git tag -a "v${NEW_VERSION}" -m "Release v${NEW_VERSION}"
+print_success "Tag 已创建"
+
+# 推送到远程
+print_step "推送到远程仓库..."
+git push origin "$CURRENT_BRANCH"
+git push origin "v${NEW_VERSION}"
+print_success "已推送到远程"
+
+# 发布到 npm
+print_step "发布到 npm..."
+npm publish
+print_success "已发布到 npm"
+
+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 ""

package/scripts/restore-prompt.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+import { confirm } from "@inquirer/prompts";
+
+const colors = {
+  reset: "\x1b[0m",
+  cyan: "\x1b[36m",
+};
+
+async function main() {
+  console.log("");
+  console.log(`${colors.cyan}ℹ 之前暂存的更改可以恢复${colors.reset}`);
+
+  try {
+    const answer = await confirm({
+      message: "是否恢复暂存的更改? (Ctrl+C 跳过)",
+      default: false,
+    });
+
+    // 输出结果到 stdout
+    process.stdout.write((answer ? "yes" : "no") + "\n");
+    process.exit(0);
+  } catch (error) {
+    if (error.name === "ExitPromptError") {
+      // Ctrl+C 被按下，静默退出，默认不恢复
+      process.stdout.write("no\n");
+      process.exit(0);
+    }
+    process.exit(1);
+  }
+}
+
+main();

package/scripts/stash-prompt.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+
+import { select } from "@inquirer/prompts";
+
+const colors = {
+  reset: "\x1b[0m",
+  cyan: "\x1b[36m",
+  yellow: "\x1b[33m",
+};
+
+async function main() {
+  console.log("");
+  console.log(`${colors.cyan}ℹ 检测到未提交的更改${colors.reset}`);
+  console.log("");
+
+  try {
+    const answer = await select({
+      message: "请选择操作 (Ctrl+C 退出):",
+      choices: [
+        {
+          name: "提交这些更改后继续",
+          value: "commit",
+          description: "先提交当前更改，然后继续发布流程",
+        },
+        {
+          name: "暂存 (stash) 这些更改后继续",
+          value: "stash",
+          description: "将更改保存到 stash，发布完成后可以恢复",
+        },
+        {
+          name: "取消发布",
+          value: "cancel",
+          description: "退出发布流程",
+        },
+      ],
+    });
+
+    // 输出结果到 stdout
+    process.stdout.write(answer + "\n");
+    process.exit(0);
+  } catch (error) {
+    if (error.name === "ExitPromptError") {
+      // Ctrl+C 被按下，静默退出
+      process.exit(130); // 130 是 Ctrl+C 的标准退出码
+    }
+    process.exit(1);
+  }
+}
+
+main();