Fix create release PR to cherry-pick commits

Signed-off-by: Sebastian Malton <sebastian@malton.name>

scripts/.gitignore

@@ -0,0 +1,2 @@
+*.mjs
+*.map

scripts/.swcrc

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://json.schemastore.org/swcrc",
+  "jsc": {
+    "parser": {
+      "syntax": "typescript"
+    },
+    "target": "es2022"
+  }
+}

scripts/create-release-pr.ts

@@ -1,16 +1,14 @@
-#!/usr/bin/env node
 /**
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-
-// This script creates a release PR
-import { execSync, exec, spawn } from "child_process";
+import { exec, spawn } from "child_process";
 import commandLineArgs from "command-line-args";
 import fse from "fs-extra";
 import { basename } from "path";
+import { createInterface } from "readline";
 import semver from "semver";
-import { promisify } from "util";
+import { inspect, promisify } from "util";
 
 const {
   SemVer,
@@ -18,7 +16,6 @@ const {
   rcompare: semverRcompare,
   lte: semverLte,
 } = semver;
-const { readJsonSync } = fse;
 const execP = promisify(exec);
 
 const options = commandLineArgs([
@@ -82,17 +79,17 @@ if (basename(process.cwd()) === "scripts") {
 }
 
 
-const currentVersion = new SemVer(readJsonSync("./package.json").version);
+const currentVersion = new SemVer((await fse.readJson("./package.json")).version);
 
 console.log(`current version: ${currentVersion.format()}`);
 console.log("fetching tags...");
-execSync("git fetch --tags --force");
+await execP("git fetch --tags --force");
 
-const actualTags = execSync("git tag --list", { encoding: "utf-8" }).split(/\r?\n/).map(line => line.trim());
+const actualTags = (await execP("git tag --list", { encoding: "utf-8" })).stdout.split(/\r?\n/).map(line => line.trim());
 const [previousReleasedVersion] = actualTags
-  .map(semverValid)
-  .filter(Boolean)
-  .sort(semverRcompare)
+  .map((value) => semverValid(value))
+  .filter((v): v is string => typeof v === "string")
+  .sort((l, r) => semverRcompare(l, r))
   .filter(version => semverLte(version, currentVersion));
 
 const npmVersionArgs = [
@@ -107,9 +104,9 @@ if (options.preid) {
 
 npmVersionArgs.push("--git-tag-version false");
 
-execSync(npmVersionArgs.join(" "), { stdio: "ignore" });
+await execP(npmVersionArgs.join(" "));
 
-const newVersion = new SemVer(readJsonSync("./package.json").version);
+const newVersion = new SemVer((await fse.readJson("./package.json")).version);
 const newVersionMilestone = `${newVersion.major}.${newVersion.minor}.${newVersion.patch}`;
 
 console.log(`new version: ${newVersion.format()}`);
@@ -121,11 +118,35 @@ const getMergedPrsArgs = [
   "--limit=500", // Should be big enough, if not we need to release more often ;)
   "--state=merged",
   "--base=master",
-  "--json mergeCommit,title,author,labels,number,milestone",
+  "--json mergeCommit,title,author,labels,number,milestone,mergedAt",
 ];
 
+interface GithubPrData {
+  author: {
+    login: string;
+  };
+  labels: {
+    id: string;
+    name: string;
+    description: string;
+    color: string;
+  }[];
+  mergeCommit: {
+    oid: string;
+  };
+  mergedAt: string;
+  milestone: {
+    number: number;
+    title: string;
+    description: string;
+    dueOn: null | string;
+  };
+  number: number;
+  title: string;
+}
+
 console.log("retreiving last 500 PRs to create release PR body...");
-const mergedPrs = JSON.parse(execSync(getMergedPrsArgs.join(" "), { encoding: "utf-8" }));
+const mergedPrs = JSON.parse((await execP(getMergedPrsArgs.join(" "), { encoding: "utf-8" })).stdout) as GithubPrData[];
 const milestoneRelevantPrs = mergedPrs.filter(pr => pr.milestone?.title === newVersionMilestone);
 const relaventPrsQuery = await Promise.all(
   milestoneRelevantPrs.map(async pr => ({
@@ -136,7 +157,24 @@ const relaventPrsQuery = await Promise.all(
 const relaventPrs = relaventPrsQuery
   .filter(query => query.stdout)
   .map(query => query.pr)
-  .filter(pr => pr.labels.every(label => label.name !== "skip-changelog"));
+  .filter(pr => pr.labels.every(label => label.name !== "skip-changelog"))
+  .map(pr => ({ ...pr, mergedAt: new Date(pr.mergedAt) }))
+  .sort((left, right) => {
+    const leftAge = left.mergedAt.valueOf();
+    const rightAge = right.mergedAt.valueOf();
+
+    if (leftAge === rightAge) {
+      return 0;
+    }
+
+    if (leftAge > rightAge) {
+      return 1;
+    }
+
+    return -1;
+  });
+
+console.log(inspect(relaventPrs, false, null, true));
 
 const enhancementPrLabelName = "enhancement";
 const bugfixPrLabelName = "bug";
@@ -199,6 +237,28 @@ const createPrArgs = [
   "--body-file", "-",
 ];
 
+const rl = createInterface(process.stdin);
+
+if (prBase !== "master") {
+  console.log("Cherry-picking commits to current branch");
+
+  for (const pr of relaventPrs) {
+    try {
+      const promise = execP(`git cherry-pick ${pr.mergeCommit.oid}`);
+
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      promise.child.stdout!.pipe(process.stdout);
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      promise.child.stderr!.pipe(process.stderr);
+
+      await promise;
+    } catch {
+      console.error(`Failed to cherry-pick ${pr.mergeCommit.oid}, please resolve conflicts and then press enter here:`);
+      await new Promise<void>(resolve => rl.on("line", () => resolve()));
+    }
+  }
+}
+
 const createPrProcess = spawn("gh", createPrArgs, { stdio: "pipe" });
 let result = "";
 
@@ -207,7 +267,7 @@ createPrProcess.stdout.on("data", (chunk) => result += chunk);
 createPrProcess.stdin.write(prBody);
 createPrProcess.stdin.end();
 
-await new Promise((resolve) => {
+await new Promise<void>((resolve) => {
   createPrProcess.on("close", () => {
     createPrProcess.stdout.removeAllListeners();
     resolve();