@zjex/git-workflow 0.2.15 → 0.2.17

package/dist/index.js

@@ -2007,15 +2007,7 @@ async function performUpdate(packageName) {
     spinner: "dots"
   }).start();
   try {
-    try {
-      execSync6(`npm uninstall -g ${packageName}`, {
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-      spinner.text = "\u6B63\u5728\u5B89\u88C5\u65B0\u7248\u672C...";
-    } catch {
-    }
-    execSync6(`npm install -g ${packageName}`, {
+    execSync6(`npm install -g ${packageName}@latest`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -2026,11 +2018,7 @@ async function performUpdate(packageName) {
         [
           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")
+          colors.dim("\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C")
         ].join("\n"),
         {
           padding: 1,
@@ -2046,7 +2034,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}`));
+    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
     console.log("");
   }
 }
@@ -2095,7 +2083,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.2.15" : "0.0.0-dev";
+var version = true ? "0.2.17" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`
@@ -2107,7 +2095,7 @@ async function mainMenu() {
  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D
 `)
   );
-  console.log(colors.dim(`  git-workflow v${version}
+  console.log(colors.dim(`  git-workflow v${colors.yellow(version)}
 `));
   const action = await select8({
     message: "\u9009\u62E9\u64CD\u4F5C:",
@@ -2275,5 +2263,10 @@ cli.help((sections) => {
     body: showHelp()
   });
 });
-cli.version(version);
+cli.option("-v, --version", "\u663E\u793A\u7248\u672C\u53F7");
+var args = process.argv.slice(2);
+if (args.includes("-v") || args.includes("--version")) {
+  console.log(colors.yellow(`v${version}`));
+  process.exit(0);
+}
 cli.parse();

package/package.json

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

package/scripts/publish.js

@@ -29,12 +29,15 @@ function exec(command, silent = false) {
   }
 }
 
-function runStep(stepNum, stepName, command) {
+async function runStep(stepNum, stepName, command) {
   const spinner = ora({
     text: `${colors.blue(`[${stepNum}/${TOTAL_STEPS}]`)} ${stepName}...`,
     spinner: "dots",
   }).start();
 
+  // 给 spinner 一点时间渲染
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync(command, { encoding: "utf-8", stdio: "pipe" });
     spinner.succeed(
@@ -56,7 +59,7 @@ async function main() {
   console.log("");
 
   // [1] 检查 Git 仓库
-  if (!runStep(1, "检查 Git 仓库", "git rev-parse --git-dir")) {
+  if (!(await runStep(1, "检查 Git 仓库", "git rev-parse --git-dir"))) {
     console.log(colors.red("✖ 当前目录不是 git 仓库"));
     process.exit(1);
   }
@@ -67,6 +70,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   const status = exec("git status --porcelain", true);
   if (status && status.trim()) {
     spinner2.fail(`${colors.blue("[2/11]")} 检查工作区状态`);
@@ -86,6 +91,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   const npmUser = exec("npm whoami", true);
   if (!npmUser) {
     spinner3.fail(`${colors.blue("[3/11]")} 检查 npm 登录状态`);
@@ -102,7 +109,7 @@ async function main() {
   const currentBranch = exec("git branch --show-current", true).trim();
 
   // [4] 拉取最新代码
-  if (!runStep(4, "拉取最新代码", `git pull origin ${currentBranch}`)) {
+  if (!(await runStep(4, "拉取最新代码", `git pull origin ${currentBranch}`))) {
     process.exit(1);
   }
 
@@ -167,12 +174,12 @@ async function main() {
   );
 
   // [6] 构建项目
-  if (!runStep(6, "构建项目", "npm run build")) {
+  if (!(await runStep(6, "构建项目", "npm run build"))) {
     process.exit(1);
   }
 
   // [7] 生成 CHANGELOG
-  if (!runStep(7, "生成 CHANGELOG", "npm run changelog")) {
+  if (!(await runStep(7, "生成 CHANGELOG", "npm run changelog"))) {
     process.exit(1);
   }
 
@@ -182,6 +189,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync("git add package.json CHANGELOG.md", { stdio: "pipe" });
     execSync(`git commit -m "🔖 chore(release): 发布 v${newVersion}"`, {
@@ -206,6 +215,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync(`git tag -a "v${newVersion}" -m "Release v${newVersion}"`, {
       stdio: "pipe",
@@ -227,6 +238,8 @@ async function main() {
     spinner: "dots",
   }).start();
 
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
   try {
     execSync(`git push origin ${currentBranch}`, { stdio: "pipe" });
     execSync(`git push origin v${newVersion}`, { stdio: "pipe" });
@@ -259,17 +272,8 @@ async function main() {
     execSync("npm publish", { stdio: "inherit" });
 
     // 清除 npm publish 的所有输出
-    // npm publish 输出包括：
-    // - prepublishOnly hook (build 输出，约30行)
-    // - prepare hook (husky 输出，约5行)
-    // - npm notice 信息 (约15行)
-    // - OTP 认证提示和输入 (约3行)
-    // - 发布成功信息 (约2行)
-    // 加上我们自己的：
-    // - "[11/11] 发布到 npm..." (1行)
-    // - 空行 (1行)
-    // 总共约 57 行，为了保险使用 60 行
-    const linesToClear = 60;
+    // 根据实际测试，需要删除约 95 行
+    const linesToClear = 95;
 
     for (let i = 0; i < linesToClear; i++) {
       process.stdout.write("\x1b[1A");

package/src/index.ts

@@ -66,7 +66,7 @@ async function mainMenu(): Promise<void> {
  ╚══════╝ ╚════╝ ╚══════╝╚═╝  ╚═╝
 `)
   );
-  console.log(colors.dim(`  git-workflow v${version}\n`));
+  console.log(colors.dim(`  git-workflow v${colors.yellow(version)}\n`));
 
   const action = await select({
     message: "选择操作:",
@@ -287,6 +287,15 @@ cli.help((sections) => {
     body: showHelp(),
   });
 });
-cli.version(version);
+
+// 不使用 cac 的 version，手动处理 --version
+cli.option("-v, --version", "显示版本号");
+
+// 在 parse 之前检查 --version
+const args = process.argv.slice(2);
+if (args.includes("-v") || args.includes("--version")) {
+  console.log(colors.yellow(`v${version}`));
+  process.exit(0);
+}
 
 cli.parse();

package/src/update-notifier.ts

@@ -145,19 +145,8 @@ async function performUpdate(packageName: string): Promise<void> {
   }).start();
 
   try {
-    // 先卸载当前版本，确保干净安装
-    try {
-      execSync(`npm uninstall -g ${packageName}`, {
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"],
-      });
-      spinner.text = "正在安装新版本...";
-    } catch {
-      // 当前版本不存在，忽略错误
-    }
-
-    // 执行安装命令
-    execSync(`npm install -g ${packageName}`, {
+    // 直接安装最新版本（npm 会自动覆盖旧版本）
+    execSync(`npm install -g ${packageName}@latest`, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
     });
@@ -169,11 +158,7 @@ async function performUpdate(packageName: string): Promise<void> {
         [
           colors.bold("✨ 更新完成！"),
           "",
-          colors.dim("请运行以下命令刷新并使用新版本:"),
-          "",
-          colors.yellow("  hash -r && gw --version"),
-          "",
-          colors.dim("或者重新打开终端"),
+          colors.dim("请重新打开终端使用新版本"),
         ].join("\n"),
         {
           padding: 1,
@@ -191,7 +176,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}`));
+    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
     console.log("");
   }
 }