@zjex/git-workflow 0.2.21 → 0.2.22

package/dist/index.js

@@ -145,6 +145,14 @@ function backgroundCheck(currentVersion, packageName) {
     }
   });
 }
+function isUsingVolta() {
+  try {
+    const whichGw = execSync6("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
 async function getLatestVersion(packageName) {
   try {
     const result = execSync6(`npm view ${packageName} version`, {
@@ -192,6 +200,8 @@ async function showUpdateMessage(current, latest, packageName) {
       width: 40
     })
   );
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
   try {
     const action = await select7({
       message: "\u4F60\u60F3\u505A\u4EC0\u4E48\uFF1F",
@@ -199,7 +209,7 @@ async function showUpdateMessage(current, latest, packageName) {
         {
           name: "\u{1F680} \u7ACB\u5373\u66F4\u65B0",
           value: "update",
-          description: `\u8FD0\u884C npm install -g ${packageName}`
+          description: `\u8FD0\u884C ${updateCommand}`
         },
         {
           name: "\u23ED\uFE0F  \u7A0D\u540E\u66F4\u65B0\uFF0C\u7EE7\u7EED\u4F7F\u7528",
@@ -221,12 +231,14 @@ async function showUpdateMessage(current, latest, packageName) {
 }
 async function performUpdate(packageName) {
   console.log("");
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
   const spinner = ora5({
     text: "\u6B63\u5728\u66F4\u65B0...",
     spinner: "dots"
   }).start();
   try {
-    execSync6(`npm install -g ${packageName}@latest`, {
+    execSync6(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -238,15 +250,18 @@ async function performUpdate(packageName) {
         [
           colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
           "",
-          colors.dim("\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C")
+          colors.dim("\u8BF7\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4\u9A8C\u8BC1:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("\u6216\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF")
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40
+          align: "left",
+          width: 50
         }
       )
     );
@@ -255,7 +270,7 @@ async function performUpdate(packageName) {
     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.cyan(`  npm install -g ${packageName}@latest`));
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
   }
 }
@@ -2293,8 +2308,17 @@ async function getLatestVersion2(packageName) {
     return null;
   }
 }
+function isUsingVolta2() {
+  try {
+    const whichGw = execSync7("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
 async function update(currentVersion) {
   const packageName = "@zjex/git-workflow";
+  const usingVolta = isUsingVolta2();
   console.log("");
   console.log(colors.bold("\u{1F50D} \u68C0\u67E5\u66F4\u65B0..."));
   console.log("");
@@ -2327,12 +2351,6 @@ async function update(currentVersion) {
       return;
     }
     const versionText = `${currentVersion}  \u2192  ${latestVersion}`;
-    const maxWidth = Math.max(
-      "\u{1F389} \u53D1\u73B0\u65B0\u7248\u672C\uFF01".length,
-      versionText.length,
-      "\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01".length,
-      "\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C".length
-    );
     console.log(
       boxen2(
         [
@@ -2353,7 +2371,8 @@ async function update(currentVersion) {
       )
     );
     const updateSpinner = ora6("\u6B63\u5728\u66F4\u65B0...").start();
-    execSync7(`npm install -g ${packageName}@latest`, {
+    const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
+    execSync7(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -2365,15 +2384,20 @@ async function update(currentVersion) {
         [
           colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
           "",
-          colors.dim("\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C")
+          `\u65B0\u7248\u672C: ${colors.green(colors.bold(latestVersion))}`,
+          "",
+          colors.dim("\u8BF7\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4\u9A8C\u8BC1:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("\u6216\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF")
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40
+          align: "left",
+          width: 50
         }
       )
     );
@@ -2382,7 +2406,8 @@ async function update(currentVersion) {
     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.cyan(`  npm install -g ${packageName}@latest`));
+    const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
     process.exit(1);
   }
@@ -2413,7 +2438,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.2.21" : "0.0.0-dev";
+var version = true ? "0.2.22" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.2.21",
+	"version": "0.2.22",
 	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {

package/src/commands/update.ts

@@ -39,11 +39,24 @@ async function getLatestVersion(packageName: string): Promise<string | null> {
   }
 }
 
+/**
+ * 检测是否使用 Volta
+ */
+function isUsingVolta(): boolean {
+  try {
+    const whichGw = execSync("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
+
 /**
  * 手动更新命令
  */
 export async function update(currentVersion: string): Promise<void> {
   const packageName = "@zjex/git-workflow";
+  const usingVolta = isUsingVolta();
 
   console.log("");
   console.log(colors.bold("🔍 检查更新..."));
@@ -85,12 +98,6 @@ export async function update(currentVersion: string): Promise<void> {
 
     // 有新版本
     const versionText = `${currentVersion}  →  ${latestVersion}`;
-    const maxWidth = Math.max(
-      "🎉 发现新版本！".length,
-      versionText.length,
-      "✨ 更新完成！".length,
-      "请重新打开终端使用新版本".length
-    );
 
     console.log(
       boxen(
@@ -115,7 +122,12 @@ export async function update(currentVersion: string): Promise<void> {
     // 开始更新
     const updateSpinner = ora("正在更新...").start();
 
-    execSync(`npm install -g ${packageName}@latest`, {
+    // 根据包管理器选择更新命令
+    const updateCommand = usingVolta
+      ? `volta install ${packageName}@latest`
+      : `npm install -g ${packageName}@latest`;
+
+    execSync(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
     });
@@ -131,15 +143,20 @@ export async function update(currentVersion: string): Promise<void> {
         [
           colors.green(colors.bold("✨ 更新完成！")),
           "",
-          colors.dim("请重新打开终端使用新版本"),
+          `新版本: ${colors.green(colors.bold(latestVersion))}`,
+          "",
+          colors.dim("请执行以下命令验证:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("或重新打开终端"),
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40,
+          align: "left",
+          width: 50,
         }
       )
     );
@@ -150,7 +167,10 @@ export async function update(currentVersion: string): Promise<void> {
     spinner.fail(colors.red("更新失败"));
     console.log("");
     console.log(colors.dim("  你可以手动运行以下命令更新:"));
-    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
+    const updateCommand = usingVolta
+      ? `volta install ${packageName}@latest`
+      : `npm install -g ${packageName}@latest`;
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
     process.exit(1);
   }

package/src/update-notifier.ts

@@ -107,6 +107,18 @@ function backgroundCheck(currentVersion: string, packageName: string): void {
   });
 }
 
+/**
+ * 检测是否使用 Volta
+ */
+function isUsingVolta(): boolean {
+  try {
+    const whichGw = execSync("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
+
 /**
  * 获取 npm 上的最新版本
  */
@@ -172,6 +184,11 @@ async function showUpdateMessage(
     })
   );
 
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta
+    ? `volta install ${packageName}@latest`
+    : `npm install -g ${packageName}@latest`;
+
   try {
     const action = await select({
       message: "你想做什么？",
@@ -179,7 +196,7 @@ async function showUpdateMessage(
         {
           name: "🚀 立即更新",
           value: "update",
-          description: `运行 npm install -g ${packageName}`,
+          description: `运行 ${updateCommand}`,
         },
         {
           name: "⏭️  稍后更新，继续使用",
@@ -208,14 +225,19 @@ async function showUpdateMessage(
 async function performUpdate(packageName: string): Promise<void> {
   console.log("");
 
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta
+    ? `volta install ${packageName}@latest`
+    : `npm install -g ${packageName}@latest`;
+
   const spinner = ora({
     text: "正在更新...",
     spinner: "dots",
   }).start();
 
   try {
-    // 直接安装最新版本（npm 会自动覆盖旧版本）
-    execSync(`npm install -g ${packageName}@latest`, {
+    // 根据包管理器选择更新命令
+    execSync(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
     });
@@ -231,15 +253,18 @@ async function performUpdate(packageName: string): Promise<void> {
         [
           colors.green(colors.bold("✨ 更新完成！")),
           "",
-          colors.dim("请重新打开终端使用新版本"),
+          colors.dim("请执行以下命令验证:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("或重新打开终端"),
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40,
+          align: "left",
+          width: 50,
         }
       )
     );
@@ -250,7 +275,7 @@ async function performUpdate(packageName: string): Promise<void> {
     spinner.fail(colors.red("更新失败"));
     console.log("");
     console.log(colors.dim("  你可以手动运行以下命令更新:"));
-    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
   }
 }