@vitarx/release-cli 1.0.4 → 1.0.6

package/dist/release.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env ts-node
 import chalk from 'chalk';
+import { execSync } from 'node:child_process';
+import * as console from 'node:console';
 import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
@@ -98,8 +100,9 @@ function parseArgs() {
  * @param packageManager - 检测到的包管理器类型
  * @param isDryRun - 是否为试运行模式，默认为 false
  * @param args - 命令行参数对象
+ * @param lastCommitHash - 最后一次提交哈希值
  */
-async function publishPackage(pkgDir, packageManager, isDryRun = false, args) {
+async function publishPackage(pkgDir, packageManager, isDryRun = false, args, lastCommitHash) {
     // 获取 package.json 的完整路径
     const pkgPath = path.join(pkgDir, 'package.json');
     // 读取并解析 package.json 文件
@@ -131,6 +134,7 @@ async function publishPackage(pkgDir, packageManager, isDryRun = false, args) {
         const confirm = await prompt(`是否确认发布 ${pkg.name}@${newVersion}? (y/N) `);
         if (confirm && confirm.toLowerCase() !== 'y') {
             log.warn('已取消发布');
+            rollbackChanges(undefined, isDryRun, lastCommitHash);
             process.exit(0);
         }
         // -------------------- Step 4: 构建和测试项目 --------------------
@@ -171,6 +175,7 @@ async function publishPackage(pkgDir, packageManager, isDryRun = false, args) {
                 const confirm = await prompt(chalk.yellow('⚠️ 生成 changelog 失败，要继续发布流程吗? (y/N) '));
                 if (confirm.toLowerCase() !== 'y') {
                     log.warn('已取消发布');
+                    rollbackChanges(undefined, isDryRun, lastCommitHash);
                     process.exit(0);
                 }
             }
@@ -198,16 +203,15 @@ async function publishPackage(pkgDir, packageManager, isDryRun = false, args) {
             runCommand(`git push${tagName ? ' && git push --tags' : ''}`, isDryRun);
         }
         catch {
-            log.warn('包已发布到pnm，但推送代码和标签到远程仓库意外失败，请仔细核查npm仓库和远程仓库状态。');
+            log.warn('包已发布到pnm，但推送代码和标签到远程仓库意外失败，请仔细核查npm仓库和Git远程仓库状态。');
         }
         // 打印发布成功信息
         log.success(`发布完成 ${pkg.name}@${newVersion}` + (isDryRun ? ' (dry-run)' : ''));
     }
     catch (err) {
-        // 错误处理
-        log.error(err.message);
+        console.error(err);
         // 回滚更改
-        rollbackChanges(tagName, isDryRun);
+        rollbackChanges(tagName, isDryRun, lastCommitHash);
         process.exit(1);
     }
 }
@@ -279,6 +283,21 @@ export async function main() {
     log.info('当前运行模式', isDryRun ? 'dry-run' : 'publish');
     const isSubmit = checkGitStatus();
     log.info('当前工作目录状态', isSubmit ? '已提交' : '未提交');
+    // 记录当前最新的提交哈希，用于回滚
+    let lastCommitHash = '';
+    // 如果不是试运行模式，记录当前最新的提交哈希
+    if (!isDryRun) {
+        try {
+            // 获取最新提交的哈希值
+            lastCommitHash = execSync('git rev-parse HEAD').toString().trim();
+            log.info('当前最新一条提交', lastCommitHash);
+        }
+        catch (err) {
+            console.error(err);
+            log.warn('无法获取当前GIT提交信息');
+            process.exit(1);
+        }
+    }
     // 如果有未提交的更改，则报错退出
     if (!isDryRun && !isSubmit) {
         log.error('请先提交或暂存当前更改再发布。');
@@ -329,11 +348,11 @@ export async function main() {
             }
             selectedPackage = packages[index - 1];
         }
-        await publishPackage(selectedPackage.path, packageManager, isDryRun, args);
+        await publishPackage(selectedPackage.path, packageManager, isDryRun, args, lastCommitHash);
     }
     else {
         // 单包项目，发布根目录
-        await publishPackage('.', packageManager, isDryRun, args);
+        await publishPackage('.', packageManager, isDryRun, args, lastCommitHash);
     }
 }
 // 执行主函数

package/dist/utils.d.ts

@@ -82,8 +82,9 @@ export declare function runCommand(cmd: string, isDryRun?: boolean): void;
  * 回滚代码变更的函数
  * @param tagName - 可选的标签名称，用于删除创建的标签
  * @param isDryRun - 是否为试运行模式，默认为false
+ * @param lastCommitHash
  */
-export declare function rollbackChanges(tagName?: string, isDryRun?: boolean): void;
+export declare function rollbackChanges(tagName: string | undefined, isDryRun: boolean, lastCommitHash: string): void;
 /**
  * 更新指定包的版本号
  * @param pkgPath - 包的文件路径

package/dist/utils.js

@@ -341,13 +341,14 @@ export function runCommand(cmd, isDryRun = false) {
  * 回滚代码变更的函数
  * @param tagName - 可选的标签名称，用于删除创建的标签
  * @param isDryRun - 是否为试运行模式，默认为false
+ * @param lastCommitHash
  */
-export function rollbackChanges(tagName, isDryRun = false) {
+export function rollbackChanges(tagName, isDryRun, lastCommitHash) {
     // 输出警告信息，提示用户正在回滚
     log.warn('发生错误，正在回滚...');
     try {
         // 执行git命令，回退到上一个提交
-        runCommand('git reset --hard HEAD~1', isDryRun);
+        runCommand(`git reset --hard ${lastCommitHash}`, isDryRun);
     }
     catch {
         // 捕获并忽略执行过程中的错误

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitarx/release-cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A CLI tool for automated npm package release with workspace support",
   "main": "dist/index.js",
   "type": "module",