@wjwjq/release-helper 0.2.1 → 0.2.2

package/dist/publish.js

@@ -8,13 +8,13 @@ import { setTimeout } from 'node:timers/promises';
 import { Gitlab } from '@gitbeaker/rest';
 import { releaseConf, __releaseDir } from './prepare.js';
 import { logger } from './logger.js';
-import { $ } from 'execa';
+import { execa, $ } from 'execa';
 import 'yaml';
 import 'picocolors';
 
 async function isGitFlowRepo() {
   try {
-    let { stdout } = await $("git config", ["--get-regexp", `^gitflow.`]);
+    let { stdout } = await execa("git config", ["--get-regexp", `^gitflow.`]);
     return stdout.toString().length > 0;
   } catch (error) {
     console.error("\u{1F680} ~ doGitFlowRelease ~ error:", error);

package/dist/release.js

@@ -4,7 +4,7 @@ import pc from 'picocolors';
 import { pack } from './pack.js';
 import { getGitTags, selectLatestTag, publish, isGitFlowRepo } from './publish.js';
 import { checkEnvInfo, releaseConf } from './prepare.js';
-import { $ } from 'execa';
+import { $, execa } from 'execa';
 import { logger } from './logger.js';
 import 'node:fs';
 import 'node:path';
@@ -96,7 +96,7 @@ async function doGitFlowRelease(version) {
   let { stdout: currentBranch } = await $(`git branch --show-current`);
   const releaseBranch = `release/${version}`;
   if (currentBranch !== "develop" && currentBranch !== releaseBranch) {
-    const { stdout } = await $("git branch -a");
+    const { stdout } = await $`git branch -a`;
     const branches = stdout.split("\n").map((branch) => branch.trim().replace(/^\* /, ""));
     const preReleaseBranch = branches.includes(releaseBranch) ? releaseBranch : "develop";
     await execGitCheckout(preReleaseBranch);
@@ -120,7 +120,7 @@ async function doGitFlowRelease(version) {
     }
   }
   try {
-    const npmVersionRes = await $(`npm version ${version} --no-git-tag-version`);
+    const npmVersionRes = await $`npm version ${version} --no-git-tag-version`;
     if (npmVersionRes.stderr) {
       logger.error("\u6DFB\u52A0\u7248\u672C\u4FE1\u606F\u5230package.json\u5931\u8D25");
       process.exit(1);
@@ -134,16 +134,16 @@ async function doGitFlowRelease(version) {
   }
   const hasUncommitted = await hasUncommittedChanges(true);
   if (hasUncommitted) {
-    await $(`git add -A`);
-    await $("git commit", ["-m", `Release version: ${version}`, "--no-verify"]);
+    await $`git add -A`;
+    await execa("git commit", ["-m", `Release version: ${version}`, "--no-verify"]);
   }
   await execWithPipe(`git flow release finish`, [version, "-m", `Release version: ${version}`]);
-  await $(`git push --all`);
-  await $(`git push --tags`);
+  await $`git push --all`;
+  await $`git push --tags`;
   return "master";
 }
 async function doCustomSpecifyBranchRelease() {
-  const { stdout } = await $("git branch -r");
+  const { stdout } = await $`git branch -r`;
   const branches = stdout.split("\n").map((branch) => branch.trim()).filter((item) => !item.startsWith("origin/HEAD")).map((branch) => ({ value: branch.replace("origin/", "") }));
   const selectedBranch = await inquirer.select({
     message: "\u8BF7\u9009\u62E9\u76EE\u6807\u5206\u652F, \u5206\u652F\u672A\u627E\u5230\uFF0C\u8BF7\u5148\u5C06\u672C\u5730\u5206\u652F\u63A8\u5230\u8FDC\u7AEF\uFF0C\u518D\u6267\u884C\u6B64\u547D\u4EE4",
@@ -164,7 +164,7 @@ async function hasUncommittedChanges(boolReturned = false) {
 }
 async function execGitPullOrigin(remoteTargetBranch) {
   logger.tip(`${remoteTargetBranch} syncing...`);
-  const syncReleaseBranchRes = $("git", ["pull", "origin", remoteTargetBranch]);
+  const syncReleaseBranchRes = execa("git", ["pull", "origin", remoteTargetBranch]);
   syncReleaseBranchRes.stdout.pipe(process.stdout);
   syncReleaseBranchRes.stderr.pipe(process.stderr);
   const res = await syncReleaseBranchRes;
@@ -174,7 +174,7 @@ async function execGitPullOrigin(remoteTargetBranch) {
   }
 }
 async function execWithPipe(...args) {
-  const execRes = $(...args);
+  const execRes = execa(...args);
   execRes.stdout.pipe(process.stdout);
   execRes.stderr.pipe(process.stderr);
   const result = await execRes;
@@ -182,13 +182,13 @@ async function execWithPipe(...args) {
 }
 async function execGitCheckout(remoteTargetBranch) {
   await hasUncommittedChanges();
-  const { stdout: prevCurrentBranch } = await $(`git branch --show-current`);
+  const { stdout: prevCurrentBranch } = await $`git branch --show-current`;
   if (prevCurrentBranch !== remoteTargetBranch) {
-    const execRes = $(`git checkout ${remoteTargetBranch}`);
+    const execRes = execa(`git checkout ${remoteTargetBranch}`);
     execRes.stdout.pipe(process.stdout);
     execRes.stderr.pipe(process.stderr);
     const result = await execRes;
-    const { stdout: currentBranch } = await $(`git branch --show-current`);
+    const { stdout: currentBranch } = await $`git branch --show-current`;
     if (currentBranch !== remoteTargetBranch) {
       logger.error(`\u76EE\u6807\u53D1\u5E03\u5206\u652F[${remoteTargetBranch}] checkout \u5931\u8D25`);
       return Promise.reject(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wjwjq/release-helper",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",