@ucdjs/release-scripts 0.1.0-beta.10 → 0.1.0-beta.11

package/dist/index.d.mts

@@ -101,10 +101,16 @@ declare function publish(_options: PublishOptions): void;
 //#endregion
 //#region src/release.d.ts
 interface ReleaseOptions extends SharedOptions {
-  /**
-   * Branch name for the release PR (defaults to "release/next")
-   */
-  releaseBranch?: string;
+  branch?: {
+    /**
+     * Branch name for the release PR (defaults to "release/next")
+     */
+    release?: string;
+    /**
+     * Default branch name (e.g., "main")
+     */
+    default?: string;
+  };
   /**
    * Whether to perform a dry run (no changes pushed or PR created)
    * @default false

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { t as Eta } from "./eta-Boh7yPZi.mjs";
+import farver from "farver";
 import { getCommits } from "commit-parser";
 import process from "node:process";
-import farver from "farver";
 import { exec } from "tinyexec";
 import { dedent } from "@luxass/utils";
 import { join } from "node:path";
@@ -380,6 +380,15 @@ async function pushBranch(branch, workspaceRoot, options) {
 		exitWithError(`Failed to push branch: ${branch}`, `Make sure you have permission to push to the remote repository`);
 	}
 }
+async function getDefaultBranch() {
+	try {
+		const match = (await run("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], { nodeOptions: { stdio: "pipe" } })).stdout.trim().match(/^refs\/remotes\/origin\/(.+)$/);
+		if (match && match[1]) return match[1];
+		return "main";
+	} catch {
+		return "main";
+	}
+}
 
 //#endregion
 //#region src/github.ts
@@ -828,7 +837,9 @@ function shouldIncludePackage(pkg, options) {
 async function release(options) {
 	const normalizedOptions = normalizeSharedOptions(options);
 	normalizedOptions.dryRun ??= false;
-	normalizedOptions.releaseBranch ??= "release/next";
+	normalizedOptions.branch ??= {};
+	normalizedOptions.branch.release ??= "release/next";
+	normalizedOptions.branch.default = await getDefaultBranch();
 	normalizedOptions.safeguards ??= true;
 	globalOptions.dryRun = normalizedOptions.dryRun;
 	const workspaceRoot = normalizedOptions.workspaceRoot;
@@ -842,33 +853,34 @@ async function release(options) {
 	if (versionUpdates.length === 0) logger.warn("No packages have changes requiring a release");
 	const allUpdates = createDependentUpdates(buildPackageDependencyGraph(workspacePackages), workspacePackages, versionUpdates);
 	const currentBranch = await getCurrentBranch(workspaceRoot);
+	if (currentBranch !== normalizedOptions.branch.default) exitWithError(`Current branch is '${currentBranch}'. Please switch to the default branch '${normalizedOptions.branch.default}' before proceeding.`, `git checkout ${normalizedOptions.branch.default}`);
 	const existingPullRequest = await getExistingPullRequest({
 		owner: normalizedOptions.owner,
 		repo: normalizedOptions.repo,
-		branch: normalizedOptions.releaseBranch,
+		branch: normalizedOptions.branch.release,
 		githubToken: normalizedOptions.githubToken
 	});
 	const prExists = !!existingPullRequest;
 	if (prExists) logger.log("Existing pull request found:", existingPullRequest.html_url);
 	else logger.log("No existing pull request found, will create new one");
-	const branchExists = await doesBranchExist(normalizedOptions.releaseBranch, workspaceRoot);
+	const branchExists = await doesBranchExist(normalizedOptions.branch.release, workspaceRoot);
 	if (!branchExists) {
-		logger.log("Creating release branch:", normalizedOptions.releaseBranch);
-		await createBranch(normalizedOptions.releaseBranch, currentBranch, workspaceRoot);
+		logger.log("Creating release branch:", normalizedOptions.branch.release);
+		await createBranch(normalizedOptions.branch.release, normalizedOptions.branch.default, workspaceRoot);
 	}
-	if (!await checkoutBranch(normalizedOptions.releaseBranch, workspaceRoot)) throw new Error(`Failed to checkout branch: ${normalizedOptions.releaseBranch}`);
+	if (!await checkoutBranch(normalizedOptions.branch.release, workspaceRoot)) throw new Error(`Failed to checkout branch: ${normalizedOptions.branch.release}`);
 	if (branchExists) {
 		logger.log("Pulling latest changes from remote");
-		if (!await pullLatestChanges(normalizedOptions.releaseBranch, workspaceRoot)) logger.log("Warning: Failed to pull latest changes, continuing anyway");
+		if (!await pullLatestChanges(normalizedOptions.branch.release, workspaceRoot)) logger.log("Warning: Failed to pull latest changes, continuing anyway");
 	}
-	logger.log("Rebasing release branch onto", currentBranch);
-	await rebaseBranch(currentBranch, workspaceRoot);
+	logger.log("Rebasing release branch onto", normalizedOptions.branch.default);
+	await rebaseBranch(normalizedOptions.branch.default, workspaceRoot);
 	await updateAllPackageJsonFiles(allUpdates);
 	const hasCommitted = await commitChanges("chore: update release versions", workspaceRoot);
-	const isBranchAhead = await isBranchAheadOfRemote(normalizedOptions.releaseBranch, workspaceRoot);
+	const isBranchAhead = await isBranchAheadOfRemote(normalizedOptions.branch.release, workspaceRoot);
 	if (!hasCommitted && !isBranchAhead) {
 		logger.log("No changes to commit and branch is in sync with remote");
-		await checkoutBranch(currentBranch, workspaceRoot);
+		await checkoutBranch(normalizedOptions.branch.default, workspaceRoot);
 		if (prExists) {
 			logger.log("No updates needed, PR is already up to date");
 			return {
@@ -882,7 +894,7 @@ async function release(options) {
 		}
 	}
 	logger.log("Pushing changes to remote");
-	await pushBranch(normalizedOptions.releaseBranch, workspaceRoot, { forceWithLease: true });
+	await pushBranch(normalizedOptions.branch.release, workspaceRoot, { forceWithLease: true });
 	const prTitle = existingPullRequest?.title || options.pullRequest?.title || "chore: update package versions";
 	const prBody = generatePullRequestBody(allUpdates, options.pullRequest?.body);
 	const pullRequest = await upsertPullRequest({
@@ -891,12 +903,16 @@ async function release(options) {
 		pullNumber: existingPullRequest?.number,
 		title: prTitle,
 		body: prBody,
-		head: normalizedOptions.releaseBranch,
-		base: currentBranch,
+		head: normalizedOptions.branch.release,
+		base: normalizedOptions.branch.default,
 		githubToken: normalizedOptions.githubToken
 	});
 	logger.log(prExists ? "Updated pull request:" : "Created pull request:", pullRequest?.html_url);
-	await checkoutBranch(currentBranch, workspaceRoot);
+	await checkoutBranch(normalizedOptions.branch.default, workspaceRoot);
+	if (pullRequest?.html_url) {
+		logger.info();
+		logger.info(`${farver.green("✓")} Pull request ${prExists ? "updated" : "created"}: ${farver.cyan(pullRequest.html_url)}`);
+	}
 	return {
 		updates: allUpdates,
 		prUrl: pullRequest?.html_url,

package/package.json

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