@varlock/bumpy 1.13.2 → 1.14.0-rc.0

package/README.md

@@ -54,6 +54,7 @@ Fixed locale fallback logic in utils.
 - **Flexible package management** - include/exclude any package individually via per-package config, glob patterns, or `privatePackages` setting
 - **Non-interactive CLI** - `bumpy add` works fully non-interactively for CI/CD and AI-assisted development
 - **Aggregated GitHub releases** - optionally create a single consolidated release instead of one per package
+- **Prerelease channels** - branch-based `@next` / `@beta` release lines where prerelease versions are derived at publish time, never committed to git (see [prerelease channels docs](https://github.com/dmno-dev/bumpy/blob/main/docs/prereleases.md))
 - **Auto-generate from commits** - `bumpy generate` creates bump files from branch commits - works with any commit style, with enhanced detection for conventional commits
 - **Pluggable changelog formatters** - built-in `"default"` and `"github"` formatters, or write your own
 - **Zero runtime dependencies** - dependencies are minimal and bundled at release time
@@ -119,6 +120,7 @@ The skill teaches the AI to examine git changes, identify affected packages, cho
 - [CLI reference](https://github.com/dmno-dev/bumpy/blob/main/docs/cli.md) - every command with flags and examples
 - [GitHub Actions setup](https://github.com/dmno-dev/bumpy/blob/main/docs/github-actions.md) - CI workflows, token setup, trusted publishing
 - [Version propagation](https://github.com/dmno-dev/bumpy/blob/main/docs/version-propagation.md) - how dependency bumps cascade through your graph
+- [Prerelease channels](https://github.com/dmno-dev/bumpy/blob/main/docs/prereleases.md) - branch-based `@next` / `@beta` release lines
 
 ## Why files instead of conventional commits?
 
@@ -133,6 +135,7 @@ Bumpy is built as a successor to [🦋changesets](https://github.com/changesets/
 - **Custom publish commands** - changesets is hardcoded to `npm publish`. Bumpy supports per-package custom publish for VSCode extensions, Docker images, JSR, etc.
 - **Flexible package management** - changesets treats all private packages the same. Bumpy lets you include/exclude any package individually.
 - **CI without a separate action or bot** - changesets requires installing a [GitHub App](https://github.com/apps/changeset-bot) _and_ using a [separate GitHub Action](https://github.com/changesets/action). Bumpy replaces both with two CLI commands (`bumpy ci check` + `bumpy ci release`) that run directly in your workflows - no extra repos to trust, no app installation requiring org admin approval.
+- **Prerelease channels that don't corrupt state** - changesets' prerelease mode is described in [their own docs](https://github.com/changesets/changesets/blob/main/docs/prereleases.md) as "very complicated" with states "very hard to fix." Bumpy uses [branch-based channels](https://github.com/dmno-dev/bumpy/blob/main/docs/prereleases.md) where prerelease versions are never committed - no global mode file to poison unrelated releases.
 - **Automatic migration** - `bumpy init` detects `.changeset/`, renames it to `.bumpy/`, migrates config, keeps pending files, and offers to uninstall `@changesets/cli`.
 
 ## Development
@@ -146,7 +149,6 @@ bunx bumpy --help  # invoke built cli
 
 ## Roadmap
 
-- Prerelease mode (for now, use [pkg.pr.new](https://github.com/stackblitz-labs/pkg.pr.new) for branch preview packages)
 - Standalone binary for use outside of JS projects
 - Better support for versioning non-JS packages and usage without package.json files
 - Plugin system for different publish targets, and support multiple targets per package

package/config-schema.json

@@ -202,6 +202,49 @@
         }
       },
       "additionalProperties": false
+    },
+    "channels": {
+      "type": "object",
+      "description": "Prerelease channels, keyed by channel name. Each maps a long-lived branch to a prerelease line (version suffix + npm dist-tag). Prerelease versions are derived at publish time and never committed.",
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "branch": {
+            "type": "string",
+            "description": "Branch that triggers this channel (required)"
+          },
+          "preid": {
+            "type": "string",
+            "description": "Version suffix (preid), e.g. \"rc\" produces 1.2.0-rc.0. Defaults to the channel name."
+          },
+          "tag": {
+            "type": "string",
+            "description": "npm dist-tag for publishes. Defaults to the channel name."
+          },
+          "versionPr": {
+            "type": "object",
+            "description": "Release PR overrides for this channel",
+            "properties": {
+              "title": {
+                "type": "string",
+                "description": "Release PR title. Defaults to \"<base title> (<channel name>)\"."
+              },
+              "branch": {
+                "type": "string",
+                "description": "Release PR branch. Defaults to \"<base branch>-<channel name>\"."
+              },
+              "automerge": {
+                "type": "boolean",
+                "description": "Enable auto-merge on the release PR",
+                "default": false
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "required": ["branch"],
+        "additionalProperties": false
+      }
     }
   },
   "additionalProperties": false,

package/dist/{add-Dt1hddMt.mjs → add-C9rU_89s.mjs}

@@ -1,11 +1,11 @@
 import { n as log, r as require_picocolors, s as __toESM } from "./logger-BgksGFuf.mjs";
 import { n as exists, t as ensureDir } from "./fs-CBXKZhoU.mjs";
-import { a as loadConfig, r as getBumpyDir } from "./config-D_4GYDJi.mjs";
-import { a as writeBumpFile, r as readBumpFiles, s as discoverWorkspace, t as filterBranchBumpFiles } from "./bump-file-B7hmXZlB.mjs";
-import { a as getChangedFiles } from "./git-BWPimLgc.mjs";
+import { a as loadConfig, r as getBumpyDir } from "./config-0we4ISZX.mjs";
+import { c as discoverWorkspace, i as readBumpFiles, o as writeBumpFile, t as filterBranchBumpFiles } from "./bump-file-mRJeReRJ.mjs";
+import { a as getChangedFiles } from "./git-DAWj8LyV.mjs";
 import { l as pt, o as gt, r as Ot, s as mt, t as unwrap, u as wt } from "./clack-W95rXis0.mjs";
 import { n as slugify, t as randomName } from "./names-COooXAFg.mjs";
-import { n as findChangedPackages } from "./check-Dvi0DIqC.mjs";
+import { n as findChangedPackages } from "./check-DIl9Dz68.mjs";
 import { resolve } from "node:path";
 import * as readline from "node:readline";
 //#region src/prompts/bump-select.ts

package/dist/{apply-release-plan-DD2R7SL2.mjs → apply-release-plan-DxTsUSqa.mjs}

@@ -1,6 +1,6 @@
 import { a as readJson, c as removeFile, f as writeText, i as listFiles, l as updateJsonFields, n as exists, s as readText, u as updateJsonNestedField } from "./fs-CBXKZhoU.mjs";
-import { r as getBumpyDir } from "./config-D_4GYDJi.mjs";
-import { a as prependToChangelog, i as loadFormatter, n as generateChangelogEntry } from "./changelog-CbaET5V6.mjs";
+import { r as getBumpyDir } from "./config-0we4ISZX.mjs";
+import { a as prependToChangelog, i as loadFormatter, n as generateChangelogEntry } from "./changelog-DuFhnJRO.mjs";
 import { resolve } from "node:path";
 //#region src/core/apply-release-plan.ts
 /** Apply the release plan: bump versions, update changelogs, delete bump files */
@@ -39,6 +39,15 @@ async function applyReleasePlan(releasePlan, packages, rootDir, config) {
 		if (file === "README.md") continue;
 		await removeFile(resolve(bumpyDir, file));
 	}
+	const { rmdir } = await import("node:fs/promises");
+	for (const channel of Object.keys(config.channels || {})) {
+		const channelDir = resolve(bumpyDir, channel);
+		const channelFiles = await listFiles(channelDir, ".md");
+		for (const file of channelFiles) await removeFile(resolve(channelDir, file));
+		try {
+			await rmdir(channelDir);
+		} catch {}
+	}
 }
 /** Update a version range to include a new version, preserving the range prefix */
 function updateRange(range, newVersion) {

package/dist/{bump-file-B7hmXZlB.mjs → bump-file-mRJeReRJ.mjs}

@@ -1,5 +1,5 @@
 import { a as readJson, f as writeText, i as listFiles, n as exists, s as readText } from "./fs-CBXKZhoU.mjs";
-import { i as isPackageManaged, o as loadPackageConfig, r as getBumpyDir } from "./config-D_4GYDJi.mjs";
+import { i as isPackageManaged, o as loadPackageConfig, r as getBumpyDir } from "./config-0we4ISZX.mjs";
 import { c as jsYaml, r as detectWorkspaces } from "./package-manager-Db_vTztt.mjs";
 import { s as tryRunArgs } from "./shell-C8KgKnMQ.mjs";
 import { relative, resolve } from "node:path";
@@ -128,18 +128,38 @@ function validatePackageName(name) {
 	if (name.startsWith("-")) return false;
 	return true;
 }
-/** Read all bump files from .bumpy/ directory, sorted by git creation order */
-async function readBumpFiles(rootDir) {
+/** Read all bump files from .bumpy/ (and optionally channel subdirs), sorted by git creation order */
+async function readBumpFiles(rootDir, opts = {}) {
 	const dir = getBumpyDir(rootDir);
-	const files = await listFiles(dir, ".md");
 	const bumpFiles = [];
 	const errors = [];
+	const files = await listFiles(dir, ".md");
 	for (const file of files) {
 		if (file === "README.md") continue;
 		const result = await parseBumpFileFromPath(resolve(dir, file));
 		if (result.bumpFile) bumpFiles.push(result.bumpFile);
 		errors.push(...result.errors);
 	}
+	for (const channel of opts.channels ?? []) {
+		const channelDir = resolve(dir, channel);
+		const channelFiles = await listFiles(channelDir, ".md");
+		for (const file of channelFiles) {
+			if (file === "README.md") continue;
+			const result = await parseBumpFileFromPath(resolve(channelDir, file));
+			if (result.bumpFile) {
+				const duplicate = bumpFiles.find((bf) => bf.id === result.bumpFile.id);
+				if (duplicate) {
+					errors.push(`Bump file "${result.bumpFile.id}" exists both ${duplicate.channel ? `in .bumpy/${duplicate.channel}/` : "at .bumpy/ root"} and in .bumpy/${channel}/ — remove one copy (the change likely already shipped on one of them).`);
+					continue;
+				}
+				bumpFiles.push({
+					...result.bumpFile,
+					channel
+				});
+			}
+			errors.push(...result.errors);
+		}
+	}
 	const creationOrder = getBumpFileCreationOrder(rootDir);
 	if (creationOrder.size > 0) bumpFiles.sort((a, b) => {
 		return (creationOrder.get(a.id) ?? Infinity) - (creationOrder.get(b.id) ?? Infinity) || a.id.localeCompare(b.id);
@@ -171,7 +191,7 @@ function getBumpFileCreationOrder(rootDir) {
 		if (!trimmed) continue;
 		if (/^\d+$/.test(trimmed)) currentTimestamp = parseInt(trimmed, 10);
 		else if (trimmed.startsWith(".bumpy/") && trimmed.endsWith(".md")) {
-			const id = trimmed.replace(/^\.bumpy\//, "").replace(/\.md$/, "");
+			const id = fileToId(trimmed);
 			order.set(id, currentTimestamp);
 		}
 	}
@@ -298,11 +318,26 @@ function recoverDeletedBumpFiles(rootDir) {
 			`HEAD~1:${filePath}`
 		], { cwd: rootDir });
 		if (!content) continue;
-		const { bumpFile } = parseBumpFile(content, filePath.replace(/^\.bumpy\//, "").replace(/\.md$/, ""));
+		const { bumpFile } = parseBumpFile(content, fileToId(filePath));
 		if (bumpFile) bumpFiles.push(bumpFile);
 	}
 	return bumpFiles;
 }
+/**
+* Move bump files into a channel's shipped directory (`.bumpy/<channel>/`).
+* This is the only thing a channel "version" does — prerelease versions are
+* never written to git. Files already in the target channel dir are left alone.
+*/
+async function moveBumpFilesToChannel(rootDir, bumpFiles, channel) {
+	const { rename, mkdir } = await import("node:fs/promises");
+	const dir = getBumpyDir(rootDir);
+	const channelDir = resolve(dir, channel);
+	await mkdir(channelDir, { recursive: true });
+	for (const bf of bumpFiles) {
+		if (bf.channel === channel) continue;
+		await rename(bf.channel ? resolve(dir, bf.channel, `${bf.id}.md`) : resolve(dir, `${bf.id}.md`), resolve(channelDir, `${bf.id}.md`));
+	}
+}
 function fileToId(filePath) {
 	return filePath.split("/").pop().replace(/\.md$/, "");
 }
@@ -311,7 +346,7 @@ function fileToId(filePath) {
 * of bump files that were added/modified. Shared by `check` and `ci check`.
 */
 function extractBumpFileIdsFromChangedFiles(changedFiles) {
-	return new Set(changedFiles.filter((f) => /^\.bumpy\/.*\.md$/.test(f) && !f.endsWith("README.md")).map((f) => f.replace(/^\.bumpy\//, "").replace(/\.md$/, "")));
+	return new Set(changedFiles.filter((f) => /^\.bumpy\/.*\.md$/.test(f) && !f.endsWith("README.md")).map(fileToId));
 }
 /**
 * Filter bump files to only those added/modified on the current branch.
@@ -340,4 +375,4 @@ function filterBranchBumpFiles(allBumpFiles, changedFiles, rootDir, parseErrors
 	};
 }
 //#endregion
-export { writeBumpFile as a, recoverDeletedBumpFiles as i, parseBumpFile as n, discoverPackages as o, readBumpFiles as r, discoverWorkspace as s, filterBranchBumpFiles as t };
+export { recoverDeletedBumpFiles as a, discoverWorkspace as c, readBumpFiles as i, moveBumpFilesToChannel as n, writeBumpFile as o, parseBumpFile as r, discoverPackages as s, filterBranchBumpFiles as t };

package/dist/{changelog-CbaET5V6.mjs → changelog-DuFhnJRO.mjs}

@@ -1,5 +1,5 @@
 import { n as log } from "./logger-BgksGFuf.mjs";
-import { c as maxBump, t as BUMP_LEVELS } from "./types-Bkh-igOJ.mjs";
+import { c as maxBump, t as BUMP_LEVELS } from "./types-lpiG-Zxh.mjs";
 import { relative, resolve } from "node:path";
 import { realpathSync } from "node:fs";
 //#region src/core/changelog.ts
@@ -44,7 +44,7 @@ const defaultFormatter = (ctx) => {
 const BUILTIN_FORMATTERS = {
 	default: defaultFormatter,
 	github: async () => {
-		const { createGithubFormatter } = await import("./changelog-github-DXDnWkrB.mjs");
+		const { createGithubFormatter } = await import("./changelog-github-jLOtwuWj.mjs");
 		return createGithubFormatter();
 	}
 };
@@ -55,7 +55,7 @@ const BUILTIN_FORMATTERS = {
 async function loadFormatter(changelog, rootDir) {
 	const [name, options] = Array.isArray(changelog) ? changelog : [changelog, {}];
 	if (name === "github") {
-		const { createGithubFormatter } = await import("./changelog-github-DXDnWkrB.mjs");
+		const { createGithubFormatter } = await import("./changelog-github-jLOtwuWj.mjs");
 		return createGithubFormatter(options);
 	}
 	if (typeof name === "string" && BUILTIN_FORMATTERS[name]) {

package/dist/{changelog-github-DXDnWkrB.mjs → changelog-github-jLOtwuWj.mjs}

@@ -1,6 +1,6 @@
-import { c as maxBump } from "./types-Bkh-igOJ.mjs";
+import { c as maxBump } from "./types-lpiG-Zxh.mjs";
 import { s as tryRunArgs } from "./shell-C8KgKnMQ.mjs";
-import { o as sortBumpFilesByType, r as getBumpTypeForPackage } from "./changelog-CbaET5V6.mjs";
+import { o as sortBumpFilesByType, r as getBumpTypeForPackage } from "./changelog-DuFhnJRO.mjs";
 //#region src/core/changelog-github.ts
 /** Authors filtered from "Thanks" attribution by default (e.g. bots) */
 /** Authors filtered from "Thanks" attribution by default (e.g. AI/automation bots) */

package/dist/channels-CFXZkyGd.mjs

@@ -0,0 +1,75 @@
+import "./config-0we4ISZX.mjs";
+import { o as getCurrentBranch } from "./git-DAWj8LyV.mjs";
+import "node:path";
+//#region src/core/channels.ts
+/** Channel names that would collide with reserved `.bumpy/` entries */
+const RESERVED_CHANNEL_NAMES = new Set(["README", "README.md"]);
+/**
+* Resolve all configured channels, applying defaults and validating names.
+* Defaults: preid/tag = channel name; versionPr.title = "<base-title> (<name>)";
+* versionPr.branch = "<base-branch>-<name>".
+*/
+function resolveChannels(config) {
+	const channels = /* @__PURE__ */ new Map();
+	const seenBranches = /* @__PURE__ */ new Map();
+	for (const [name, raw] of Object.entries(config.channels || {})) {
+		if (!/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(name) || name.startsWith("_") || RESERVED_CHANNEL_NAMES.has(name)) throw new Error(`Invalid channel name "${name}" — channel names become .bumpy/ subdirectories and must be alphanumeric (plus ".", "-", "_"), not start with "_", and not collide with reserved entries.`);
+		if (!raw.branch || typeof raw.branch !== "string") throw new Error(`Channel "${name}" is missing required "branch" field`);
+		if (raw.branch === config.baseBranch) throw new Error(`Channel "${name}" cannot use the base branch ("${config.baseBranch}") as its channel branch`);
+		const existing = seenBranches.get(raw.branch);
+		if (existing) throw new Error(`Channels "${existing}" and "${name}" both use branch "${raw.branch}"`);
+		seenBranches.set(raw.branch, name);
+		channels.set(name, {
+			name,
+			branch: raw.branch,
+			preid: raw.preid ?? name,
+			tag: raw.tag ?? name,
+			versionPr: {
+				title: raw.versionPr?.title ?? `${config.versionPr.title} (${name})`,
+				branch: raw.versionPr?.branch ?? `${config.versionPr.branch}-${name}`,
+				automerge: raw.versionPr?.automerge ?? false
+			}
+		});
+	}
+	return channels;
+}
+/** Names of all configured channels (used as `.bumpy/` subdirectory names) */
+function channelNames(config) {
+	return Object.keys(config.channels || {});
+}
+/**
+* Detect the branch the release flow is running for.
+* In GitHub Actions push events, HEAD is often detached — prefer GITHUB_REF_NAME.
+*/
+function detectReleaseBranch(rootDir) {
+	const refName = process.env.GITHUB_REF_NAME;
+	const refType = process.env.GITHUB_REF_TYPE;
+	if (refName && refType !== "tag") return refName;
+	const branch = getCurrentBranch({ cwd: rootDir });
+	if (!branch || branch === "HEAD") return null;
+	return branch;
+}
+/** Find the channel matching a branch name, if any */
+function matchChannelByBranch(config, branch) {
+	if (!branch) return null;
+	for (const channel of resolveChannels(config).values()) if (channel.branch === branch) return channel;
+	return null;
+}
+/**
+* Resolve the active channel for a command:
+* an explicit `--channel <name>` override wins, otherwise the current branch is matched.
+* Throws if an explicit override names an unknown channel.
+*/
+function resolveActiveChannel(rootDir, config, override) {
+	if (override) {
+		const channel = resolveChannels(config).get(override);
+		if (!channel) {
+			const known = channelNames(config);
+			throw new Error(`Unknown channel "${override}"${known.length ? ` — configured channels: ${known.join(", ")}` : " — no channels are configured in .bumpy/_config.json"}`);
+		}
+		return channel;
+	}
+	return matchChannelByBranch(config, detectReleaseBranch(rootDir));
+}
+//#endregion
+export { channelNames, detectReleaseBranch, matchChannelByBranch, resolveActiveChannel, resolveChannels };

package/dist/{check-Dvi0DIqC.mjs → check-DIl9Dz68.mjs}

@@ -1,10 +1,10 @@
 import { a as __exportAll, i as __commonJSMin, n as log, s as __toESM, t as colorize } from "./logger-BgksGFuf.mjs";
 import { n as exists, s as readText } from "./fs-CBXKZhoU.mjs";
-import { a as DEP_TYPES } from "./types-Bkh-igOJ.mjs";
-import { a as loadConfig, o as loadPackageConfig, r as getBumpyDir } from "./config-D_4GYDJi.mjs";
+import { a as DEP_TYPES } from "./types-lpiG-Zxh.mjs";
+import { a as loadConfig, o as loadPackageConfig, r as getBumpyDir } from "./config-0we4ISZX.mjs";
 import { a as isCatalogRefAffected, i as diffCatalogMaps, n as detectPackageManager, o as parseCatalogs, t as CATALOG_FILES } from "./package-manager-Db_vTztt.mjs";
-import { r as readBumpFiles, s as discoverWorkspace, t as filterBranchBumpFiles } from "./bump-file-B7hmXZlB.mjs";
-import { a as getChangedFiles, r as getBaseCompareRef, s as getFileStatuses, u as readFileAtRef } from "./git-BWPimLgc.mjs";
+import { c as discoverWorkspace, i as readBumpFiles, t as filterBranchBumpFiles } from "./bump-file-mRJeReRJ.mjs";
+import { a as getChangedFiles, d as readFileAtRef, r as getBaseCompareRef, s as getFileStatuses } from "./git-DAWj8LyV.mjs";
 import { relative, resolve } from "node:path";
 //#region ../../node_modules/.bun/picomatch@4.0.4/node_modules/picomatch/lib/constants.js
 var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -1894,8 +1894,20 @@ var import_picomatch = /* @__PURE__ */ __toESM(require_picomatch(), 1);
 async function checkCommand(rootDir, opts = {}) {
 	const config = await loadConfig(rootDir);
 	const { packages } = await discoverWorkspace(rootDir, config);
-	const baseBranch = config.baseBranch;
-	const changedFiles = getChangedFiles(rootDir, baseBranch);
+	const { resolveChannels, detectReleaseBranch } = await import("./channels-CFXZkyGd.mjs");
+	const currentBranch = detectReleaseBranch(rootDir);
+	if (currentBranch) {
+		const skipBranches = new Set([config.versionPr.branch]);
+		for (const channel of resolveChannels(config).values()) {
+			skipBranches.add(channel.branch);
+			skipBranches.add(channel.versionPr.branch);
+		}
+		if (skipBranches.has(currentBranch)) {
+			log.dim(`  Skipping check — "${currentBranch}" is a channel or release PR branch.`);
+			return;
+		}
+	}
+	const changedFiles = getChangedFiles(rootDir, opts.base || config.baseBranch);
 	if (changedFiles.length === 0) {
 		log.info("No changed files detected.");
 		return;