bumpp 9.2.1 → 9.3.0

package/README.md

@@ -9,14 +9,15 @@ Forked from [`version-bump-prompt`](https://github.com/JS-DevTools/version-bump-
 - Renamed to `bumpp` - so you can use `npx bumpp` directly.
 - Ships ESM and CJS bundles.
 - Add a new argument `--execute` to execute the command before committing.
-- Use current version's `preid` when avaliable.
+- Use the current version's `preid` when available.
 - Confirmation before bumping.
 - Enable `--commit` `--tag` `--push` by default. (opt-out by `--no-push`, etc.)
 - `-r` or `--recursive` to bump all packages in the monorepo.
 - Conventional Commits by default.
-- Supports config file `bumpp.config.ts`:
+- Supports config file `bump.config.ts`:
 
 ```ts
+// bump.config.ts
 import { defineConfig } from 'bumpp'
 
 export default defineConfig({

package/dist/{chunk-D4MB64LD.mjs → chunk-ZY4OVS4D.mjs}

@@ -1,3 +1,4 @@
+import {createRequire as __createRequire} from 'module';var require=__createRequire(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -622,7 +623,6 @@ var logSymbols = isUnicodeSupported() ? main : fallback;
 var log_symbols_default = logSymbols;
 
 // src/release-type.ts
-import { ReleaseType } from "semver";
 var prereleaseTypes = ["premajor", "preminor", "prepatch", "prerelease"];
 var releaseTypes = prereleaseTypes.concat(["major", "minor", "patch"]);
 function isPrerelease(value) {
@@ -957,7 +957,7 @@ async function gitCommit(operation) {
     return operation;
   const { all, noVerify, message } = operation.options.commit;
   const { updatedFiles, newVersion } = operation.state;
-  let args = [];
+  let args = ["--allow-empty"];
   if (all) {
     args.push("--all");
   }
@@ -1297,7 +1297,6 @@ export {
   __toESM,
   require_picocolors,
   log_symbols_default,
-  ReleaseType,
   isReleaseType,
   ProgressEvent,
   NpmScript,

package/dist/cli/index.js

@@ -628,7 +628,7 @@ var logSymbols = isUnicodeSupported() ? main : fallback;
 var log_symbols_default = logSymbols;
 
 // package.json
-var version = "9.2.1";
+var version = "9.3.0";
 
 // src/version-bump.ts
 var import_node_process5 = __toESM(require("process"));
@@ -640,10 +640,9 @@ var import_prompts2 = __toESM(require("prompts"));
 var import_node_process3 = __toESM(require("process"));
 var import_picocolors = __toESM(require_picocolors());
 var import_prompts = __toESM(require("prompts"));
-var import_semver2 = __toESM(require("semver"));
+var import_semver = __toESM(require("semver"));
 
 // src/release-type.ts
-var import_semver = require("semver");
 var prereleaseTypes = ["premajor", "preminor", "prepatch", "prerelease"];
 var releaseTypes = prereleaseTypes.concat(["major", "minor", "patch"]);
 function isPrerelease(value) {
@@ -662,7 +661,7 @@ async function getNewVersion(operation) {
       return promptForNewVersion(operation);
     case "version":
       return operation.update({
-        newVersion: new import_semver2.SemVer(release.version, true).version
+        newVersion: new import_semver.SemVer(release.version, true).version
       });
     default:
       return operation.update({
@@ -672,7 +671,7 @@ async function getNewVersion(operation) {
   }
 }
 function getNextVersion(oldVersion, bump) {
-  const oldSemVer = new import_semver2.SemVer(oldVersion);
+  const oldSemVer = new import_semver.SemVer(oldVersion);
   const newSemVer = oldSemVer.inc(bump.type, bump.preid);
   if (isPrerelease(bump.type) && newSemVer.prerelease.length === 2 && newSemVer.prerelease[0] === bump.preid && String(newSemVer.prerelease[1]) === "0") {
     newSemVer.prerelease[1] = "1";
@@ -683,12 +682,12 @@ function getNextVersion(oldVersion, bump) {
 function getNextVersions(oldVersion, preid) {
   var _a;
   const next = {};
-  const parse = import_semver2.default.parse(oldVersion);
+  const parse = import_semver.default.parse(oldVersion);
   if (typeof (parse == null ? void 0 : parse.prerelease[0]) === "string")
     preid = (parse == null ? void 0 : parse.prerelease[0]) || "preid";
   for (const type of releaseTypes)
-    next[type] = import_semver2.default.inc(oldVersion, type, preid);
-  next.next = ((_a = parse == null ? void 0 : parse.prerelease) == null ? void 0 : _a.length) ? import_semver2.default.inc(oldVersion, "prerelease", preid) : import_semver2.default.inc(oldVersion, "patch");
+    next[type] = import_semver.default.inc(oldVersion, type, preid);
+  next.next = ((_a = parse == null ? void 0 : parse.prerelease) == null ? void 0 : _a.length) ? import_semver.default.inc(oldVersion, "prerelease", preid) : import_semver.default.inc(oldVersion, "patch");
   return next;
 }
 async function promptForNewVersion(operation) {
@@ -696,7 +695,7 @@ async function promptForNewVersion(operation) {
   const { oldVersion } = operation.state;
   const release = operation.options.release;
   const next = getNextVersions(oldVersion, release.preid);
-  const configCustomVersion = await ((_b = (_a = operation.options).customVersion) == null ? void 0 : _b.call(_a, oldVersion, import_semver2.default));
+  const configCustomVersion = await ((_b = (_a = operation.options).customVersion) == null ? void 0 : _b.call(_a, oldVersion, import_semver.default));
   const PADDING = 13;
   const answers = await (0, import_prompts.default)([
     {
@@ -725,11 +724,11 @@ async function promptForNewVersion(operation) {
       message: "Enter the new version number:",
       initial: oldVersion,
       validate: (custom) => {
-        return (0, import_semver2.valid)(custom) ? true : "That's not a valid version number";
+        return (0, import_semver.valid)(custom) ? true : "That's not a valid version number";
       }
     }
   ]);
-  const newVersion = answers.release === "none" ? oldVersion : answers.release === "custom" ? (0, import_semver2.clean)(answers.custom) : answers.release === "config" ? (0, import_semver2.clean)(configCustomVersion) : next[answers.release];
+  const newVersion = answers.release === "none" ? oldVersion : answers.release === "custom" ? (0, import_semver.clean)(answers.custom) : answers.release === "config" ? (0, import_semver.clean)(configCustomVersion) : next[answers.release];
   if (!newVersion)
     import_node_process3.default.exit(1);
   switch (answers.release) {
@@ -744,7 +743,7 @@ async function promptForNewVersion(operation) {
 }
 
 // src/get-old-version.ts
-var import_semver3 = require("semver");
+var import_semver2 = require("semver");
 
 // src/fs.ts
 var import_node_fs = __toESM(require("fs"));
@@ -936,7 +935,7 @@ async function readVersion(file, cwd) {
   try {
     const { data: manifest } = await readJsonFile(file, cwd);
     if (isManifest(manifest)) {
-      if ((0, import_semver3.valid)(manifest.version))
+      if ((0, import_semver2.valid)(manifest.version))
         return manifest.version;
     }
   } catch (error) {
@@ -951,7 +950,7 @@ async function gitCommit(operation) {
     return operation;
   const { all, noVerify, message } = operation.options.commit;
   const { updatedFiles, newVersion } = operation.state;
-  let args = [];
+  let args = ["--allow-empty"];
   if (all) {
     args.push("--all");
   }
@@ -1254,9 +1253,12 @@ function printSummary(operation) {
 
 // src/cli/parse-args.ts
 var import_node_process7 = __toESM(require("process"));
-var import_semver4 = require("semver");
+var import_promises = __toESM(require("fs/promises"));
+var import_node_fs2 = __toESM(require("fs"));
+var import_semver3 = require("semver");
 var import_cac = __toESM(require("cac"));
 var import_picocolors3 = __toESM(require_picocolors());
+var import_js_yaml = __toESM(require("js-yaml"));
 
 // src/config.ts
 var import_node_process6 = __toESM(require("process"));
@@ -1287,7 +1289,7 @@ async function parseArgs() {
   var _a;
   try {
     const cli = (0, import_cac.default)("bumpp");
-    cli.version(version).usage("[...files]").option("--preid <preid>", "ID for prerelease").option("--all", `Include all files (default: ${bumpConfigDefaults.all})`).option("-c, --commit [msg]", `Commit message (default: ${bumpConfigDefaults.commit})`).option("--no-commit", "Skip commit").option("-t, --tag [tag]", `Tag name (default: ${bumpConfigDefaults.tag})`).option("--no-tag", "Skip tag").option("-p, --push", `Push to remote (default: ${bumpConfigDefaults.push})`).option("-y, --yes", `Skip confirmation (default: ${!bumpConfigDefaults.confirm})`).option("-r, --recursive", `Bump package.json files recursively (default: ${bumpConfigDefaults.recursive})`).option("--no-verify", "Skip git verification").option("--ignore-scripts", `Ignore scripts (default: ${bumpConfigDefaults.ignoreScripts})`).option("-q, --quiet", "Quiet mode").option("-v, --version <version>", "Tagert version").option("-x, --execute <command>", "Commands to execute after version bumps").help();
+    cli.version(version).usage("[...files]").option("--preid <preid>", "ID for prerelease").option("--all", `Include all files (default: ${bumpConfigDefaults.all})`).option("-c, --commit [msg]", `Commit message (default: ${bumpConfigDefaults.commit})`).option("--no-commit", "Skip commit").option("-t, --tag [tag]", `Tag name (default: ${bumpConfigDefaults.tag})`).option("--no-tag", "Skip tag").option("-p, --push", `Push to remote (default: ${bumpConfigDefaults.push})`).option("-y, --yes", `Skip confirmation (default: ${!bumpConfigDefaults.confirm})`).option("-r, --recursive", `Bump package.json files recursively (default: ${bumpConfigDefaults.recursive})`).option("--no-verify", "Skip git verification").option("--ignore-scripts", `Ignore scripts (default: ${bumpConfigDefaults.ignoreScripts})`).option("-q, --quiet", "Quiet mode").option("-v, --version <version>", "Target version").option("-x, --execute <command>", "Commands to execute after version bumps").help();
     const result = cli.parse();
     const args = result.options;
     const parsedArgs = {
@@ -1310,16 +1312,27 @@ async function parseArgs() {
     };
     if (parsedArgs.options.files && parsedArgs.options.files.length > 0) {
       const firstArg = parsedArgs.options.files[0];
-      if (firstArg === "prompt" || isReleaseType(firstArg) || (0, import_semver4.valid)(firstArg)) {
+      if (firstArg === "prompt" || isReleaseType(firstArg) || (0, import_semver3.valid)(firstArg)) {
         parsedArgs.options.release = firstArg;
         parsedArgs.options.files.shift();
       }
     }
     if (parsedArgs.options.recursive) {
-      if ((_a = parsedArgs.options.files) == null ? void 0 : _a.length)
+      if ((_a = parsedArgs.options.files) == null ? void 0 : _a.length) {
         console.log(import_picocolors3.default.yellow("The --recursive option is ignored when files are specified"));
-      else
+      } else {
         parsedArgs.options.files = ["package.json", "package-lock.json", "packages/**/package.json"];
+        if (import_node_fs2.default.existsSync("pnpm-workspace.yaml")) {
+          const pnpmWorkspace = await import_promises.default.readFile("pnpm-workspace.yaml", "utf8");
+          const workspaces = import_js_yaml.default.load(pnpmWorkspace);
+          const workspacesWithPackageJson = workspaces.packages.map((workspace) => `${workspace}/package.json`);
+          const withoutExcludedWorkspaces = workspacesWithPackageJson.filter((workspace) => {
+            var _a2;
+            return !workspace.startsWith("!") && !((_a2 = parsedArgs.options.files) == null ? void 0 : _a2.includes(workspace));
+          });
+          parsedArgs.options.files = parsedArgs.options.files.concat(withoutExcludedWorkspaces);
+        }
+      }
     }
     return parsedArgs;
   } catch (error) {

package/dist/cli/index.mjs

@@ -1,3 +1,4 @@
+import {createRequire as __createRequire} from 'module';var require=__createRequire(import.meta.url);
 import {
   __toESM,
   bumpConfigDefaults,
@@ -6,24 +7,27 @@ import {
   log_symbols_default,
   require_picocolors,
   versionBump
-} from "../chunk-D4MB64LD.mjs";
+} from "../chunk-ZY4OVS4D.mjs";
 
 // src/cli/index.ts
 import process2 from "process";
 
 // package.json
-var version = "9.2.1";
+var version = "9.3.0";
 
 // src/cli/parse-args.ts
 var import_picocolors = __toESM(require_picocolors());
 import process from "process";
+import fs from "fs/promises";
+import fsSync from "fs";
 import { valid as isValidVersion } from "semver";
 import cac from "cac";
+import yaml from "js-yaml";
 async function parseArgs() {
   var _a;
   try {
     const cli = cac("bumpp");
-    cli.version(version).usage("[...files]").option("--preid <preid>", "ID for prerelease").option("--all", `Include all files (default: ${bumpConfigDefaults.all})`).option("-c, --commit [msg]", `Commit message (default: ${bumpConfigDefaults.commit})`).option("--no-commit", "Skip commit").option("-t, --tag [tag]", `Tag name (default: ${bumpConfigDefaults.tag})`).option("--no-tag", "Skip tag").option("-p, --push", `Push to remote (default: ${bumpConfigDefaults.push})`).option("-y, --yes", `Skip confirmation (default: ${!bumpConfigDefaults.confirm})`).option("-r, --recursive", `Bump package.json files recursively (default: ${bumpConfigDefaults.recursive})`).option("--no-verify", "Skip git verification").option("--ignore-scripts", `Ignore scripts (default: ${bumpConfigDefaults.ignoreScripts})`).option("-q, --quiet", "Quiet mode").option("-v, --version <version>", "Tagert version").option("-x, --execute <command>", "Commands to execute after version bumps").help();
+    cli.version(version).usage("[...files]").option("--preid <preid>", "ID for prerelease").option("--all", `Include all files (default: ${bumpConfigDefaults.all})`).option("-c, --commit [msg]", `Commit message (default: ${bumpConfigDefaults.commit})`).option("--no-commit", "Skip commit").option("-t, --tag [tag]", `Tag name (default: ${bumpConfigDefaults.tag})`).option("--no-tag", "Skip tag").option("-p, --push", `Push to remote (default: ${bumpConfigDefaults.push})`).option("-y, --yes", `Skip confirmation (default: ${!bumpConfigDefaults.confirm})`).option("-r, --recursive", `Bump package.json files recursively (default: ${bumpConfigDefaults.recursive})`).option("--no-verify", "Skip git verification").option("--ignore-scripts", `Ignore scripts (default: ${bumpConfigDefaults.ignoreScripts})`).option("-q, --quiet", "Quiet mode").option("-v, --version <version>", "Target version").option("-x, --execute <command>", "Commands to execute after version bumps").help();
     const result = cli.parse();
     const args = result.options;
     const parsedArgs = {
@@ -52,10 +56,21 @@ async function parseArgs() {
       }
     }
     if (parsedArgs.options.recursive) {
-      if ((_a = parsedArgs.options.files) == null ? void 0 : _a.length)
+      if ((_a = parsedArgs.options.files) == null ? void 0 : _a.length) {
         console.log(import_picocolors.default.yellow("The --recursive option is ignored when files are specified"));
-      else
+      } else {
         parsedArgs.options.files = ["package.json", "package-lock.json", "packages/**/package.json"];
+        if (fsSync.existsSync("pnpm-workspace.yaml")) {
+          const pnpmWorkspace = await fs.readFile("pnpm-workspace.yaml", "utf8");
+          const workspaces = yaml.load(pnpmWorkspace);
+          const workspacesWithPackageJson = workspaces.packages.map((workspace) => `${workspace}/package.json`);
+          const withoutExcludedWorkspaces = workspacesWithPackageJson.filter((workspace) => {
+            var _a2;
+            return !workspace.startsWith("!") && !((_a2 = parsedArgs.options.files) == null ? void 0 : _a2.includes(workspace));
+          });
+          parsedArgs.options.files = parsedArgs.options.files.concat(withoutExcludedWorkspaces);
+        }
+      }
     }
     return parsedArgs;
   } catch (error) {

package/dist/index.js

@@ -112,7 +112,6 @@ var src_exports = {};
 __export(src_exports, {
   NpmScript: () => NpmScript,
   ProgressEvent: () => ProgressEvent,
-  ReleaseType: () => import_semver.ReleaseType,
   bumpConfigDefaults: () => bumpConfigDefaults,
   default: () => src_default,
   defineConfig: () => defineConfig,
@@ -646,10 +645,9 @@ var import_prompts2 = __toESM(require("prompts"));
 var import_node_process3 = __toESM(require("process"));
 var import_picocolors = __toESM(require_picocolors());
 var import_prompts = __toESM(require("prompts"));
-var import_semver2 = __toESM(require("semver"));
+var import_semver = __toESM(require("semver"));
 
 // src/release-type.ts
-var import_semver = require("semver");
 var prereleaseTypes = ["premajor", "preminor", "prepatch", "prerelease"];
 var releaseTypes = prereleaseTypes.concat(["major", "minor", "patch"]);
 function isPrerelease(value) {
@@ -668,7 +666,7 @@ async function getNewVersion(operation) {
       return promptForNewVersion(operation);
     case "version":
       return operation.update({
-        newVersion: new import_semver2.SemVer(release.version, true).version
+        newVersion: new import_semver.SemVer(release.version, true).version
       });
     default:
       return operation.update({
@@ -678,7 +676,7 @@ async function getNewVersion(operation) {
   }
 }
 function getNextVersion(oldVersion, bump) {
-  const oldSemVer = new import_semver2.SemVer(oldVersion);
+  const oldSemVer = new import_semver.SemVer(oldVersion);
   const newSemVer = oldSemVer.inc(bump.type, bump.preid);
   if (isPrerelease(bump.type) && newSemVer.prerelease.length === 2 && newSemVer.prerelease[0] === bump.preid && String(newSemVer.prerelease[1]) === "0") {
     newSemVer.prerelease[1] = "1";
@@ -689,12 +687,12 @@ function getNextVersion(oldVersion, bump) {
 function getNextVersions(oldVersion, preid) {
   var _a;
   const next = {};
-  const parse = import_semver2.default.parse(oldVersion);
+  const parse = import_semver.default.parse(oldVersion);
   if (typeof (parse == null ? void 0 : parse.prerelease[0]) === "string")
     preid = (parse == null ? void 0 : parse.prerelease[0]) || "preid";
   for (const type of releaseTypes)
-    next[type] = import_semver2.default.inc(oldVersion, type, preid);
-  next.next = ((_a = parse == null ? void 0 : parse.prerelease) == null ? void 0 : _a.length) ? import_semver2.default.inc(oldVersion, "prerelease", preid) : import_semver2.default.inc(oldVersion, "patch");
+    next[type] = import_semver.default.inc(oldVersion, type, preid);
+  next.next = ((_a = parse == null ? void 0 : parse.prerelease) == null ? void 0 : _a.length) ? import_semver.default.inc(oldVersion, "prerelease", preid) : import_semver.default.inc(oldVersion, "patch");
   return next;
 }
 async function promptForNewVersion(operation) {
@@ -702,7 +700,7 @@ async function promptForNewVersion(operation) {
   const { oldVersion } = operation.state;
   const release = operation.options.release;
   const next = getNextVersions(oldVersion, release.preid);
-  const configCustomVersion = await ((_b = (_a = operation.options).customVersion) == null ? void 0 : _b.call(_a, oldVersion, import_semver2.default));
+  const configCustomVersion = await ((_b = (_a = operation.options).customVersion) == null ? void 0 : _b.call(_a, oldVersion, import_semver.default));
   const PADDING = 13;
   const answers = await (0, import_prompts.default)([
     {
@@ -731,11 +729,11 @@ async function promptForNewVersion(operation) {
       message: "Enter the new version number:",
       initial: oldVersion,
       validate: (custom) => {
-        return (0, import_semver2.valid)(custom) ? true : "That's not a valid version number";
+        return (0, import_semver.valid)(custom) ? true : "That's not a valid version number";
       }
     }
   ]);
-  const newVersion = answers.release === "none" ? oldVersion : answers.release === "custom" ? (0, import_semver2.clean)(answers.custom) : answers.release === "config" ? (0, import_semver2.clean)(configCustomVersion) : next[answers.release];
+  const newVersion = answers.release === "none" ? oldVersion : answers.release === "custom" ? (0, import_semver.clean)(answers.custom) : answers.release === "config" ? (0, import_semver.clean)(configCustomVersion) : next[answers.release];
   if (!newVersion)
     import_node_process3.default.exit(1);
   switch (answers.release) {
@@ -750,7 +748,7 @@ async function promptForNewVersion(operation) {
 }
 
 // src/get-old-version.ts
-var import_semver3 = require("semver");
+var import_semver2 = require("semver");
 
 // src/fs.ts
 var import_node_fs = __toESM(require("fs"));
@@ -942,7 +940,7 @@ async function readVersion(file, cwd) {
   try {
     const { data: manifest } = await readJsonFile(file, cwd);
     if (isManifest(manifest)) {
-      if ((0, import_semver3.valid)(manifest.version))
+      if ((0, import_semver2.valid)(manifest.version))
         return manifest.version;
     }
   } catch (error) {
@@ -976,7 +974,7 @@ async function gitCommit(operation) {
     return operation;
   const { all, noVerify, message } = operation.options.commit;
   const { updatedFiles, newVersion } = operation.state;
-  let args = [];
+  let args = ["--allow-empty"];
   if (all) {
     args.push("--all");
   }
@@ -1318,7 +1316,6 @@ var src_default = versionBump;
 0 && (module.exports = {
   NpmScript,
   ProgressEvent,
-  ReleaseType,
   bumpConfigDefaults,
   defineConfig,
   loadBumpConfig,

package/dist/index.mjs

@@ -1,20 +1,19 @@
+import {createRequire as __createRequire} from 'module';var require=__createRequire(import.meta.url);
 import {
   NpmScript,
   ProgressEvent,
-  ReleaseType,
   bumpConfigDefaults,
   defineConfig,
   loadBumpConfig,
   versionBump,
   versionBumpInfo
-} from "./chunk-D4MB64LD.mjs";
+} from "./chunk-ZY4OVS4D.mjs";
 
 // src/index.ts
 var src_default = versionBump;
 export {
   NpmScript,
   ProgressEvent,
-  ReleaseType,
   bumpConfigDefaults,
   src_default as default,
   defineConfig,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bumpp",
-  "version": "9.2.1",
-  "packageManager": "pnpm@8.12.0",
+  "version": "9.3.0",
+  "packageManager": "pnpm@8.14.1",
   "description": "Bump version, commit changes, tag, and push to Git",
   "author": {
     "name": "James Messinger",
@@ -58,20 +58,22 @@
   },
   "dependencies": {
     "@jsdevtools/ez-spawn": "^3.0.4",
-    "c12": "^1.5.1",
+    "c12": "^1.6.1",
     "cac": "^6.7.14",
     "fast-glob": "^3.3.2",
+    "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "semver": "^7.5.4"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.4.3",
-    "@types/node": "^20.10.4",
+    "@antfu/eslint-config": "^2.6.2",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^20.11.5",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.6",
     "detect-indent": "^7.0.1",
     "detect-newline": "^4.0.1",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "esno": "^4.0.0",
     "log-symbols": "^6.0.0",
     "npm-check": "^6.0.1",