@zjex/git-workflow 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"description": "个人常用的 Git 工作流工具，快速创建规范的开发分支和管理 Tag",
 	"type": "module",
 	"bin": {

package/src/update-notifier.ts

@@ -80,9 +80,9 @@ async function showUpdateMessage(
   packageName: string
 ): Promise<"update" | "continue" | "dismiss"> {
   const message = [
-    `${colors.bold}🎉 发现新版本可用！${colors.reset}`,
+    colors.bold("� 发现新版新本可用！"),
     "",
-    `${colors.dim}${current}${colors.reset}  →  ${colors.green}${colors.bold}${latest}${colors.reset}`,
+    `${colors.dim(current)}  →  ${colors.green(colors.bold(latest))}`,
   ].join("\n");
 
   console.log("");
@@ -138,26 +138,39 @@ async function performUpdate(packageName: string): Promise<void> {
   }).start();
 
   try {
+    // 先尝试卸载旧版本（无 scope 的版本）
+    try {
+      execSync("npm uninstall -g git-workflow", {
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"],
+      });
+      spinner.text = "已卸载旧版本，正在安装新版本...";
+    } catch {
+      // 旧版本不存在，忽略错误
+    }
+
     // 执行更新命令
     execSync(`npm install -g ${packageName}`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
     });
 
-    spinner.succeed(colors.green + "更新成功！" + colors.reset);
+    spinner.succeed(colors.green("更新成功！"));
     console.log("");
-    console.log(
-      colors.cyan + "  提示: 请重新运行命令以使用新版本" + colors.reset
-    );
+    console.log(colors.cyan("  提示: 请重新运行命令以使用新版本"));
     console.log("");
 
     // 更新成功后退出，让用户重新运行
     process.exit(0);
   } catch (error) {
-    spinner.fail(colors.red + "更新失败" + colors.reset);
+    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.dim + "  你可以手动运行以下命令更新:" + colors.reset);
-    console.log(colors.cyan + `  npm install -g ${packageName}` + colors.reset);
+    console.log(colors.yellow("  # 然后安装新版本:"));
+    console.log(colors.cyan(`  npm install -g ${packageName}`));
     console.log("");
   }
 }

package/src/utils.ts

@@ -4,14 +4,20 @@ export interface Colors {
   red: (s: string) => string;
   green: (s: string) => string;
   yellow: (s: string) => string;
+  cyan: (s: string) => string;
   dim: (s: string) => string;
+  bold: (s: string) => string;
+  reset: string;
 }
 
 export const colors: Colors = {
   red: (s) => `\x1b[31m${s}\x1b[0m`,
   green: (s) => `\x1b[32m${s}\x1b[0m`,
   yellow: (s) => `\x1b[33m${s}\x1b[0m`,
+  cyan: (s) => `\x1b[36m${s}\x1b[0m`,
   dim: (s) => `\x1b[2m${s}\x1b[0m`,
+  bold: (s) => `\x1b[1m${s}\x1b[0m`,
+  reset: "\x1b[0m",
 };
 
 export const TODAY: string = new Date()

package/test-update-flow.mjs

@@ -0,0 +1,98 @@
+#!/usr/bin/env node
+
+import boxen from "boxen";
+import { select } from "@inquirer/prompts";
+import ora from "ora";
+
+const colors = {
+  red: (s) => `\x1b[31m${s}\x1b[0m`,
+  green: (s) => `\x1b[32m${s}\x1b[0m`,
+  yellow: (s) => `\x1b[33m${s}\x1b[0m`,
+  cyan: (s) => `\x1b[36m${s}\x1b[0m`,
+  dim: (s) => `\x1b[2m${s}\x1b[0m`,
+  bold: (s) => `\x1b[1m${s}\x1b[0m`,
+  reset: "\x1b[0m",
+};
+
+async function testUpdateFlow() {
+  const current = "0.1.0";
+  const latest = "0.2.0";
+  const packageName = "@zjex/git-workflow";
+
+  // 1. 显示更新提示框
+  const message = [
+    colors.bold("🎉 发现新版本可用！"),
+    "",
+    `${colors.dim(current)}  →  ${colors.green(colors.bold(latest))}`,
+  ].join("\n");
+
+  console.log("");
+  console.log(
+    boxen(message, {
+      padding: 1,
+      margin: 1,
+      borderStyle: "round",
+      borderColor: "yellow",
+      align: "left",
+    })
+  );
+
+  // 2. 交互式选择
+  try {
+    const action = await select({
+      message: "你想做什么？",
+      choices: [
+        {
+          name: "🚀 立即更新",
+          value: "update",
+          description: `运行 npm install -g ${packageName}`,
+        },
+        {
+          name: "⏭️  稍后更新，继续使用",
+          value: "continue",
+          description: "下次启动时会再次提示",
+        },
+        {
+          name: "🙈 跳过此版本 (24h 内不再提示)",
+          value: "dismiss",
+          description: "24 小时内不会再提示此版本",
+        },
+      ],
+    });
+
+    console.log("");
+
+    // 3. 根据选择执行操作
+    if (action === "update") {
+      // 模拟更新过程
+      const spinner = ora({
+        text: "正在更新...",
+        spinner: "dots",
+      }).start();
+
+      // 模拟卸载旧版本
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      spinner.text = "已卸载旧版本，正在安装新版本...";
+
+      // 模拟安装新版本
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+
+      spinner.succeed(colors.green("更新成功！"));
+      console.log("");
+      console.log(colors.cyan("  提示: 请重新运行命令以使用新版本"));
+      console.log("");
+    } else if (action === "continue") {
+      console.log(colors.cyan("继续使用当前版本..."));
+      console.log("");
+    } else if (action === "dismiss") {
+      console.log(colors.dim("已跳过此版本，24 小时内不再提示"));
+      console.log("");
+    }
+  } catch (error) {
+    console.log("");
+    console.log(colors.dim("已取消"));
+    console.log("");
+  }
+}
+
+testUpdateFlow();

package/tsup.config.ts

@@ -7,10 +7,20 @@ export default defineConfig({
   entry: ["src/index.ts"],
   format: ["esm"],
   clean: true,
-  shims: true,
-  minify: true,
+  shims: false,
+  minify: false,
+  splitting: false,
+  treeshake: false,
+  external: [
+    // 不打包这些依赖，让 node 自己解析
+    "boxen",
+    "ora",
+    "@inquirer/prompts",
+    "@inquirer/core",
+    "cac",
+  ],
   banner: {
-    js: "#!/usr/bin/env node --no-warnings",
+    js: "#!/usr/bin/env node",
   },
   define: {
     __VERSION__: JSON.stringify(pkg.version),