@ucdjs/release-scripts 0.1.0-beta.28 → 0.1.0-beta.29

package/dist/index.mjs

@@ -344,6 +344,14 @@ var GitService = class extends Effect.Service()("@ucdjs/release-scripts/GitServi
 				message
 			]);
 		}
+		function writeEmptyCommit(message) {
+			return execGitCommandIfNotDry([
+				"commit",
+				"--allow-empty",
+				"-m",
+				message
+			]);
+		}
 		function pushChanges(branch, remote = "origin") {
 			return execGitCommandIfNotDry([
 				"push",
@@ -459,6 +467,7 @@ var GitService = class extends Effect.Service()("@ucdjs/release-scripts/GitServi
 			commits: {
 				stage: stageChanges,
 				write: writeCommit,
+				writeEmpty: writeEmptyCommit,
 				push: pushChanges,
 				forcePush: forcePushChanges,
 				get: getCommits,
@@ -1179,34 +1188,23 @@ function constructPrepareProgram(config) {
 		const versionCalculator = yield* VersionCalculatorService;
 		const workspace = yield* WorkspaceService;
 		yield* git.workspace.assertWorkspaceReady;
-		if (!(yield* git.branches.exists(config.branch.release))) {
+		let releasePullRequest = yield* github.getPullRequestByBranch(config.branch.release);
+		const isNewRelease = !releasePullRequest;
+		const branchExists = yield* git.branches.exists(config.branch.release);
+		if (!branchExists) {
 			yield* Console.log(`🌿 Creating release branch "${config.branch.release}" from "${config.branch.default}"...`);
 			yield* git.branches.create(config.branch.release, config.branch.default);
 			yield* Console.log(`✅ Release branch created.`);
 		}
-		let releasePullRequest = yield* github.getPullRequestByBranch(config.branch.release);
-		if (!releasePullRequest) {
-			yield* Console.log(`📋 Creating release pull request...`);
-			yield* git.branches.checkout(config.branch.release);
-			yield* git.commits.push(config.branch.release);
-			releasePullRequest = yield* github.createPullRequest({
-				title: config.pullRequest.title,
-				body: config.pullRequest.body,
-				head: config.branch.release,
-				base: config.branch.default,
-				draft: true
-			});
-			yield* Console.log(`✅ Release pull request #${releasePullRequest.number} created.`);
-		}
-		if (!releasePullRequest.head) return yield* Effect.fail(/* @__PURE__ */ new Error(`Release pull request for branch "${config.branch.release}" has no head SHA.`));
-		yield* Console.log(`✅ Release pull request #${releasePullRequest.number} exists.`);
 		if ((yield* git.branches.get) !== config.branch.release) {
 			yield* git.branches.checkout(config.branch.release);
 			yield* Console.log(`✅ Checked out to release branch "${config.branch.release}".`);
 		}
-		yield* Console.log(`🔄 Rebasing "${config.branch.release}" onto "${config.branch.default}"...`);
-		yield* git.branches.rebase(config.branch.default);
-		yield* Console.log(`✅ Rebase complete.`);
+		if (!isNewRelease || branchExists) {
+			yield* Console.log(`🔄 Rebasing "${config.branch.release}" onto "${config.branch.default}"...`);
+			yield* git.branches.rebase(config.branch.default);
+			yield* Console.log(`✅ Rebase complete.`);
+		}
 		const overrides = yield* loadOverrides({
 			sha: config.branch.default,
 			overridesPath: ".github/ucdjs-release.overrides.json"
@@ -1249,17 +1247,30 @@ ${releases.map((r) => `  - ${r.package.name}@${r.newVersion}`).join("\n")}`;
 		yield* Console.log("💾 Creating commit...");
 		yield* git.commits.write(commitMessage);
 		yield* Console.log("✅ Commit created.");
-		yield* Console.log(`⬆️  Force pushing to "${config.branch.release}"...`);
-		yield* git.commits.forcePush(config.branch.release);
-		yield* Console.log("✅ Force push complete.");
-		yield* Console.log("📄 Updating pull request...");
+		yield* Console.log(`⬆️  Pushing to "${config.branch.release}"...`);
+		if (isNewRelease && !branchExists) yield* git.commits.push(config.branch.release);
+		else yield* git.commits.forcePush(config.branch.release);
+		yield* Console.log(`✅ Push complete.`);
 		const prBody = yield* github.generateReleasePRBody(releases.map((r) => ({
 			packageName: r.package.name,
 			version: r.newVersion,
 			previousVersion: r.package.version
 		})));
-		yield* github.updatePullRequest(releasePullRequest.number, { body: prBody });
-		yield* Console.log("✅ Pull request updated.");
+		if (isNewRelease) {
+			yield* Console.log("📋 Creating release pull request...");
+			releasePullRequest = yield* github.createPullRequest({
+				title: config.pullRequest.title,
+				body: prBody,
+				head: config.branch.release,
+				base: config.branch.default,
+				draft: true
+			});
+			yield* Console.log(`✅ Release pull request #${releasePullRequest.number} created.`);
+		} else {
+			yield* Console.log("📄 Updating pull request...");
+			yield* github.updatePullRequest(releasePullRequest.number, { body: prBody });
+			yield* Console.log("✅ Pull request updated.");
+		}
 		yield* Console.log(`\n🎉 Release preparation complete! View PR: #${releasePullRequest.number}`);
 	});
 }

package/package.json

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