bumpp 9.6.0 → 9.7.0

package/dist/index.js

@@ -662,7 +662,7 @@ var logSymbols = isUnicodeSupported() ? main : fallback;
 var log_symbols_default = logSymbols;
 
 // src/version-bump.ts
-var import_picocolors2 = __toESM(require_picocolors());
+var import_picocolors3 = __toESM(require_picocolors());
 var import_prompts2 = __toESM(require("prompts"));
 
 // src/get-current-version.ts
@@ -764,11 +764,124 @@ async function readVersion(file, cwd) {
 
 // src/get-new-version.ts
 var import_node_process3 = __toESM(require("process"));
-var ezSpawn = __toESM(require("@jsdevtools/ez-spawn"));
-var import_picocolors = __toESM(require_picocolors());
+var import_picocolors2 = __toESM(require_picocolors());
 var import_prompts = __toESM(require("prompts"));
 var import_semver2 = __toESM(require("semver"));
 
+// src/print-commits.ts
+var ezSpawn = __toESM(require("@jsdevtools/ez-spawn"));
+var import_picocolors = __toESM(require_picocolors());
+var messageColorMap = {
+  chore: import_picocolors.default.gray,
+  fix: import_picocolors.default.yellow,
+  feat: import_picocolors.default.green,
+  refactor: import_picocolors.default.cyan,
+  docs: import_picocolors.default.blue,
+  doc: import_picocolors.default.blue,
+  ci: import_picocolors.default.gray,
+  build: import_picocolors.default.gray
+};
+function parseCommits(raw) {
+  const lines = raw.toString().trim().split(/\n/g);
+  if (!lines.length) {
+    return [];
+  }
+  return lines.map((line) => {
+    const [hash, ...parts] = line.split(" ");
+    const message = parts.join(" ");
+    const match = message.match(/^(\w+)(!)?(\([^)]+\))?:(.*)$/);
+    if (match) {
+      let color = messageColorMap[match[1].toLowerCase()] || ((c4) => c4);
+      if (match[2] === "!") {
+        color = (s) => import_picocolors.default.inverse(import_picocolors.default.red(s));
+      }
+      const tag = [match[1], match[2]].filter(Boolean).join("");
+      const scope = match[3] || "";
+      return {
+        hash,
+        tag,
+        message: match[4].trim(),
+        scope,
+        breaking: match[2] === "!",
+        color
+      };
+    }
+    return {
+      hash,
+      tag: "",
+      message,
+      scope: "",
+      color: (c4) => c4
+    };
+  }).reverse();
+}
+function formatParsedCommits(commits) {
+  const tagLength = commits.map(({ tag }) => tag.length).reduce((a, b) => Math.max(a, b), 0);
+  let scopeLength = commits.map(({ scope }) => scope.length).reduce((a, b) => Math.max(a, b), 0);
+  if (scopeLength)
+    scopeLength += 2;
+  return commits.map(({ hash, tag, message, scope, color }) => {
+    const paddedTag = tag.padStart(tagLength + 1, " ");
+    const paddedScope = !scope ? " ".repeat(scopeLength) : import_picocolors.default.dim("(") + scope.slice(1, -1) + import_picocolors.default.dim(")") + " ".repeat(scopeLength - scope.length);
+    return [
+      import_picocolors.default.dim(hash),
+      " ",
+      color === import_picocolors.default.gray ? color(paddedTag) : import_picocolors.default.bold(color(paddedTag)),
+      " ",
+      paddedScope,
+      import_picocolors.default.dim(":"),
+      " ",
+      color === import_picocolors.default.gray ? color(message) : message
+    ].join("");
+  });
+}
+async function printRecentCommits(operation) {
+  let sha;
+  sha || (sha = await ezSpawn.async(
+    "git",
+    ["rev-list", "-n", "1", `v${operation.state.currentVersion}`],
+    { stdio: "pipe" }
+  ).then((res) => res.stdout.trim()).catch(() => void 0));
+  sha || (sha = await ezSpawn.async(
+    "git",
+    ["rev-list", "-n", "1", operation.state.currentVersion],
+    { stdio: "pipe" }
+  ).then((res) => res.stdout.trim()).catch(() => void 0));
+  if (!sha) {
+    console.log(
+      import_picocolors.default.blue(`i`) + import_picocolors.default.gray(` Failed to locate the previous tag ${import_picocolors.default.yellow(`v${operation.state.currentVersion}`)}`)
+    );
+    return;
+  }
+  const { stdout } = await ezSpawn.async(
+    "git",
+    [
+      "--no-pager",
+      "log",
+      `${sha}..HEAD`,
+      "--oneline"
+    ],
+    { stdio: "pipe" }
+  );
+  const parsed = parseCommits(stdout.toString().trim());
+  const prettified = formatParsedCommits(parsed);
+  if (!parsed.length) {
+    console.log();
+    console.log(import_picocolors.default.blue(`i`) + import_picocolors.default.gray(` No commits since ${operation.state.currentVersion}`));
+    console.log();
+    return;
+  }
+  console.log();
+  console.log(
+    import_picocolors.default.bold(
+      `${import_picocolors.default.green(parsed.length)} Commits since ${import_picocolors.default.gray(sha.slice(0, 7))}:`
+    )
+  );
+  console.log();
+  console.log(prettified.join("\n"));
+  console.log();
+}
+
 // src/release-type.ts
 var prereleaseTypes = ["premajor", "preminor", "prepatch", "prerelease"];
 var releaseTypes = prereleaseTypes.concat(["major", "minor", "patch", "next"]);
