@zjex/git-workflow 0.2.3 → 0.2.5

package/dist/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --no-warnings=ExperimentalWarning
 
 // src/index.ts
 import { cac } from "cac";
@@ -1368,6 +1368,9 @@ async function checkForUpdates(currentVersion, packageName = "@zjex/git-workflow
       }
     }
   } catch (error) {
+    if (error?.constructor?.name === "ExitPromptError") {
+      throw error;
+    }
   }
 }
 async function getLatestVersion(packageName) {
@@ -1423,7 +1426,7 @@ async function showUpdateMessage(current, latest, packageName) {
     return action;
   } catch (error) {
     console.log("");
-    return "continue";
+    throw error;
   }
 }
 async function performUpdate(packageName) {
@@ -1490,10 +1493,9 @@ process.on("uncaughtException", (err) => {
   console.error(err);
   process.exit(1);
 });
-var version = true ? "0.2.3" : (await null).default.version;
+var version = true ? "0.2.5" : "0.0.0-dev";
 async function mainMenu() {
-  checkForUpdates(version, "@zjex/git-workflow").catch(() => {
-  });
+  await checkForUpdates(version, "@zjex/git-workflow");
   console.log(
     colors.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

package/package.json

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

package/src/index.ts

@@ -12,6 +12,7 @@ import { stash } from "./commands/stash.js";
 import { commit } from "./commands/commit.js";
 import { showHelp } from "./commands/help.js";
 import { checkForUpdates } from "./update-notifier.js";
+import { checkForUpdates } from "./update-notifier.js";
 
 // 捕获 Ctrl+C 退出，静默处理
 process.on("uncaughtException", (err) => {
@@ -26,15 +27,14 @@ declare const __VERSION__: string | undefined;
 
 // 开发环境下从 package.json 读取版本号
 const version: string =
-  typeof __VERSION__ !== "undefined"
+  typeof __VERSION__ !== "undefined" && __VERSION__ !== ""
     ? __VERSION__
-    : (await import("../package.json", { with: { type: "json" } })).default
-        .version;
+    : "0.0.0-dev";
 
 // 交互式主菜单
 async function mainMenu(): Promise<void> {
-  // 检查更新（异步，不阻塞主流程）
-  checkForUpdates(version, "@zjex/git-workflow").catch(() => {});
+  // 先检查更新，等待完成后再显示主菜单
+  await checkForUpdates(version, "@zjex/git-workflow");
 
   // ASCII Art Logo
   console.log(

package/src/update-notifier.ts

@@ -53,7 +53,11 @@ export async function checkForUpdates(
       // action === "continue" 时直接继续，不记录
     }
   } catch (error) {
-    // 静默失败，不影响主程序
+    // 如果是用户按 Ctrl+C，重新抛出让全局处理
+    if (error?.constructor?.name === "ExitPromptError") {
+      throw error;
+    }
+    // 其他错误静默失败，不影响主程序
   }
 }
 
@@ -123,9 +127,9 @@ async function showUpdateMessage(
 
     return action as "update" | "continue" | "dismiss";
   } catch (error) {
-    // 用户按了 Ctrl+C，视为继续
+    // 用户按了 Ctrl+C，重新抛出错误让全局处理
     console.log("");
-    return "continue";
+    throw error;
   }
 }
 

package/test-ctrl-c.mjs

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+import { select } from "@inquirer/prompts";
+import { ExitPromptError } from "@inquirer/core";
+
+// 捕获 Ctrl+C 退出，静默处理
+process.on("uncaughtException", (err) => {
+  if (err instanceof ExitPromptError) {
+    console.log("\n✓ Ctrl+C 被正确捕获，程序退出");
+    process.exit(0);
+  }
+  console.error("其他错误:", err);
+  process.exit(1);
+});
+
+async function test() {
+  try {
+    const choice = await select({
+      message: "测试 Ctrl+C (按 Ctrl+C 退出):",
+      choices: [
+        { name: "选项 1", value: "1" },
+        { name: "选项 2", value: "2" },
+      ],
+    });
+    console.log(`你选择了: ${choice}`);
+  } catch (error) {
+    console.log("\n在 catch 中捕获到错误，重新抛出...");
+    throw error;
+  }
+}
+
+test();

package/test-full-flow.mjs

@@ -0,0 +1,108 @@
+#!/usr/bin/env node
+
+import boxen from "boxen";
+import { select } from "@inquirer/prompts";
+import { ExitPromptError } from "@inquirer/core";
+
+// 捕获 Ctrl+C 退出，静默处理
+process.on("uncaughtException", (err) => {
+  if (err instanceof ExitPromptError) {
+    process.exit(0);
+  }
+  console.error(err);
+  process.exit(1);
+});
+
+const colors = {
+  green: (s) => `\x1b[32m${s}\x1b[0m`,
+  dim: (s) => `\x1b[2m${s}\x1b[0m`,
+  bold: (s) => `\x1b[1m${s}\x1b[0m`,
+};
+
+async function checkForUpdates() {
+  const current = "0.2.3";
+  const latest = "0.2.4";
+  const packageName = "@zjex/git-workflow";
+
+  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",
+    })
+  );
+
+  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 小时内不会再提示此版本",
+        },
+      ],
+    });
+
+    if (action === "update") {
+      console.log("\n模拟更新中...\n");
+      process.exit(0);
+    } else if (action === "dismiss") {
+      console.log(colors.dim("\n已跳过此版本，24 小时内不再提示\n"));
+    }
+  } catch (error) {
+    // 用户按了 Ctrl+C，重新抛出让全局处理
+    console.log("");
+    throw error;
+  }
+}
+
+async function mainMenu() {
+  // 先检查更新，等待完成
+  await checkForUpdates();
+
+  // 然后显示主菜单
+  console.log(
+    colors.green(`
+ ███████╗     ██╗███████╗██╗  ██╗
+ ╚══███╔╝     ██║██╔════╝╚██╗██╔╝
+   ███╔╝      ██║█████╗   ╚███╔╝ 
+  ███╔╝  ██   ██║██╔══╝   ██╔██╗ 
+ ███████╗╚█████╔╝███████╗██╔╝ ██╗
+ ╚══════╝ ╚════╝ ╚══════╝╚═╝  ╚═╝
+`)
+  );
+  console.log(colors.dim(`  git-workflow v0.2.4\n`));
+
+  const choice = await select({
+    message: "选择操作:",
+    choices: [
+      { name: "[1] ✨ 创建 feature 分支      gw f", value: "1" },
+      { name: "[2] 🐛 创建 hotfix 分支       gw h", value: "2" },
+      { name: "[3] 🗑️  删除分支               gw d", value: "3" },
+    ],
+  });
+
+  console.log(`\n你选择了: ${choice}\n`);
+}
+
+mainMenu();

package/tsup.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
     "cac",
   ],
   banner: {
-    js: "#!/usr/bin/env node",
+    js: "#!/usr/bin/env -S node --no-warnings=ExperimentalWarning",
   },
   define: {
     __VERSION__: JSON.stringify(pkg.version),