From 3548ad5015fa35b191ed7e9f9406f9bd3d9f22b0 Mon Sep 17 00:00:00 2001 From: Theo Ephraim Date: Tue, 21 Apr 2026 14:41:05 -0700 Subject: [PATCH 1/2] Fix empty bump files not being deleted during versioning Empty bump files (no releases in frontmatter) were skipped by parseBumpFile() and never included in the release plan, so applyReleasePlan only deleted non-empty bump files. Now deletes all .md files from .bumpy/ directory instead of only those referenced in the release plan. Co-Authored-By: Claude Opus 4.6 (1M context) --- packages/bumpy/src/core/apply-release-plan.ts | 23 +++++-- .../test/core/apply-release-plan.test.ts | 69 +++++++++++++++++++ 2 files changed, 87 insertions(+), 5 deletions(-) diff --git a/packages/bumpy/src/core/apply-release-plan.ts b/packages/bumpy/src/core/apply-release-plan.ts index 54f350a..6a8c1b2 100644 --- a/packages/bumpy/src/core/apply-release-plan.ts +++ b/packages/bumpy/src/core/apply-release-plan.ts @@ -1,7 +1,16 @@ import { resolve } from 'node:path'; -import { readJson, readText, writeText, exists, updateJsonFields, updateJsonNestedField } from '../utils/fs.ts'; -import { deleteBumpFiles } from './bump-file.ts'; +import { + readJson, + readText, + writeText, + exists, + updateJsonFields, + updateJsonNestedField, + listFiles, + removeFile, +} from '../utils/fs.ts'; import { generateChangelogEntry, prependToChangelog, loadFormatter } from './changelog.ts'; +import { getBumpyDir } from './config.ts'; import type { ReleasePlan, WorkspacePackage, BumpyConfig } from '../types.ts'; /** Apply the release plan: bump versions, update changelogs, delete bump files */ @@ -50,9 +59,13 @@ export async function applyReleasePlan( await writeText(changelogPath, newContent); } - // 3. Delete consumed bump files - const bfIds = releasePlan.bumpFiles.map((bf) => bf.id); - await deleteBumpFiles(rootDir, bfIds); + // 3. Delete all bump files (including empty ones that aren't in the release plan) + const bumpyDir = getBumpyDir(rootDir); + const allBumpFiles = await listFiles(bumpyDir, '.md'); + for (const file of allBumpFiles) { + if (file === 'README.md') continue; + await removeFile(resolve(bumpyDir, file)); + } } /** Update a version range to include a new version, preserving the range prefix */ diff --git a/packages/bumpy/test/core/apply-release-plan.test.ts b/packages/bumpy/test/core/apply-release-plan.test.ts index cacfa9d..ef129b1 100644 --- a/packages/bumpy/test/core/apply-release-plan.test.ts +++ b/packages/bumpy/test/core/apply-release-plan.test.ts @@ -391,4 +391,73 @@ describe('applyReleasePlan', () => { expect(await exists(csPath)).toBe(false); }); + + test('deletes empty bump files that are not in the release plan', async () => { + const pkgDir = await setupPackage('pkg-a', '1.0.0'); + + const packages = new Map(); + packages.set('pkg-a', { + name: 'pkg-a', + version: '1.0.0', + dir: pkgDir, + relativeDir: 'packages/pkg-a', + packageJson: { name: 'pkg-a', version: '1.0.0' }, + private: false, + dependencies: {}, + devDependencies: {}, + peerDependencies: {}, + optionalDependencies: {}, + }); + + const bumpFile = makeBumpFile('real-bump', [{ name: 'pkg-a', type: 'patch' }], 'Fix'); + const release = makeRelease('pkg-a', '1.0.1', { + oldVersion: '1.0.0', + bumpFiles: ['real-bump'], + }); + + await ensureDir(resolve(tmpDir, '.bumpy')); + const realPath = resolve(tmpDir, '.bumpy/real-bump.md'); + const emptyPath = resolve(tmpDir, '.bumpy/empty-ci-setup.md'); + await writeText(realPath, '---\n"pkg-a": patch\n---\n\nFix\n'); + await writeText(emptyPath, '---\n---\n\n'); + expect(await exists(emptyPath)).toBe(true); + + await applyReleasePlan(makeReleasePlan([release], [bumpFile]), packages, tmpDir, makeConfig()); + + expect(await exists(realPath)).toBe(false); + expect(await exists(emptyPath)).toBe(false); + }); + + test('preserves README.md in .bumpy directory', async () => { + const pkgDir = await setupPackage('pkg-a', '1.0.0'); + + const packages = new Map(); + packages.set('pkg-a', { + name: 'pkg-a', + version: '1.0.0', + dir: pkgDir, + relativeDir: 'packages/pkg-a', + packageJson: { name: 'pkg-a', version: '1.0.0' }, + private: false, + dependencies: {}, + devDependencies: {}, + peerDependencies: {}, + optionalDependencies: {}, + }); + + const bumpFile = makeBumpFile('cs1', [{ name: 'pkg-a', type: 'patch' }], 'Fix'); + const release = makeRelease('pkg-a', '1.0.1', { + oldVersion: '1.0.0', + bumpFiles: ['cs1'], + }); + + await ensureDir(resolve(tmpDir, '.bumpy')); + await writeText(resolve(tmpDir, '.bumpy/cs1.md'), '---\n"pkg-a": patch\n---\n\nFix\n'); + const readmePath = resolve(tmpDir, '.bumpy/README.md'); + await writeText(readmePath, '# Bump files go here\n'); + + await applyReleasePlan(makeReleasePlan([release], [bumpFile]), packages, tmpDir, makeConfig()); + + expect(await exists(readmePath)).toBe(true); + }); }); From 6f9bce77b518cdc075467b46113f2f6b0e1d6a76 Mon Sep 17 00:00:00 2001 From: Theo Ephraim Date: Tue, 21 Apr 2026 14:41:29 -0700 Subject: [PATCH 2/2] Add bump file for empty bump file deletion fix Co-Authored-By: Claude Opus 4.6 (1M context) --- .bumpy/fix-delete-empty-bump-files.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .bumpy/fix-delete-empty-bump-files.md diff --git a/.bumpy/fix-delete-empty-bump-files.md b/.bumpy/fix-delete-empty-bump-files.md new file mode 100644 index 0000000..4c0995c --- /dev/null +++ b/.bumpy/fix-delete-empty-bump-files.md @@ -0,0 +1,5 @@ +--- +'@varlock/bumpy': patch +--- + +Fix empty bump files not being deleted during versioning