@@ -830,20 +943,20 @@ async function promptForNewVersion(operation) {
     {
       type: "autocomplete",
       name: "release",
-      message: `Current version ${import_picocolors.default.green(currentVersion)}`,
+      message: `Current version ${import_picocolors2.default.green(currentVersion)}`,
       initial: configCustomVersion ? "config" : "next",
       choices: [
-        { value: "major", title: `${"major".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.major)}` },
-        { value: "minor", title: `${"minor".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.minor)}` },
-        { value: "patch", title: `${"patch".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.patch)}` },
-        { value: "next", title: `${"next".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.next)}` },
+        { value: "major", title: `${"major".padStart(PADDING, " ")} ${import_picocolors2.default.bold(next.major)}` },
+        { value: "minor", title: `${"minor".padStart(PADDING, " ")} ${import_picocolors2.default.bold(next.minor)}` },
+        { value: "patch", title: `${"patch".padStart(PADDING, " ")} ${import_picocolors2.default.bold(next.patch)}` },
+        { value: "next", title: `${"next".padStart(PADDING, " ")} ${import_picocolors2.default.bold(next.next)}` },
         ...configCustomVersion ? [
-          { value: "config", title: `${"from config".padStart(PADDING, " ")} ${import_picocolors.default.bold(configCustomVersion)}` }
+          { value: "config", title: `${"from config".padStart(PADDING, " ")} ${import_picocolors2.default.bold(configCustomVersion)}` }
         ] : [],
-        { value: "prepatch", title: `${"pre-patch".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.prepatch)}` },
-        { value: "preminor", title: `${"pre-minor".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.preminor)}` },
-        { value: "premajor", title: `${"pre-major".padStart(PADDING, " ")} ${import_picocolors.default.bold(next.premajor)}` },
-        { value: "none", title: `${"as-is".padStart(PADDING, " ")} ${import_picocolors.default.bold(currentVersion)}` },
+        { value: "prepatch", title: `${"pre-patch".padStart(PADDING, " ")} ${import_picocolors2.default.bold(next.prepatch)}` },
+        { value: "preminor", title: `${"pre-minor".padStart(PADDING, " ")} ${import_picocolors2.default.bold(next.preminor)}` },
+        { value: "premajor", title: `${"pre-major".padStart(PADDING, " ")} ${import_picocolors2.default.bold(next.premajor)}` },
+        { value: "none", title: `${"as-is".padStart(PADDING, " ")} ${import_picocolors2.default.bold(currentVersion)}` },
         { value: "custom", title: "custom ...".padStart(PADDING + 4, " ") }
       ]
     },
@@ -870,97 +983,6 @@ async function promptForNewVersion(operation) {
       return operation.update({ release: answers.release, newVersion });
   }
 }
