bumpp 9.6.1 → 9.7.1

package/README.md

@@ -12,6 +12,7 @@ Forked from [`version-bump-prompt`](https://github.com/JS-DevTools/version-bump-
 - Use the current version's `preid` when available.
 - Confirmation before bumping.
 - Enable `--commit` `--tag` `--push` by default. (opt-out by `--no-push`, etc.)
+- `--sign` to sign the commit and tag.
 - `-r` or `--recursive` to bump all packages in the monorepo.
 - Conventional Commits by default.
 - Supports config file `bump.config.ts`:

package/dist/{chunk-TBB4VMXP.mjs → chunk-7TCD6MWB.mjs}

@@ -1001,6 +1001,9 @@ async function gitCommit(operation) {
   if (noVerify) {
     args.push("--no-verify");
   }
+  if (operation.options.sign) {
+    args.push("--gpg-sign");
+  }
   const commitMessage = formatVersionString(message, newVersion);
   args.push("--message", commitMessage);
   if (!all)
@@ -1023,6 +1026,9 @@ async function gitTag(operation) {
   ];
   const tagName = formatVersionString(tag.name, newVersion);
   args.push(tagName);
+  if (operation.options.sign) {
+    args.push("--sign");
+  }
   await ezSpawn2.async("git", ["tag", ...args]);
   return operation.update({ event: "git tag" /* GitTag */, tagName });
 }
@@ -1051,6 +1057,7 @@ import yaml from "js-yaml";
 async function normalizeOptions(raw) {
   var _a, _b, _d;
   const preid = typeof raw.preid === "string" ? raw.preid : "beta";
+  const sign = Boolean(raw.sign);
   const push = Boolean(raw.push);
   const all = Boolean(raw.all);
   const noVerify = Boolean(raw.noVerify);
@@ -1127,6 +1134,7 @@ async function normalizeOptions(raw) {
     release,
     commit,
     tag,
+    sign,
     push,
     files,
     cwd,
@@ -1268,7 +1276,13 @@ async function updateManifestFile(relPath, operation) {
   const { newVersion } = operation.state;
   let modified = false;
   const file = await readJsoncFile(relPath, cwd);
-  if (isManifest(file.data) && file.data.version !== newVersion) {
+  if (!isManifest(file.data)) {
+    return modified;
+  }
+  if (file.data.version == null) {
+    return modified;
+  }
+  if (file.data.version !== newVersion) {
     file.modified.push([["version"], newVersion]);
     if (isPackageLockManifest(file.data))
       file.modified.push([["packages", "", "version"], newVersion]);
@@ -1358,11 +1372,13 @@ var bumpConfigDefaults = {
   commit: true,
   push: true,
   tag: true,
+  sign: false,
   recursive: false,
   noVerify: false,
   confirm: true,
   ignoreScripts: false,
   all: false,
+  noGitCheck: true,
   files: []
 };
 async function loadBumpConfig(overrides, cwd = process7.cwd()) {

package/dist/cli/index.d.mts

@@ -2,5 +2,6 @@
  * The main entry point of the CLI
  */
 declare function main(): Promise<void>;
+declare function checkGitStatus(): void;
 
-export { main };
+export { checkGitStatus, main };

package/dist/cli/index.d.ts

@@ -2,5 +2,6 @@
  * The main entry point of the CLI
  */
 declare function main(): Promise<void>;
+declare function checkGitStatus(): void;
 
-export { main };
+export { checkGitStatus, main };

package/dist/cli/index.js

@@ -134,6 +134,7 @@ var require_picocolors = __commonJS({
 // src/cli/index.ts
 var cli_exports = {};
 __export(cli_exports, {
+  checkGitStatus: () => checkGitStatus,
   main: () => main2
 });
 module.exports = __toCommonJS(cli_exports);
@@ -651,8 +652,11 @@ var fallback = {
 var logSymbols = isUnicodeSupported() ? main : fallback;
 var log_symbols_default = logSymbols;
 
+// src/cli/index.ts
+var ezSpawn5 = __toESM(require("@jsdevtools/ez-spawn"));
+
 // package.json
-var version = "9.6.1";
+var version = "9.7.1";
 
 // src/version-bump.ts
 var import_node_process5 = __toESM(require("process"));
@@ -993,6 +997,9 @@ async function gitCommit(operation) {
   if (noVerify) {
     args.push("--no-verify");
   }
+  if (operation.options.sign) {
+    args.push("--gpg-sign");
+  }
   const commitMessage = formatVersionString(message, newVersion);
   args.push("--message", commitMessage);
   if (!all)
@@ -1015,6 +1022,9 @@ async function gitTag(operation) {
   ];
   const tagName = formatVersionString(tag.name, newVersion);
   args.push(tagName);
+  if (operation.options.sign) {
+    args.push("--sign");
+  }
   await ezSpawn2.async("git", ["tag", ...args]);
   return operation.update({ event: "git tag" /* GitTag */, tagName });
 }
@@ -1043,6 +1053,7 @@ var import_js_yaml = __toESM(require("js-yaml"));
 async function normalizeOptions(raw) {
   var _a, _b, _d;
   const preid = typeof raw.preid === "string" ? raw.preid : "beta";
+  const sign = Boolean(raw.sign);
   const push = Boolean(raw.push);
   const all = Boolean(raw.all);
   const noVerify = Boolean(raw.noVerify);
@@ -1119,6 +1130,7 @@ async function normalizeOptions(raw) {
     release,
     commit,
     tag,
+    sign,
     push,
     files,
     cwd,
@@ -1260,7 +1272,13 @@ async function updateManifestFile(relPath, operation) {
   const { newVersion } = operation.state;
   let modified = false;
   const file = await readJsoncFile(relPath, cwd);
-  if (isManifest(file.data) && file.data.version !== newVersion) {
+  if (!isManifest(file.data)) {
+    return modified;
+  }
+  if (file.data.version == null) {
+    return modified;
+  }
+  if (file.data.version !== newVersion) {
     file.modified.push([["version"], newVersion]);
     if (isPackageLockManifest(file.data))
       file.modified.push([["packages", "", "version"], newVersion]);
@@ -1348,11 +1366,13 @@ var bumpConfigDefaults = {
   commit: true,
   push: true,
   tag: true,
+  sign: false,
   recursive: false,
   noVerify: false,
   confirm: true,
   ignoreScripts: false,
   all: false,
+  noGitCheck: true,
   files: []
 };
 async function loadBumpConfig(overrides, cwd = import_node_process6.default.cwd()) {
@@ -1405,8 +1425,10 @@ async function parseArgs() {
         preid: args.preid,
         commit: args.commit,
         tag: args.tag,
+        sign: args.sign,
         push: args.push,
         all: args.all,
+        noGitCheck: args.noGitCheck,
         confirm: !args.yes,
         noVerify: !args.verify,
         files: [...args["--"] || [], ...resultArgs],
@@ -1432,7 +1454,7 @@ async function parseArgs() {
 }
 function loadCliArgs(argv = import_node_process7.default.argv) {
   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: true }).option("--no-commit", "Skip commit", { default: false }).option("-t, --tag [tag]", "Tag name", { default: true }).option("--no-tag", "Skip tag", { default: false }).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("--current-version <version>", "Current version").option("--print-commits", "Print recent commits", { default: true }).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("--no-git-check", `Skip git check`, { default: bumpConfigDefaults.noGitCheck }).option("-c, --commit [msg]", "Commit message", { default: true }).option("--no-commit", "Skip commit", { default: false }).option("-t, --tag [tag]", "Tag name", { default: true }).option("--no-tag", "Skip tag", { default: false }).option("--sign", "Sign commit and 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("--current-version <version>", "Current version").option("--print-commits", "Print recent commits", { default: true }).option("-x, --execute <command>", "Commands to execute after version bumps").help();
   const result = cli.parse(argv);
   const rawArgs = cli.rawArgs;
   const args = result.options;
@@ -1466,6 +1488,9 @@ async function main2() {
       console.log(version);
       import_node_process8.default.exit(0 /* Success */);
     } else {
+      if (!options.all && !options.noGitCheck) {
+        checkGitStatus();
+      }
       if (!quiet)
         options.progress = options.progress ? options.progress : progress;
       await versionBump(options);
@@ -1474,6 +1499,13 @@ async function main2() {
     errorHandler2(error);
   }
 }
+function checkGitStatus() {
+  const { stdout } = ezSpawn5.sync("git", ["status", "--porcelain"]);
+  if (stdout.trim()) {
+    throw new Error(`Git working tree is not clean:
+${stdout}`);
+  }
+}
 function progress({ event, script, updatedFiles, skippedFiles, newVersion }) {
   switch (event) {
     case "file updated" /* FileUpdated */:
@@ -1505,5 +1537,6 @@ function errorHandler2(error) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkGitStatus,
   main
 });

package/dist/cli/index.mjs

@@ -10,13 +10,14 @@ import {
   log_symbols_default,
   require_picocolors,
   versionBump
-} from "../chunk-TBB4VMXP.mjs";
+} from "../chunk-7TCD6MWB.mjs";
 
 // src/cli/index.ts
 import process2 from "process";
+import * as ezSpawn from "@jsdevtools/ez-spawn";
 
 // package.json
-var version = "9.6.1";
+var version = "9.7.1";
 
 // src/cli/parse-args.ts
 var import_picocolors = __toESM(require_picocolors());
@@ -35,8 +36,10 @@ async function parseArgs() {
         preid: args.preid,
         commit: args.commit,
         tag: args.tag,
+        sign: args.sign,
         push: args.push,
         all: args.all,
+        noGitCheck: args.noGitCheck,
         confirm: !args.yes,
         noVerify: !args.verify,
         files: [...args["--"] || [], ...resultArgs],
@@ -62,7 +65,7 @@ async function parseArgs() {
 }
 function loadCliArgs(argv = process.argv) {
   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: true }).option("--no-commit", "Skip commit", { default: false }).option("-t, --tag [tag]", "Tag name", { default: true }).option("--no-tag", "Skip tag", { default: false }).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("--current-version <version>", "Current version").option("--print-commits", "Print recent commits", { default: true }).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("--no-git-check", `Skip git check`, { default: bumpConfigDefaults.noGitCheck }).option("-c, --commit [msg]", "Commit message", { default: true }).option("--no-commit", "Skip commit", { default: false }).option("-t, --tag [tag]", "Tag name", { default: true }).option("--no-tag", "Skip tag", { default: false }).option("--sign", "Sign commit and 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("--current-version <version>", "Current version").option("--print-commits", "Print recent commits", { default: true }).option("-x, --execute <command>", "Commands to execute after version bumps").help();
   const result = cli.parse(argv);
   const rawArgs = cli.rawArgs;
   const args = result.options;
@@ -96,6 +99,9 @@ async function main() {
       console.log(version);
       process2.exit(0 /* Success */);
     } else {
+      if (!options.all && !options.noGitCheck) {
+        checkGitStatus();
+      }
       if (!quiet)
         options.progress = options.progress ? options.progress : progress;
       await versionBump(options);
@@ -104,6 +110,13 @@ async function main() {
     errorHandler2(error);
   }
 }
+function checkGitStatus() {
+  const { stdout } = ezSpawn.sync("git", ["status", "--porcelain"]);
+  if (stdout.trim()) {
+    throw new Error(`Git working tree is not clean:
+${stdout}`);
+  }
+}
 function progress({ event, script, updatedFiles, skippedFiles, newVersion }) {
   switch (event) {
     case "file updated" /* FileUpdated */:
@@ -134,5 +147,6 @@ function errorHandler2(error) {
   process2.exit(1 /* FatalError */);
 }
 export {
+  checkGitStatus,
   main
 };

package/dist/index.d.mts

@@ -112,6 +112,12 @@ interface VersionBumpOptions {
      * Defaults to `true`.
      */
     tag?: boolean | string;
+    /**
+     * Sign the git commit and tag with a configured key (GPG/SSH).
+     *
+     * Defaults to `false`.
+     */
+    sign?: boolean;
     /**
      * Indicates whether to push the git commit and tag.
      *
@@ -125,6 +131,12 @@ interface VersionBumpOptions {
      * Defaults to `false`.
      */
     all?: boolean;
+    /**
+     * Indicates whether the git working tree needs to be cleared before bumping.
+     *
+     * Defaults to `true`.
+     */
+    noGitCheck?: boolean;
     /**
      * Prompt for confirmation
      *
@@ -266,6 +278,7 @@ interface NormalizedOptions {
     tag?: {
         name: string;
     };
+    sign?: boolean;
     push: boolean;
     files: string[];
     cwd: string;

package/dist/index.d.ts

@@ -112,6 +112,12 @@ interface VersionBumpOptions {
      * Defaults to `true`.
      */
     tag?: boolean | string;
+    /**
+     * Sign the git commit and tag with a configured key (GPG/SSH).
+     *
+     * Defaults to `false`.
+     */
+    sign?: boolean;
     /**
      * Indicates whether to push the git commit and tag.
      *
@@ -125,6 +131,12 @@ interface VersionBumpOptions {
      * Defaults to `false`.
      */
     all?: boolean;
+    /**
+     * Indicates whether the git working tree needs to be cleared before bumping.
+     *
+     * Defaults to `true`.
+     */
+    noGitCheck?: boolean;
     /**
      * Prompt for confirmation
      *
@@ -266,6 +278,7 @@ interface NormalizedOptions {
     tag?: {
         name: string;
     };
+    sign?: boolean;
     push: boolean;
     files: string[];
     cwd: string;

package/dist/index.js

@@ -1017,6 +1017,9 @@ async function gitCommit(operation) {
   if (noVerify) {
     args.push("--no-verify");
   }
+  if (operation.options.sign) {
+    args.push("--gpg-sign");
+  }
   const commitMessage = formatVersionString(message, newVersion);
   args.push("--message", commitMessage);
   if (!all)
@@ -1039,6 +1042,9 @@ async function gitTag(operation) {
   ];
   const tagName = formatVersionString(tag.name, newVersion);
   args.push(tagName);
+  if (operation.options.sign) {
+    args.push("--sign");
+  }
   await ezSpawn2.async("git", ["tag", ...args]);
   return operation.update({ event: "git tag" /* GitTag */, tagName });
 }
@@ -1067,6 +1073,7 @@ var import_js_yaml = __toESM(require("js-yaml"));
 async function normalizeOptions(raw) {
   var _a, _b, _d;
   const preid = typeof raw.preid === "string" ? raw.preid : "beta";
+  const sign = Boolean(raw.sign);
   const push = Boolean(raw.push);
   const all = Boolean(raw.all);
   const noVerify = Boolean(raw.noVerify);
@@ -1143,6 +1150,7 @@ async function normalizeOptions(raw) {
     release,
     commit,
     tag,
+    sign,
     push,
     files,
     cwd,
@@ -1284,7 +1292,13 @@ async function updateManifestFile(relPath, operation) {
   const { newVersion } = operation.state;
   let modified = false;
   const file = await readJsoncFile(relPath, cwd);
-  if (isManifest(file.data) && file.data.version !== newVersion) {
+  if (!isManifest(file.data)) {
+    return modified;
+  }
+  if (file.data.version == null) {
+    return modified;
+  }
+  if (file.data.version !== newVersion) {
     file.modified.push([["version"], newVersion]);
     if (isPackageLockManifest(file.data))
       file.modified.push([["packages", "", "version"], newVersion]);
@@ -1374,11 +1388,13 @@ var bumpConfigDefaults = {
   commit: true,
   push: true,
   tag: true,
+  sign: false,
   recursive: false,
   noVerify: false,
   confirm: true,
   ignoreScripts: false,
   all: false,
+  noGitCheck: true,
   files: []
 };
 async function loadBumpConfig(overrides, cwd = import_node_process6.default.cwd()) {

package/dist/index.mjs

@@ -7,7 +7,7 @@ import {
   loadBumpConfig,
   versionBump,
   versionBumpInfo
-} from "./chunk-TBB4VMXP.mjs";
+} from "./chunk-7TCD6MWB.mjs";
 
 // src/index.ts
 var src_default = versionBump;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bumpp",
-  "version": "9.6.1",
-  "packageManager": "pnpm@9.11.0",
+  "version": "9.7.1",
+  "packageManager": "pnpm@9.12.1",
   "description": "Bump version, commit changes, tag, and push to Git",
   "author": {
     "name": "James Messinger",
@@ -48,6 +48,7 @@
   "scripts": {
     "clean": "rimraf .nyc_output coverage dist",
     "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
     "build": "tsup src/index.ts src/cli/index.ts --format esm,cjs --dts --clean",
     "watch": "npm run build -- --watch src",
     "start": "esno src/cli/run.ts",
@@ -72,17 +73,17 @@
   "devDependencies": {
     "@antfu/eslint-config": "^3.7.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.7.4",
+    "@types/node": "^22.7.5",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
-    "eslint": "^9.11.1",
-    "esno": "^4.7.0",
+    "eslint": "^9.12.0",
+    "esno": "^4.8.0",
     "log-symbols": "^6.0.0",
     "npm-check": "^6.0.1",
     "picocolors": "^1.1.0",
     "rimraf": "^6.0.1",
     "tsup": "^8.3.0",
-    "typescript": "^5.6.2",
-    "vitest": "^2.1.1"
+    "typescript": "^5.6.3",
+    "vitest": "^2.1.2"
   }
 }