@taole/deploy-helper 1.2.4 → 1.2.6

package/index.mjs

@@ -10,7 +10,7 @@ import { setDebug, log } from './lib/util.mjs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { cmdWhoami, cmdLogout, cmdLogin } from './lib/login.mjs';
-import { cmdProjectCreate, cmdProjectPublish, cmdProjectPull } from './lib/project.mjs';
+import { cmdProjectCreate, cmdProjectPublish, cmdProjectPull, cmdProjectMr } from './lib/project.mjs';
 import { cmdCommit } from './lib/git.mjs';
 import { lightDeploy } from './lib/lightDeploy.mjs';
 
@@ -154,6 +154,7 @@ function doRegisterCommands() {
     registerCommand("create", cmdProjectCreate, "创建项目");
     registerCommand("publish", cmdProjectPublish, "更新项目到H5平台");
     registerCommand("pull", cmdProjectPull, "拉取已有项目到本地");
+    registerCommand("mr", cmdProjectMr, "创建合并请求到 master（可选参数为 MR 标题）");
     registerCommand("commit", cmdCommit, "按任务号提交（参数为说明，如 feat: xxx）");
     registerCommand("whoami", cmdWhoami, "查看当前登录用户信息");
     registerCommand("logout", cmdLogout, "退出登录");
@@ -199,6 +200,7 @@ async function main() {
         log(`deploy-helper v${version}`);
         notifier.notify({
             defer: false,
+            isGlobal: true,
             message: `发现新版本 {latestVersion}（当前 {currentVersion}），建议更新:\n{updateCommand}`,
         });
     }

package/lib/project.mjs

@@ -56,6 +56,31 @@ async function apiDeployProject(name, version, env, userCache) {
   }
 }
 
+async function apiCreateMergeRequest(name, sourceBranch, userCache, opts = {}) {
+  const urlPath = `/h5projects/${name}/merge-request`;
+  const body = { sourceBranch };
+  if (opts.title) {
+    body.title = opts.title;
+  }
+  if (opts.description != null) {
+    body.description = opts.description;
+  }
+  const res = await fetch(`${apiHost}${urlPath}`, {
+    method: "POST",
+    body: JSON.stringify(body),
+    headers: {
+      "Content-Type": "application/json",
+      Cookie: `Tuwan_Passport=${userCache.Tuwan_Passport}`,
+    },
+  });
+  const resJson = await res.json();
+  if (!res.ok) {
+    const error = (resJson && resJson.message) || "创建合并请求失败";
+    throw new Error(error);
+  }
+  return resJson;
+}
+
 async function apiGetTemplateProjects(userCache) {
   try {
     const res = await fetch(`${apiHost}/h5projects/template`, {
@@ -418,4 +443,63 @@ export const cmdProjectPull = async () => {
   }
   log(`请cd至项目目录: ${projectDir} 进行后续开发`);
   process.exit(0);
-}
+};
+
+const MR_FORBIDDEN_BRANCHES = new Set(["master", "test"]);
+
+/**
+ * 创建合并请求：当前分支 → master
+ * 前置：工作区干净、非 master/test、无未推送 commit
+ */
+export const cmdProjectMr = async () => {
+  const git = simpleGit(process.cwd());
+  const gitStatus = await git.status();
+
+  if (gitStatus.detached || !gitStatus.current) {
+    log("当前处于 detached HEAD，请先切换到功能分支");
+    process.exit(1);
+  }
+  if (!gitStatus.isClean()) {
+    log("工作区还有未提交的代码，请先提交代码");
+    process.exit(1);
+  }
+
+  const sourceBranch = gitStatus.current;
+  if (MR_FORBIDDEN_BRANCHES.has(sourceBranch)) {
+    log(`当前分支为 ${sourceBranch}，不允许从 master/test 创建 MR，请切换到功能分支`);
+    process.exit(1);
+  }
+  if (!gitStatus.tracking) {
+    log(`当前分支 ${sourceBranch} 未设置远程跟踪分支，请先 push（如: git push -u origin ${sourceBranch}）`);
+    process.exit(1);
+  }
+  if ((gitStatus.ahead || 0) > 0) {
+    log(`当前分支有 ${gitStatus.ahead} 个本地 commit 尚未 push，请先 push 后再创建 MR`);
+    process.exit(1);
+  }
+
+  const userCache = await getLoginCache();
+  if (!userCache || !userCache.userInfo || !userCache.userInfo.uid) {
+    log("请先登录");
+    process.exit(1);
+  }
+
+  const packageJson = getJsonConfig(process.cwd(), "package.json");
+  if (!packageJson || !packageJson.name) {
+    log("package.json 或其 name 字段不存在");
+    process.exit(1);
+  }
+  await checkPackageNameWithGitRemote(git, packageJson.name);
+
+  const titleArg = process.argv.slice(3).join(" ").trim();
+  log(`开始创建 MR: ${sourceBranch} → master（项目 ${packageJson.name}）`);
+  const result = await apiCreateMergeRequest(packageJson.name, sourceBranch, userCache, {
+    title: titleArg || undefined,
+  });
+  const mrUrl = result.detailUrl || result.webUrl || "";
+  log(`创建 MR 成功${result.localId != null ? ` !${result.localId}` : ""}`);
+  if (mrUrl) {
+    log(`MR 地址: ${mrUrl}`);
+  }
+  process.exit(0);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",