-var messageColorMap = {
-  chore: import_picocolors.default.gray,
-  fix: import_picocolors.default.yellow,
-  feat: import_picocolors.default.green,
-  refactor: import_picocolors.default.cyan,
-  docs: import_picocolors.default.blue,
-  doc: import_picocolors.default.blue,
-  ci: import_picocolors.default.gray,
-  build: import_picocolors.default.gray
-};
-async function printRecentCommits(operation) {
-  let sha;
-  sha || (sha = await ezSpawn.async(
-    "git",
-    ["rev-list", "-n", "1", `v${operation.state.currentVersion}`],
-    { stdio: "pipe" }
-  ).then((res) => res.stdout.trim()).catch(() => void 0));
-  sha || (sha = await ezSpawn.async(
-    "git",
-    ["rev-list", "-n", "1", operation.state.currentVersion],
-    { stdio: "pipe" }
-  ).then((res) => res.stdout.trim()).catch(() => void 0));
-  if (!sha) {
-    console.log(
-      import_picocolors.default.blue(`i`) + import_picocolors.default.gray(` Failed to locate the previous tag ${import_picocolors.default.yellow(`v${operation.state.currentVersion}`)}`)
-    );
-    return;
-  }
-  const message = await ezSpawn.async(
-    "git",
-    [
-      "--no-pager",
-      "log",
-      `${sha}..HEAD`,
-      "--oneline"
-    ],
-    { stdio: "pipe" }
-  );
-  const lines = message.stdout.toString().trim().split(/\n/g);
-  if (!lines.length) {
-    console.log();
-    console.log(import_picocolors.default.blue(`i`) + import_picocolors.default.gray(` No commits since ${operation.state.currentVersion}`));
-    console.log();
-    return;
-  }
-  const parsed = lines.map((line) => {
-    const [hash, ...parts] = line.split(" ");
-    const message2 = parts.join(" ");
-    const match = message2.match(/^(\w+)(\([^)]+\))?(!)?:(.*)$/);
-    if (match) {
-      let color = messageColorMap[match[1].toLowerCase()] || ((c3) => c3);
-      if (match[3] === "!") {
-        color = import_picocolors.default.red;
-      }
-      const tag = [match[1], match[2], match[3]].filter(Boolean).join("");
-      return {
-        hash,
-        tag,
-        message: match[4].trim(),
-        color
-      };
-    }
-    return {
-      hash,
-      tag: "",
-      message: message2,
-      color: (c3) => c3
-    };
-  });
-  const tagLength = parsed.map(({ tag }) => tag.length).reduce((a, b) => Math.max(a, b), 0);
-  const prettified = parsed.map(({ hash, tag, message: message2, color }) => {
-    const paddedTag = tag.padStart(tagLength + 2, " ");
-    return [
-      import_picocolors.default.dim(hash),
-      " ",
-      color === import_picocolors.default.gray ? color(paddedTag) : import_picocolors.default.bold(color(paddedTag)),
-      import_picocolors.default.dim(":"),
-      " ",
-      color === import_picocolors.default.gray ? color(message2) : message2
-    ].join("");
-  });
-  console.log();
-  console.log(
-    import_picocolors.default.bold(
-      `${import_picocolors.default.green(lines.length)} Commits since ${import_picocolors.default.gray(sha.slice(0, 7))}:`
-    )
-  );
-  console.log();
-  console.log(prettified.reverse().join("\n"));
-  console.log();
-}
 
 // src/git.ts
 var ezSpawn2 = __toESM(require("@jsdevtools/ez-spawn"));
