@ucdjs/release-scripts 0.1.0-beta.18 → 0.1.0-beta.19

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as Eta } from "./eta-j5TFRbI4.mjs";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join, relative } from "node:path";
 import process from "node:process";
 import readline from "node:readline";
@@ -9,7 +9,7 @@ import { exec } from "tinyexec";
 import { dedent } from "@luxass/utils";
 import { getCommits, groupByType } from "commit-parser";
 import prompts from "prompts";
-import { gt } from "semver";
+import { compare, gt } from "semver";
 
 //#region src/publish.ts
 function publish(_options) {}
@@ -1030,9 +1030,6 @@ function getNextVersion(currentVersion, bump) {
 	}
 	return `${newMajor}.${newMinor}.${newPatch}`;
 }
-/**
-* Create a version update object
-*/
 function createVersionUpdate(pkg, bump, hasDirectChanges) {
 	const newVersion = getNextVersion(pkg.version, bump);
 	return {
@@ -1098,9 +1095,6 @@ function formatCommitsForDisplay(commits) {
 	if (hasMore) return `${formattedCommits}\n  ${farver.dim(`... and ${commits.length - maxCommitsToShow} more commits`)}`;
 	return formattedCommits;
 }
-/**
-* Calculate version updates for packages based on their commits
-*/
 async function calculateVersionUpdates({ workspacePackages, packageCommits, workspaceRoot, showPrompt, globalCommitsPerPackage, overrides: initialOverrides = {} }) {
 	const versionUpdates = [];
 	const processedPackages = /* @__PURE__ */ new Set();
@@ -1122,9 +1116,11 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 		const globalCommits = globalCommitsPerPackage.get(pkgName) || [];
 		const allCommitsForPackage = [...pkgCommits, ...globalCommits];
 		const determinedBump = determineHighestBump(allCommitsForPackage);
-		const effectiveBump = newOverrides[pkgName] || determinedBump;
+		const override = newOverrides[pkgName];
+		const effectiveBump = override?.type || determinedBump;
 		if (effectiveBump === "none") continue;
-		let newVersion = getNextVersion(pkg.version, effectiveBump);
+		let newVersion = override?.version || getNextVersion(pkg.version, effectiveBump);
+		let finalBumpType = effectiveBump;
 		if (!isCI && showPrompt) {
 			logger.clearScreen();
 			logger.section(`📝 Commits for ${farver.cyan(pkg.name)}`);
@@ -1133,8 +1129,12 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 			const selectedVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, newVersion);
 			if (selectedVersion === null) continue;
 			const userBump = _calculateBumpType(pkg.version, selectedVersion);
+			finalBumpType = userBump;
 			if (bumpRanks[userBump] < bumpRanks[determinedBump]) {
-				newOverrides[pkgName] = userBump;
+				newOverrides[pkgName] = {
+					type: userBump,
+					version: selectedVersion
+				};
 				logger.info(`Version override recorded for ${pkgName}: ${determinedBump} → ${userBump}`);
 			} else if (newOverrides[pkgName] && bumpRanks[userBump] >= bumpRanks[determinedBump]) {
 				delete newOverrides[pkgName];
@@ -1146,7 +1146,7 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 			package: pkg,
 			currentVersion: pkg.version,
 			newVersion,
-			bumpType: effectiveBump,
+			bumpType: finalBumpType,
 			hasDirectChanges: allCommitsForPackage.length > 0
 		});
 	}
@@ -1507,7 +1507,7 @@ async function release(options) {
 		pullRequestBody: options.pullRequest?.body
 	});
 	await prOps.prepareBranch();
-	const overridesPath = join(workspaceRoot, ".github", "ucdjs.release.overrides.json");
+	const overridesPath = join(workspaceRoot, ".github", "ucdjs-release.overrides.json");
 	let existingOverrides = {};
 	try {
 		const overridesContent = await readFile(overridesPath, "utf-8");
@@ -1534,11 +1534,31 @@ async function release(options) {
 			logger.error("Failed to write version overrides file:", e);
 		}
 	}
+	if (Object.keys(newOverrides).length === 0 && Object.keys(existingOverrides).length > 0) {
+		let shouldRemoveOverrides = false;
+		for (const update of allUpdates) {
+			const overriddenVersion = existingOverrides[update.package.name];
+			if (overriddenVersion) {
+				if (compare(update.newVersion, overriddenVersion.version) > 0) {
+					shouldRemoveOverrides = true;
+					break;
+				}
+			}
+		}
+		if (shouldRemoveOverrides) {
+			logger.info("Removing obsolete version overrides file...");
+			try {
+				await rm(overridesPath);
+				logger.success("Successfully removed obsolete version overrides file.");
+			} catch (e) {
+				logger.error("Failed to remove obsolete version overrides file:", e);
+			}
+		}
+	}
 	if (allUpdates.filter((u) => u.hasDirectChanges).length === 0) logger.warn("No packages have changes requiring a release");
 	logger.section("🔄 Version Updates");
 	logger.item(`Updating ${allUpdates.length} packages (including dependents)`);
 	for (const update of allUpdates) logger.item(`${update.package.name}: ${update.currentVersion} → ${update.newVersion}`);
-	await prOps.prepareBranch();
 	await applyUpdates();
 	if (normalizedOptions.changelog.enabled) {
 		logger.step("Updating changelogs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/release-scripts",
-  "version": "0.1.0-beta.18",
+  "version": "0.1.0-beta.19",
   "description": "@ucdjs release scripts",
   "type": "module",
   "license": "MIT",