Merge remote-tracking branch 'origin/main' into esm

Andarist · Andarist · commit b76eda77a9db · 2025-05-16T11:37:57.000+02:00
diff --git a/.changeset/big-cougars-mate.md b/.changeset/big-cougars-mate.md
@@ -0,0 +1,10 @@
+---
+"@changesets/action": patch
+---
+
+Fix PRs sometimes not getting reopened with `commitMode: github-api`
+
+There was a race-condition that means sometimes existing PRs would not be found,
+and new PRs would be opened. This has now been fixed by fetching existing PRs
+before making any changes.
+
diff --git a/.changeset/lemon-garlics-sell.md b/.changeset/lemon-garlics-sell.md
@@ -0,0 +1,5 @@
+---
+"@changesets/action": patch
+---
+
+Fixed situations in which `cwd` was specified as a relative path and used with (default) `commitMode: git-cli`
diff --git a/.changeset/sour-elephants-switch.md b/.changeset/sour-elephants-switch.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Changesets team and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",
     "@actions/github": "^6.0.1",
-    "@changesets/ghcommit": "1.4.0",
+    "@changesets/ghcommit": "^2.0.0",
     "@changesets/pre": "^2.0.2",
     "@changesets/read": "^0.6.5",
     "@manypkg/get-packages": "^1.1.3",
diff --git a/src/git.ts b/src/git.ts
@@ -117,7 +117,7 @@ export class Git {
         base: {
           commit: github.context.sha,
         },
-        addFromDirectory,
+        cwd: this.cwd,
         force: true,
       });
     }
diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,6 @@
 import * as core from "@actions/core";
 import fs from "node:fs/promises";
+import path from "node:path";
 import { Git } from "./git.ts";
 import { setupOctokit } from "./octokit.ts";
 import readChangesetState from "./readChangesetState.ts";
@@ -16,12 +17,7 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
     return;
   }
 
-  const inputCwd = getOptionalInput("cwd");
-  if (inputCwd) {
-    core.info("changing directory to the one given as the input");
-    process.chdir(inputCwd);
-  }
-  const cwd = inputCwd || process.cwd();
+  const cwd = path.resolve(getOptionalInput("cwd") ?? "");
 
   const octokit = setupOctokit(githubToken);
   const commitMode = getOptionalInput("commitMode") ?? "git-cli";
diff --git a/src/run.ts b/src/run.ts
@@ -327,15 +327,22 @@ export async function runVersion({
     !!preState ? ` (${preState.tag})` : ""
   }`;
 
-  await git.pushChanges({ branch: versionBranch, message: finalCommitMessage });
-
-  let existingPullRequests = await octokit.rest.pulls.list({
+  /**
+   * Fetch any existing pull requests that are open against the branch,
+   * before we push any changes that may inadvertently close the existing PRs.
+   * 
+   * (`@changesets/ghcommit` has to reset the branch to the same commit as the base,
+   * which GitHub will then react to by closing the PRs)
+   */
+  const existingPullRequests = await octokit.rest.pulls.list({
     ...github.context.repo,
     state: "open",
     head: `${github.context.repo.owner}:${versionBranch}`,
     base: branch,
   });
-  core.info(JSON.stringify(existingPullRequests.data, null, 2));
+  core.info(`Existing pull requests: ${JSON.stringify(existingPullRequests.data, null, 2)}`);
+
+  await git.pushChanges({ branch: versionBranch, message: finalCommitMessage });
 
   const changedPackagesInfo = (await changedPackagesInfoPromises)
     .filter((x) => x)
diff --git a/yarn.lock b/yarn.lock
@@ -212,10 +212,10 @@
   resolved "https://registry.yarnpkg.com/@changesets/get-version-range-type/-/get-version-range-type-0.4.0.tgz#429a90410eefef4368502c41c63413e291740bf5"
   integrity sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==
 
-"@changesets/ghcommit@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@changesets/ghcommit/-/ghcommit-1.4.0.tgz#61a8bcdad1e78140ad69b6c6980e9c82471c8993"
-  integrity sha512-gG4QZsMwply4wFxqjfO7oI70lAb579zRbKB2EgjkVo+olWzXvmcQb52zkLpL3L9+QrAGD0QP8fNER9Wn3CmcHw==
+"@changesets/ghcommit@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@changesets/ghcommit/-/ghcommit-2.0.0.tgz#a3d8f733ad7ec9bb1f17c7dc0b64c3f62636305f"
+  integrity sha512-UFS7mCjh3B8KfiDQi6JbZNDoANdTqLgBKHCwMASZ25A3yfxaFVKURGzwdMdlcYx5k6dHN1igDHzgXuwOyZ9xKg==
   dependencies:
     isomorphic-git "^1.27.1"
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@changesets/action": patch
 +---
++
 +Fixed situations in which `cwd` was specified as a relative path and used with (default) `commitMode: git-cli`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ export class Git {`
`117`	`117`	`base: {`
`118`	`118`	`commit: github.context.sha,`
`119`	`119`	`},`
`120`		`- addFromDirectory,`
	`120`	`+ cwd: this.cwd,`
`121`	`121`	`force: true,`
`122`	`122`	`});`
`123`	`123`	`}`