Merge branch 'main' into main

Author: maxprilutskiy

.changeset/funny-shoes-scream.md

@@ -63,42 +63,24 @@ export class PullRequestFlow extends InBranchFlow {
     this.ora.start(
       `Checking for existing PR with head ${i18nBranchName} and base ${this.platformKit.platformConfig.baseBranchName}`
     );
-    const existingPrNumber = await this.platformKit.getOpenPullRequestNumber({
+    let prNumber = await this.platformKit.getOpenPullRequestNumber({
       branch: i18nBranchName,
     });
-    this.ora.succeed(existingPrNumber ? "PR found" : "No PR found");
 
-    if (existingPrNumber) {
-      // Close existing PR first
-      this.ora.start(`Closing existing PR ${existingPrNumber}`);
-      await this.platformKit.closePullRequest({
-        pullRequestNumber: existingPrNumber,
-      });
-      this.ora.succeed(`Closed existing PR ${existingPrNumber}`);
-    }
-
-    // Create new PR
-    this.ora.start(`Creating new PR`);
-    const newPrNumber = await this.platformKit.createPullRequest({
-      head: i18nBranchName,
-      title: this.platformKit.config.pullRequestTitle,
-      body: this.getPrBodyContent(),
-    });
-    this.ora.succeed(`Created new PR ${newPrNumber}`);
-
-    if (existingPrNumber) {
-      // Post comment about outdated PR
-      this.ora.start(`Posting comment about outdated PR ${existingPrNumber}`);
-      await this.platformKit.commentOnPullRequest({
-        pullRequestNumber: existingPrNumber,
-        body: `This PR is now outdated. A new version has been created at ${this.platformKit.buildPullRequestUrl(
-          newPrNumber
-        )}`,
+    if (prNumber) {
+      this.ora.succeed(`Existing PR found: #${prNumber}`);
+    } else {
+      // Create new PR
+      this.ora.start(`Creating new PR`);
+      prNumber = await this.platformKit.createPullRequest({
+        head: i18nBranchName,
+        title: this.platformKit.config.pullRequestTitle,
+        body: this.getPrBodyContent(),
       });
-      this.ora.succeed(`Posted comment about outdated PR ${existingPrNumber}`);
+      this.ora.succeed(`Created new PR: #${prNumber}`);
     }
 
-    return newPrNumber;
+    return prNumber;
   }
 
   private checkoutI18nBranch(i18nBranchName: string) {

.changeset/new-buses-carry.md

@@ -1,30 +1,3 @@
-import createOra from "ora";
+import main from "./main.js";
 
-import { IIntegrationFlow } from "./flows/_base.js";
-import { PullRequestFlow } from "./flows/pull-request.js";
-import { InBranchFlow } from "./flows/in-branch.js";
-import { getPlatformKit } from "./platforms/index.js";
-
-(async function main() {
-  const ora = createOra();
-  const platformKit = getPlatformKit();
-  const { isPullRequestMode } = platformKit.config;
-
-  ora.info(`Pull request mode: ${isPullRequestMode ? "on" : "off"}`);
-
-  const flow: IIntegrationFlow = isPullRequestMode
-    ? new PullRequestFlow(ora, platformKit)
-    : new InBranchFlow(ora, platformKit);
-
-  const canRun = await flow.preRun?.();
-  if (canRun === false) {
-    return;
-  }
-
-  const hasChanges = await flow.run();
-  if (!hasChanges) {
-    return;
-  }
-
-  await flow.postRun?.();
-})();
+main();

.changeset/polite-trees-compete.md

@@ -0,0 +1,3 @@
+declare module "@lingo.dev/_action" {
+  export default function main(): Promise<void>;
+}

.changeset/serious-wasps-unite.md

@@ -0,0 +1,30 @@
+import createOra from "ora";
+
+import { IIntegrationFlow } from "./flows/_base.js";
+import { PullRequestFlow } from "./flows/pull-request.js";
+import { InBranchFlow } from "./flows/in-branch.js";
+import { getPlatformKit } from "./platforms/index.js";
+
+export default async function main() {
+  const ora = createOra();
+  const platformKit = getPlatformKit();
+  const { isPullRequestMode } = platformKit.config;
+
+  ora.info(`Pull request mode: ${isPullRequestMode ? "on" : "off"}`);
+
+  const flow: IIntegrationFlow = isPullRequestMode
+    ? new PullRequestFlow(ora, platformKit)
+    : new InBranchFlow(ora, platformKit);
+
+  const canRun = await flow.preRun?.();
+  if (canRun === false) {
+    return;
+  }
+
+  const hasChanges = await flow.run();
+  if (!hasChanges) {
+    return;
+  }
+
+  await flow.postRun?.();
+}

action/src/flows/pull-request.ts

@@ -15,7 +15,7 @@ interface BitbucketConfig {
 export class BitbucketPlatformKit extends PlatformKit<BitbucketConfig> {
   private _bb?: ReturnType<typeof Bitbucket>;
 
-  get bb() {
+  private get bb() {
     if (!this._bb) {
       this._bb = new Bitbucket({
         auth: { token: this.platformConfig.bbToken || "" },

action/src/index.ts

@@ -5,7 +5,7 @@ import Z from "zod";
 export class GitHubPlatformKit extends PlatformKit {
   private _octokit?: Octokit;
 
-  get octokit() {
+  private get octokit(): Octokit {
     if (!this._octokit) {
       this._octokit = new Octokit({ auth: this.platformConfig.ghToken });
     }