@varlet/release 0.2.11 → 0.3.1-alpha.1730553381783

package/LICENCE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2022 varlet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2022 varlet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/bin/index.js

@@ -1,9 +1,15 @@
 #!/usr/bin/env node
 import { release, publish, changelog, commitLint } from '../dist/index.js'
 import { Command } from 'commander'
+import { fileURLToPath } from 'url'
+import fse from 'fs-extra'
 
 const program = new Command()
 
+const packageJson = fse.readJSONSync(fileURLToPath(new URL('../package.json', import.meta.url)))
+
+program.version(packageJson.version)
+
 program
   .command('release')
   .option('-r --remote <remote>', 'Remote name')

package/dist/index.cjs

@@ -67,8 +67,8 @@ var logger_default = {
 
 // src/release.ts
 var import_semver = __toESM(require("semver"), 1);
-var import_inquirer = __toESM(require("inquirer"), 1);
-var import_execa = require("execa");
+var import_prompts = require("@inquirer/prompts");
+var import_tinyexec = require("tinyexec");
 var import_nanospinner2 = require("nanospinner");
 var import_glob = require("glob");
 var import_path2 = require("path");
@@ -95,11 +95,10 @@ function changelog({ releaseCount = 0, file = "CHANGELOG.md" } = {}) {
 // src/release.ts
 var cwd = process.cwd();
 var { writeFileSync, readJSONSync } = import_fs_extra2.default;
-var { prompt } = import_inquirer.default;
-var releaseTypes = ["premajor", "preminor", "prepatch", "major", "minor", "patch"];
+var releaseTypes = ["patch", "minor", "major", "prepatch", "preminor", "premajor"];
 var BACK_HINT = "Back to previous step";
 async function isWorktreeEmpty() {
-  const ret = await (0, import_execa.execa)("git", ["status", "--porcelain"]);
+  const ret = await (0, import_tinyexec.x)("git", ["status", "--porcelain"]);
   return !ret.stdout;
 }
 async function isSameVersion(version) {
@@ -109,7 +108,9 @@ async function isSameVersion(version) {
   if (packageJson) {
     const { config } = packageJson;
     try {
-      await (0, import_execa.execa)("npm", ["view", `${config.name}@${version ?? config.version}`, "version"]);
+      await (0, import_tinyexec.x)("npm", ["view", `${config.name}@${version ?? config.version}`, "version"], {
+        throwOnError: true
+      });
       s.warn({
         text: `The npm package has a same remote version ${config.version}.`
       });
@@ -132,7 +133,7 @@ async function publish({ preRelease, checkRemoteVersion, npmTag }) {
   } else if (npmTag) {
     args.push("--tag", npmTag);
   }
-  const ret = await (0, import_execa.execa)("pnpm", args);
+  const ret = await (0, import_tinyexec.x)("pnpm", args);
   if (ret.stderr && ret.stderr.includes("npm ERR!")) {
     throw new Error("\n" + ret.stderr);
   } else {
@@ -142,13 +143,23 @@ async function publish({ preRelease, checkRemoteVersion, npmTag }) {
 }
 async function pushGit(version, remote = "origin", skipGitTag = false) {
   const s = (0, import_nanospinner2.createSpinner)("Pushing to remote git repository").start();
-  await (0, import_execa.execa)("git", ["add", "."]);
-  await (0, import_execa.execa)("git", ["commit", "-m", `v${version}`]);
+  await (0, import_tinyexec.x)("git", ["add", "."], {
+    throwOnError: true
+  });
+  await (0, import_tinyexec.x)("git", ["commit", "-m", `v${version}`], {
+    throwOnError: true
+  });
   if (!skipGitTag) {
-    await (0, import_execa.execa)("git", ["tag", `v${version}`]);
-    await (0, import_execa.execa)("git", ["push", remote, `v${version}`]);
+    await (0, import_tinyexec.x)("git", ["tag", `v${version}`], {
+      throwOnError: true
+    });
+    await (0, import_tinyexec.x)("git", ["push", remote, `v${version}`], {
+      throwOnError: true
+    });
   }
-  const ret = await (0, import_execa.execa)("git", ["push"]);
+  const ret = await (0, import_tinyexec.x)("git", ["push"], {
+    throwOnError: true
+  });
   s.success({ text: "Push remote repository successfully" });
   ret.stdout && logger_default.info(ret.stdout);
 }
@@ -170,53 +181,38 @@ function updateVersion(version) {
   });
 }
 async function confirmRegistry() {
-  const registry = (await (0, import_execa.execa)("npm", ["config", "get", "registry"])).stdout;
-  const name = "Registry confirm";
-  const ret = await prompt([
-    {
-      name,
-      type: "confirm",
-      message: `Current registry is: ${registry}`
-    }
-  ]);
-  return ret[name];
+  const registry = (await (0, import_tinyexec.x)("npm", ["config", "get", "registry"])).stdout;
+  const ret = await (0, import_prompts.confirm)({
+    message: `Current registry is: ${registry}`
+  });
+  return ret;
 }
 async function confirmVersion(currentVersion, expectVersion) {
-  const name = "Version confirm";
-  const ret = await prompt([
-    {
-      name,
-      type: "list",
-      choices: [`All packages version ${currentVersion} -> ${expectVersion}`, BACK_HINT]
-    }
-  ]);
-  return ret[name];
+  const ret = await (0, import_prompts.select)({
+    message: "Version confirm",
+    choices: [`All packages version ${currentVersion} -> ${expectVersion}`, BACK_HINT].map((value) => ({
+      name: value,
+      value
+    }))
+  });
+  return ret;
 }
 async function confirmRefs(remote = "origin") {
-  const { stdout } = await (0, import_execa.execa)("git", ["remote", "-v"]);
+  const { stdout } = await (0, import_tinyexec.x)("git", ["remote", "-v"]);
   const reg = new RegExp(`${remote}	(.*) \\(push`);
   const repo = stdout.match(reg)?.[1];
-  const { stdout: branch } = await (0, import_execa.execa)("git", ["branch", "--show-current"]);
-  const name = "Refs confirm";
-  const ret = await prompt([
-    {
-      name,
-      type: "confirm",
-      message: `Current refs ${repo}:refs/for/${branch}`
-    }
-  ]);
-  return ret[name];
+  const { stdout: branch } = await (0, import_tinyexec.x)("git", ["branch", "--show-current"]);
+  const ret = await (0, import_prompts.confirm)({
+    message: `Current refs ${repo}:refs/for/${branch}`
+  });
+  return ret;
 }
 async function getReleaseType() {
-  const name = "Please select release type";
-  const ret = await prompt([
-    {
-      name,
-      type: "list",
-      choices: releaseTypes
-    }
-  ]);
-  return ret[name];
+  const releaseType = await (0, import_prompts.select)({
+    message: "Please select release type",
+    choices: releaseTypes.map((type) => ({ name: type, value: type }))
+  });
+  return releaseType;
 }
 async function getReleaseVersion(currentVersion) {
   let isPreRelease = false;
@@ -269,11 +265,15 @@ async function release(options) {
     logger_default.success(`Release version ${expectVersion} successfully!`);
     if (isPreRelease) {
       try {
-        await (0, import_execa.execa)("git", ["restore", "**/package.json"]);
+        await (0, import_tinyexec.x)("git", ["restore", "**/package.json"], {
+          throwOnError: true
+        });
       } catch {
       }
       try {
-        await (0, import_execa.execa)("git", ["restore", "package.json"]);
+        await (0, import_tinyexec.x)("git", ["restore", "package.json"], {
+          throwOnError: true
+        });
       } catch {
       }
     }

package/dist/index.js

@@ -23,8 +23,8 @@ var logger_default = {
 
 // src/release.ts
 import semver from "semver";
-import inquirer from "inquirer";
-import { execa } from "execa";
+import { confirm, select } from "@inquirer/prompts";
+import { x as exec } from "tinyexec";
 import { createSpinner as createSpinner2 } from "nanospinner";
 import { glob } from "glob";
 import { resolve } from "path";
@@ -51,11 +51,10 @@ function changelog({ releaseCount = 0, file = "CHANGELOG.md" } = {}) {
 // src/release.ts
 var cwd = process.cwd();
 var { writeFileSync, readJSONSync } = fse2;
-var { prompt } = inquirer;
-var releaseTypes = ["premajor", "preminor", "prepatch", "major", "minor", "patch"];
+var releaseTypes = ["patch", "minor", "major", "prepatch", "preminor", "premajor"];
 var BACK_HINT = "Back to previous step";
 async function isWorktreeEmpty() {
-  const ret = await execa("git", ["status", "--porcelain"]);
+  const ret = await exec("git", ["status", "--porcelain"]);
   return !ret.stdout;
 }
 async function isSameVersion(version) {
@@ -65,7 +64,9 @@ async function isSameVersion(version) {
   if (packageJson) {
     const { config } = packageJson;
     try {
-      await execa("npm", ["view", `${config.name}@${version ?? config.version}`, "version"]);
+      await exec("npm", ["view", `${config.name}@${version ?? config.version}`, "version"], {
+        throwOnError: true
+      });
       s.warn({
         text: `The npm package has a same remote version ${config.version}.`
       });
@@ -88,7 +89,7 @@ async function publish({ preRelease, checkRemoteVersion, npmTag }) {
   } else if (npmTag) {
     args.push("--tag", npmTag);
   }
-  const ret = await execa("pnpm", args);
+  const ret = await exec("pnpm", args);
   if (ret.stderr && ret.stderr.includes("npm ERR!")) {
     throw new Error("\n" + ret.stderr);
   } else {
@@ -98,13 +99,23 @@ async function publish({ preRelease, checkRemoteVersion, npmTag }) {
 }
 async function pushGit(version, remote = "origin", skipGitTag = false) {
   const s = createSpinner2("Pushing to remote git repository").start();
-  await execa("git", ["add", "."]);
-  await execa("git", ["commit", "-m", `v${version}`]);
+  await exec("git", ["add", "."], {
+    throwOnError: true
+  });
+  await exec("git", ["commit", "-m", `v${version}`], {
+    throwOnError: true
+  });
   if (!skipGitTag) {
-    await execa("git", ["tag", `v${version}`]);
-    await execa("git", ["push", remote, `v${version}`]);
+    await exec("git", ["tag", `v${version}`], {
+      throwOnError: true
+    });
+    await exec("git", ["push", remote, `v${version}`], {
+      throwOnError: true
+    });
   }
-  const ret = await execa("git", ["push"]);
+  const ret = await exec("git", ["push"], {
+    throwOnError: true
+  });
   s.success({ text: "Push remote repository successfully" });
   ret.stdout && logger_default.info(ret.stdout);
 }
@@ -126,53 +137,38 @@ function updateVersion(version) {
   });
 }
 async function confirmRegistry() {
-  const registry = (await execa("npm", ["config", "get", "registry"])).stdout;
-  const name = "Registry confirm";
-  const ret = await prompt([
-    {
-      name,
-      type: "confirm",
-      message: `Current registry is: ${registry}`
-    }
-  ]);
-  return ret[name];
+  const registry = (await exec("npm", ["config", "get", "registry"])).stdout;
+  const ret = await confirm({
+    message: `Current registry is: ${registry}`
+  });
+  return ret;
 }
 async function confirmVersion(currentVersion, expectVersion) {
-  const name = "Version confirm";
-  const ret = await prompt([
-    {
-      name,
-      type: "list",
-      choices: [`All packages version ${currentVersion} -> ${expectVersion}`, BACK_HINT]
-    }
-  ]);
-  return ret[name];
+  const ret = await select({
+    message: "Version confirm",
+    choices: [`All packages version ${currentVersion} -> ${expectVersion}`, BACK_HINT].map((value) => ({
+      name: value,
+      value
+    }))
+  });
+  return ret;
 }
 async function confirmRefs(remote = "origin") {
-  const { stdout } = await execa("git", ["remote", "-v"]);
+  const { stdout } = await exec("git", ["remote", "-v"]);
   const reg = new RegExp(`${remote}	(.*) \\(push`);
   const repo = stdout.match(reg)?.[1];
-  const { stdout: branch } = await execa("git", ["branch", "--show-current"]);
-  const name = "Refs confirm";
-  const ret = await prompt([
-    {
-      name,
-      type: "confirm",
-      message: `Current refs ${repo}:refs/for/${branch}`
-    }
-  ]);
-  return ret[name];
+  const { stdout: branch } = await exec("git", ["branch", "--show-current"]);
+  const ret = await confirm({
+    message: `Current refs ${repo}:refs/for/${branch}`
+  });
+  return ret;
 }
 async function getReleaseType() {
-  const name = "Please select release type";
-  const ret = await prompt([
-    {
-      name,
-      type: "list",
-      choices: releaseTypes
-    }
-  ]);
-  return ret[name];
+  const releaseType = await select({
+    message: "Please select release type",
+    choices: releaseTypes.map((type) => ({ name: type, value: type }))
+  });
+  return releaseType;
 }
 async function getReleaseVersion(currentVersion) {
   let isPreRelease = false;
@@ -225,11 +221,15 @@ async function release(options) {
     logger_default.success(`Release version ${expectVersion} successfully!`);
     if (isPreRelease) {
       try {
-        await execa("git", ["restore", "**/package.json"]);
+        await exec("git", ["restore", "**/package.json"], {
+          throwOnError: true
+        });
       } catch {
       }
       try {
-        await execa("git", ["restore", "package.json"]);
+        await exec("git", ["restore", "package.json"], {
+          throwOnError: true
+        });
       } catch {
       }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@varlet/release",
   "type": "module",
-  "version": "0.2.11",
+  "version": "0.3.1-alpha.1730553381783",
   "description": "release all packages and generate changelogs",
   "keywords": [
     "varlet",
@@ -15,7 +15,7 @@
     "url": "git+https://github.com/varletjs/release"
   },
   "bugs": "https://github.com/varletjs/release/issues",
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -36,8 +36,10 @@
     "commit-msg": "pnpm run commit-lint -p $1"
   },
   "lint-staged": {
-    "*.{ts,tsx,js,vue,less}": "prettier --write",
-    "*.{ts,tsx,js,vue}": "eslint --fix"
+    "*.{ts,js}": [
+      "prettier --write",
+      "eslint --fix"
+    ]
   },
   "engines": {
     "node": ">=16.0.0",
@@ -46,7 +48,6 @@
   "devDependencies": {
     "@types/conventional-changelog": "^3.1.5",
     "@types/fs-extra": "^11.0.4",
-    "@types/inquirer": "^9.0.7",
     "@types/node": "^20.9.0",
     "@types/semver": "^7.5.5",
     "@varlet/eslint-config": "^2.18.4",
@@ -54,25 +55,26 @@
     "lint-staged": "^15.2.0",
     "prettier": "^3.1.0",
     "simple-git-hooks": "^2.9.0",
-    "tsup": "^8.0.1",
+    "tsup": "^8.3.0",
     "typescript": "^5.2.2"
   },
   "dependencies": {
+    "@inquirer/prompts": "^6.0.1",
     "commander": "^11.1.0",
     "conventional-changelog": "^5.1.0",
-    "execa": "^8.0.1",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.10",
-    "inquirer": "^9.2.12",
     "nanospinner": "^1.1.0",
     "picocolors": "^1.0.0",
-    "semver": "^7.5.4"
+    "semver": "^7.5.4",
+    "tinyexec": "^0.3.0"
   },
   "scripts": {
     "dev": "tsup --watch",
     "build": "tsup",
     "release": "pnpm build && node bin/index.js release -c",
-    "lint": "eslint --ext .ts,.js",
+    "lint": "eslint . --ext .ts,.js",
+    "format": "prettier --write .",
     "commit-lint": "node bin/index.js commit-lint"
   }
 }