@ucdjs/release-scripts 0.1.0-beta.55 → 0.1.0-beta.57

package/dist/index.mjs

@@ -466,9 +466,11 @@ const DEFAULT_CHANGELOG_TEMPLATE = dedent`
   <% } else { -%>
   ## <%= it.version %> (<%= it.date %>)
   <% } %>
+  <% let hasCommits = false; %>
 
   <% it.groups.forEach((group) => { %>
   <% if (group.commits.length > 0) { %>
+  <% hasCommits = true; %>
 
   ### <%= group.title %>
   <% group.commits.forEach((commit) => { %>
@@ -478,6 +480,12 @@ const DEFAULT_CHANGELOG_TEMPLATE = dedent`
 
   <% } %>
   <% }); %>
+
+  <% if (!hasCommits) { %>
+  *No significant changes*
+
+  ##### &nbsp;&nbsp;&nbsp;&nbsp;[View changes on GitHub](<%= it.compareUrl %>)
+  <% } %>
 `;
 const DEFAULT_TYPES = {
 	feat: { title: "🚀 Features" },
@@ -1356,6 +1364,23 @@ async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggested
 	if (prereleaseVersion) return prereleaseVersion;
 	return getNextVersion(pkg.version, answers.version);
 }
+async function confirmOverridePrompt(pkg, overrideVersion) {
+	const response = await prompts({
+		type: "select",
+		name: "choice",
+		message: `${pkg.name}: use override version ${farver.bold(overrideVersion)}?`,
+		choices: [{
+			title: "use override",
+			value: "use"
+		}, {
+			title: "pick another version",
+			value: "pick"
+		}],
+		initial: 0
+	});
+	if (!response.choice) return null;
+	return response.choice;
+}
 
 //#endregion
 //#region src/core/workspace.ts
@@ -1883,16 +1908,33 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 		const effectiveBump = override?.type || determinedBump;
 		const canPrompt = !isCI && showPrompt;
 		if (effectiveBump === "none" && !canPrompt) continue;
-		let newVersion = override?.version || getNextVersion(pkg.version, effectiveBump);
+		const autoVersion = getNextVersion(pkg.version, determinedBump);
+		let newVersion = override?.version || autoVersion;
 		let finalBumpType = effectiveBump;
 		if (canPrompt) {
 			logger.clearScreen();
 			logger.section(`📝 Commits for ${farver.cyan(pkg.name)}`);
 			formatCommitsForDisplay(allCommitsForPackage).split("\n").forEach((line) => logger.item(line));
 			logger.emptyLine();
+			if (override) {
+				const overrideChoice = await confirmOverridePrompt(pkg, override.version);
+				if (overrideChoice === null) continue;
+				if (overrideChoice === "use") {
+					versionUpdates.push({
+						package: pkg,
+						currentVersion: pkg.version,
+						newVersion: override.version,
+						bumpType: override.type,
+						hasDirectChanges: allCommitsForPackage.length > 0,
+						changeKind: "manual"
+					});
+					continue;
+				}
+				newVersion = autoVersion;
+			}
 			const selectedVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, newVersion, {
 				defaultChoice: override ? "suggested" : "auto",
-				suggestedHint: override ? "from override" : void 0
+				suggestedHint: override ? "auto" : void 0
 			});
 			if (selectedVersion === null) continue;
 			const userBump = calculateBumpType(pkg.version, selectedVersion);
@@ -2060,10 +2102,12 @@ async function calculateUpdates(options) {
 			overrides
 		}));
 	} catch (error) {
+		const formatted = formatUnknownError(error);
 		return err({
 			type: "git",
 			operation: "calculateUpdates",
-			message: error instanceof Error ? error.message : String(error)
+			message: formatted.message,
+			stderr: formatted.stderr
 		});
 	}
 }
@@ -2214,10 +2258,7 @@ async function prepareWorkflow(options) {
 					}
 				}
 				const allCommits = [...pkgCommits, ...globalCommits];
-				if (allCommits.length === 0) {
-					logger.verbose(`No commits for ${update.package.name}, skipping changelog`);
-					return;
-				}
+				if (allCommits.length === 0) logger.verbose(`No commits for ${update.package.name}, writing changelog entry with no-significant-commits note`);
 				logger.verbose(`Updating changelog for ${farver.cyan(update.package.name)}`);
 				await updateChangelog({
 					normalizedOptions: {
@@ -2422,6 +2463,8 @@ async function getReleaseBodyFromChangelog(workspaceRoot, packageName, packagePa
 			"",
 			`Expected version ${version} in ${changelogPath}.`
 		].join("\n");
+		const lines = entry.content.trim().split("\n");
+		if (lines[0]?.trim().startsWith("## ")) return lines.slice(1).join("\n").trim();
 		return entry.content.trim();
 	} catch {
 		logger.verbose(`Could not read changelog entry for ${version} at ${changelogPath}`);

package/package.json

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