@@ -995,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)
@@ -1017,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 });
 }
@@ -1045,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);
@@ -1121,6 +1150,7 @@ async function normalizeOptions(raw) {
     release,
     commit,
     tag,
+    sign,
     push,
     files,
     cwd,
@@ -1262,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]);
@@ -1320,18 +1356,18 @@ async function versionBump(arg = {}) {
 }
 function printSummary(operation) {
   console.log();
-  console.log(`   files ${operation.options.files.map((i) => import_picocolors2.default.bold(i)).join("\n         ")}`);
+  console.log(`   files ${operation.options.files.map((i) => import_picocolors3.default.bold(i)).join("\n         ")}`);
   if (operation.options.commit)
-    console.log(`  commit ${import_picocolors2.default.bold(formatVersionString(operation.options.commit.message, operation.state.newVersion))}`);
+    console.log(`  commit ${import_picocolors3.default.bold(formatVersionString(operation.options.commit.message, operation.state.newVersion))}`);
   if (operation.options.tag)
-    console.log(`     tag ${import_picocolors2.default.bold(formatVersionString(operation.options.tag.name, operation.state.newVersion))}`);
+    console.log(`     tag ${import_picocolors3.default.bold(formatVersionString(operation.options.tag.name, operation.state.newVersion))}`);
   if (operation.options.execute)
-    console.log(` execute ${import_picocolors2.default.bold(operation.options.execute)}`);
+    console.log(` execute ${import_picocolors3.default.bold(operation.options.execute)}`);
   if (operation.options.push)
-    console.log(`    push ${import_picocolors2.default.cyan(import_picocolors2.default.bold("yes"))}`);
+    console.log(`    push ${import_picocolors3.default.cyan(import_picocolors3.default.bold("yes"))}`);
   console.log();
-  console.log(`    from ${import_picocolors2.default.bold(operation.state.currentVersion)}`);
-  console.log(`      to ${import_picocolors2.default.green(import_picocolors2.default.bold(operation.state.newVersion))}`);
+  console.log(`    from ${import_picocolors3.default.bold(operation.state.currentVersion)}`);
+  console.log(`      to ${import_picocolors3.default.green(import_picocolors3.default.bold(operation.state.newVersion))}`);
   console.log();
 }
 async function versionBumpInfo(arg = {}) {
@@ -1352,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()) {
@@ -1368,6 +1406,7 @@ async function loadBumpConfig(overrides, cwd = import_node_process6.default.cwd(
     overrides: __spreadValues({}, overrides),
     cwd: configFile ? (0, import_node_path2.dirname)(configFile) : cwd
   });
+  console.log(config);
   return config;
 }
 function findConfigFile(name, cwd) {

package/dist/index.mjs

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

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "bumpp",
-  "version": "9.6.0",
+  "version": "9.7.0",
+  "packageManager": "pnpm@9.12.1",
   "description": "Bump version, commit changes, tag, and push to Git",
   "author": {
     "name": "James Messinger",
@@ -44,6 +45,20 @@
   "engines": {
     "node": ">=10"
   },
+  "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",
+    "test": "vitest",
+    "upgrade": "npm-check -u && npm audit fix",
+    "bumpp": "esno src/cli/run.ts",
+    "prepublishOnly": "npm run clean && npm run build",
+    "release": "npm run bumpp && npm publish",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "@jsdevtools/ez-spawn": "^3.0.4",
     "c12": "^1.11.2",
@@ -58,29 +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"
-  },
-  "scripts": {
-    "clean": "rimraf .nyc_output coverage dist",
-    "lint": "eslint .",
-    "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",
-    "test": "vitest",
-    "upgrade": "npm-check -u && npm audit fix",
-    "bumpp": "esno src/cli/run.ts",
-    "release": "npm run bumpp && npm publish",
-    "typecheck": "tsc --noEmit"
+    "typescript": "^5.6.3",
+    "vitest": "^2.1.2"
   }
-}
+}