@taole/deploy-helper 1.2.6 → 1.2.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.mjs +1 -1
- package/lib/project.mjs +11 -1
- package/package.json +1 -1
package/index.mjs
CHANGED
|
@@ -154,7 +154,7 @@ function doRegisterCommands() {
|
|
|
154
154
|
registerCommand("create", cmdProjectCreate, "创建项目");
|
|
155
155
|
registerCommand("publish", cmdProjectPublish, "更新项目到H5平台");
|
|
156
156
|
registerCommand("pull", cmdProjectPull, "拉取已有项目到本地");
|
|
157
|
-
registerCommand("mr", cmdProjectMr, "创建合并请求到 master
|
|
157
|
+
registerCommand("mr", cmdProjectMr, "创建合并请求到 master(可选 [title] [--verbose])");
|
|
158
158
|
registerCommand("commit", cmdCommit, "按任务号提交(参数为说明,如 feat: xxx)");
|
|
159
159
|
registerCommand("whoami", cmdWhoami, "查看当前登录用户信息");
|
|
160
160
|
registerCommand("logout", cmdLogout, "退出登录");
|
package/lib/project.mjs
CHANGED
|
@@ -450,8 +450,16 @@ const MR_FORBIDDEN_BRANCHES = new Set(["master", "test"]);
|
|
|
450
450
|
/**
|
|
451
451
|
* 创建合并请求:当前分支 → master
|
|
452
452
|
* 前置:工作区干净、非 master/test、无未推送 commit
|
|
453
|
+
* 用法: dh mr [title] [--verbose]
|
|
453
454
|
*/
|
|
454
455
|
export const cmdProjectMr = async () => {
|
|
456
|
+
const rawArgs = process.argv.slice(3);
|
|
457
|
+
const verbose = rawArgs.some((arg) => arg === "--verbose" || arg === "-V");
|
|
458
|
+
const titleArg = rawArgs
|
|
459
|
+
.filter((arg) => arg !== "--verbose" && arg !== "-V")
|
|
460
|
+
.join(" ")
|
|
461
|
+
.trim();
|
|
462
|
+
|
|
455
463
|
const git = simpleGit(process.cwd());
|
|
456
464
|
const gitStatus = await git.status();
|
|
457
465
|
|
|
@@ -491,7 +499,6 @@ export const cmdProjectMr = async () => {
|
|
|
491
499
|
}
|
|
492
500
|
await checkPackageNameWithGitRemote(git, packageJson.name);
|
|
493
501
|
|
|
494
|
-
const titleArg = process.argv.slice(3).join(" ").trim();
|
|
495
502
|
log(`开始创建 MR: ${sourceBranch} → master(项目 ${packageJson.name})`);
|
|
496
503
|
const result = await apiCreateMergeRequest(packageJson.name, sourceBranch, userCache, {
|
|
497
504
|
title: titleArg || undefined,
|
|
@@ -501,5 +508,8 @@ export const cmdProjectMr = async () => {
|
|
|
501
508
|
if (mrUrl) {
|
|
502
509
|
log(`MR 地址: ${mrUrl}`);
|
|
503
510
|
}
|
|
511
|
+
if (verbose) {
|
|
512
|
+
log(`MR 接口返回:\n${JSON.stringify(result, null, 2)}`);
|
|
513
|
+
}
|
|
504
514
|
process.exit(0);
|
|
505
515
|
};
|