@ucdjs/release-scripts 0.1.0-beta.1 → 0.1.0-beta.3

package/dist/index.d.mts

@@ -99,6 +99,10 @@ interface ReleaseOptions {
    * GitHub token for authentication
    */
   githubToken: string;
+  pullRequest?: {
+    title: string;
+    body: string;
+  };
 }
 interface ReleaseResult {
   /**

package/dist/index.mjs

@@ -342,6 +342,27 @@ async function rebaseBranch(ontoBranch, workspaceRoot) {
 	await run("git", ["rebase", ontoBranch], { nodeOptions: { cwd: workspaceRoot } });
 }
 /**
+* Check if local branch is ahead of remote (has commits to push)
+* @param branch - The branch name to check
+* @param workspaceRoot - The root directory of the workspace
+* @returns Promise resolving to true if local is ahead, false otherwise
+*/
+async function isBranchAheadOfRemote(branch, workspaceRoot) {
+	try {
+		const result = await run("git", [
+			"rev-list",
+			`origin/${branch}..${branch}`,
+			"--count"
+		], { nodeOptions: {
+			cwd: workspaceRoot,
+			stdio: "pipe"
+		} });
+		return Number.parseInt(result.stdout.trim(), 10) > 0;
+	} catch {
+		return true;
+	}
+}
+/**
 * Check if there are any changes to commit (staged or unstaged)
 * @param workspaceRoot - The root directory of the workspace
 * @returns Promise resolving to true if there are changes, false otherwise
@@ -386,34 +407,6 @@ async function pushBranch(branch, workspaceRoot, options) {
 	else if (options?.force) args.push("--force");
 	await run("git", args, { nodeOptions: { cwd: workspaceRoot } });
 }
-/**
-* Generate PR body from version updates
-* @param updates - Array of version updates to include in the PR body
-* @returns Formatted PR body as a string
-*/
-function generatePRBody(updates) {
-	const lines = [];
-	lines.push("## Packages");
-	lines.push("");
-	const directChanges = updates.filter((u) => u.hasDirectChanges);
-	const dependencyUpdates = updates.filter((u) => !u.hasDirectChanges);
-	if (directChanges.length > 0) {
-		lines.push("### Direct Changes");
-		lines.push("");
-		for (const update of directChanges) lines.push(`- **${update.package.name}**: ${update.currentVersion} → ${update.newVersion} (${update.bumpType})`);
-		lines.push("");
-	}
-	if (dependencyUpdates.length > 0) {
-		lines.push("### Dependency Updates");
-		lines.push("");
-		for (const update of dependencyUpdates) lines.push(`- **${update.package.name}**: ${update.currentVersion} → ${update.newVersion} (dependencies changed)`);
-		lines.push("");
-	}
-	lines.push("---");
-	lines.push("");
-	lines.push("This release PR was automatically generated.");
-	return lines.join("\n");
-}
 
 //#endregion
 //#region src/github.ts
@@ -481,6 +474,29 @@ async function upsertPullRequest({ owner, repo, title, body, head, base, pullNum
 		throw err;
 	}
 }
+function generatePullRequestBody(updates, _body) {
+	const lines = [];
+	lines.push("## Packages");
+	lines.push("");
+	const directChanges = updates.filter((u) => u.hasDirectChanges);
+	const dependencyUpdates = updates.filter((u) => !u.hasDirectChanges);
+	if (directChanges.length > 0) {
+		lines.push("### Direct Changes");
+		lines.push("");
+		for (const update of directChanges) lines.push(`- **${update.package.name}**: ${update.currentVersion} → ${update.newVersion} (${update.bumpType})`);
+		lines.push("");
+	}
+	if (dependencyUpdates.length > 0) {
+		lines.push("### Dependency Updates");
+		lines.push("");
+		for (const update of dependencyUpdates) lines.push(`- **${update.package.name}**: ${update.currentVersion} → ${update.newVersion} (dependencies changed)`);
+		lines.push("");
+	}
+	lines.push("---");
+	lines.push("");
+	lines.push("This release PR was automatically generated.");
+	return lines.join("\n");
+}
 
 //#endregion
 //#region src/prompts.ts
@@ -717,8 +733,10 @@ async function release(options) {
 	console.log("Rebasing release branch onto", currentBranch);
 	await rebaseBranch(currentBranch, workspaceRoot);
 	await updatePackageJsonFiles(allUpdates);
-	if (!await commitChanges("chore: update release versions", workspaceRoot)) {
-		console.log("No changes to commit");
+	const hasCommitted = await commitChanges("chore: update release versions", workspaceRoot);
+	const isBranchAhead = await isBranchAheadOfRemote(releaseBranch, workspaceRoot);
+	if (!hasCommitted && !isBranchAhead) {
+		console.log("No changes to commit and branch is in sync with remote");
 		await checkoutBranch(currentBranch, workspaceRoot);
 		if (prExists) {
 			console.log("No updates needed, PR is already up to date");
@@ -734,8 +752,8 @@ async function release(options) {
 	}
 	console.log("Pushing changes to remote");
 	await pushBranch(releaseBranch, workspaceRoot, { forceWithLease: true });
-	const prTitle = existingPullRequest?.title || "Release: Update package versions";
-	const prBody = generatePRBody(allUpdates);
+	const prTitle = existingPullRequest?.title || options.pullRequest?.title || "chore: update package versions";
+	const prBody = generatePullRequestBody(allUpdates, options.pullRequest?.body);
 	const pullRequest = await upsertPullRequest({
 		owner,
 		repo,

package/package.json

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