@ucdjs/release-scripts 0.0.0 → 0.1.0-beta.2

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
@@ -717,8 +738,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");

package/package.json

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