v1.4.4

.github/workflows/ci.yml

@@ -10,12 +10,12 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
-      - name: Use Node.js 20
-        uses: actions/setup-node@v4
+      - name: Use Node.js 16
+        uses: actions/setup-node@v1
         with:
-          node-version: 20.x
+          node-version: 16.x
 
       - name: Install Dependencies
         run: yarn --frozen-lockfile

.github/workflows/version-or-publish.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
-      - name: Use Node.js 20
-        uses: actions/setup-node@v4
+      - name: Use Node.js 16
+        uses: actions/setup-node@v1
         with:
-          node-version: 20.x
+          node-version: 16.x
 
       - name: Install Dependencies
         run: yarn --frozen-lockfile

CHANGELOG.md

@@ -1,37 +1,5 @@
 # @changesets/action
 
-## 1.4.9
-
-### Patch Changes
-
-- [#415](https://github.com/changesets/action/pull/415) [`57ab80c`](https://github.com/changesets/action/commit/57ab80c61104c270bebc125910ae32da3a5aca46) Thanks [@benmccann](https://github.com/benmccann)! - Improve error message when attempting to publish without publish script defined
-
-## 1.4.8
-
-### Patch Changes
-
-- [#393](https://github.com/changesets/action/pull/393) [`48ab0d2`](https://github.com/changesets/action/commit/48ab0d2f2e77ae169182d022591ef5c18c931ff2) Thanks [@s0](https://github.com/s0)! - Ensure the PR remains open when updated
-
-- [#393](https://github.com/changesets/action/pull/393) [`48ab0d2`](https://github.com/changesets/action/commit/48ab0d2f2e77ae169182d022591ef5c18c931ff2) Thanks [@s0](https://github.com/s0)! - Switch to cheaper API for querying existing PRs
-
-## 1.4.7
-
-### Patch Changes
-
-- [#255](https://github.com/changesets/action/pull/255) [`f2660aa`](https://github.com/changesets/action/commit/f2660aa7e78365f53dbeb4cfa774c1499ec6483a) Thanks [@ernestognw](https://github.com/ernestognw)! - Allow customize PR `branch` field
-
-## 1.4.6
-
-### Patch Changes
-
-- [#350](https://github.com/changesets/action/pull/350) [`9385be9`](https://github.com/changesets/action/commit/9385be9e757839189ea5ee63ec4e3caa8a6ca71b) Thanks [@m-shaka](https://github.com/m-shaka)! - Bump the used node.js from 16 to 20
-
-## 1.4.5
-
-### Patch Changes
-
-- [#282](https://github.com/changesets/action/pull/282) [`eb19e25`](https://github.com/changesets/action/commit/eb19e25e7797cf33dc2de4caa071e85a8057a0f0) Thanks [@mark-omarov](https://github.com/mark-omarov)! - Updated a few dependencies to patch the security vulnerabilities that were reported for their older versions.
-
 ## 1.4.4
 
 ### Patch Changes

README.md

@@ -16,7 +16,7 @@ This action for [Changesets](https://github.com/atlassian/changesets) creates a
 
 ### Outputs
 
-- published - A boolean value to indicate whether a publishing has happened or not
+- published - A boolean value to indicate whether a publishing is happened or not
 - publishedPackages - A JSON array to present the published packages. The format is `[{"name": "@xx/xx", "version": "1.2.0"}, {"name": "@xx/xy", "version": "0.8.9"}]`
 
 ### Example workflow:
@@ -43,10 +43,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Node.js 20
+      - name: Setup Node.js 16
         uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 16
 
       - name: Install Dependencies
         run: yarn
@@ -79,10 +79,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Node.js 20.x
+      - name: Setup Node.js 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: 20.x
+          node-version: 16.x
 
       - name: Install Dependencies
         run: yarn
@@ -124,7 +124,7 @@ For example, you can add a step before running the Changesets GitHub Action:
 
 #### Custom Publishing
 
-If you want to hook into when publishing should occur but have your own publishing functionality, you can utilize the `hasChangesets` output.
+If you want to hook into when publishing should occur but have your own publishing functionality you can utilize the `hasChangesets` output.
 
 Note that you might need to account for things already being published in your script because a commit without any new changesets can always land on your base branch after a successful publish. In such a case you need to figure out on your own how to skip over the actual publishing logic or handle errors gracefully as most package registries won't allow you to publish over already published version.
 
@@ -144,10 +144,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Node.js 20.x
+      - name: Setup Node.js 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: 20.x
+          node-version: 16.x
 
       - name: Install Dependencies
         run: yarn
@@ -188,10 +188,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Node.js 20.x
+      - name: Setup Node.js 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: 20.x
+          node-version: 16.x
 
       - name: Install Dependencies
         run: yarn

action.yml

@@ -1,7 +1,7 @@
 name: Changesets
 description: A GitHub action to automate releases with Changesets
 runs:
-  using: "node20"
+  using: "node16"
   main: "dist/index.js"
 inputs:
   publish:
@@ -28,9 +28,6 @@ inputs:
     description: "A boolean value to indicate whether to create Github releases after `publish` or not"
     required: false
     default: true
-  branch:
-    description: Sets the branch in which the action will run. Default to `github.ref_name` if not provided
-    required: false
 outputs:
   published:
     description: A boolean value to indicate whether a publishing is happened or not

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@changesets/action",
-  "version": "1.4.9",
+  "version": "1.4.4",
   "main": "dist/index.js",
   "license": "MIT",
   "devDependencies": {
@@ -10,17 +10,7 @@
     "@vercel/ncc": "^0.36.1",
     "fixturez": "^1.1.0",
     "prettier": "^2.0.5",
-    "typescript": "^5.0.4",
-    "@babel/core": "^7.13.10",
-    "@babel/preset-env": "^7.13.10",
-    "@babel/preset-typescript": "^7.13.0",
-    "@types/fs-extra": "^8.0.0",
-    "@types/jest": "^29.5.1",
-    "@types/node": "^20.11.17",
-    "@types/semver": "^7.5.0",
-    "babel-jest": "^29.5.0",
-    "husky": "^3.0.3",
-    "jest": "^29.5.0"
+    "typescript": "^5.0.4"
   },
   "scripts": {
     "build": "ncc build src/index.ts -o dist --transpile-only --minify",
@@ -31,22 +21,32 @@
     "release": "node ./scripts/release.js"
   },
   "engines": {
-    "node": ">= 20"
+    "node": ">= 16"
   },
   "dependencies": {
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
     "@actions/github": "^5.1.1",
+    "@babel/core": "^7.13.10",
+    "@babel/preset-env": "^7.13.10",
+    "@babel/preset-typescript": "^7.13.0",
     "@changesets/pre": "^1.0.9",
     "@changesets/read": "^0.5.3",
     "@manypkg/get-packages": "^1.1.3",
-    "@octokit/plugin-throttling": "^5.2.1",
+    "@octokit/plugin-throttling": "5.1.1",
+    "@types/fs-extra": "^8.0.0",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^12.7.1",
+    "@types/semver": "^6.0.2",
+    "babel-jest": "^29.5.0",
     "fs-extra": "^8.1.0",
+    "husky": "^3.0.3",
+    "jest": "^29.5.0",
     "mdast-util-to-string": "^1.0.6",
     "remark-parse": "^7.0.1",
     "remark-stringify": "^7.0.3",
     "resolve-from": "^5.0.0",
-    "semver": "^7.5.3",
+    "semver": "^6.3.0",
     "unified": "^8.3.2"
   },
   "husky": {
@@ -54,8 +54,6 @@
   },
   "prettier": {},
   "resolutions": {
-    "**/@octokit/core": "4.2.0",
-    "trim": "^0.0.3",
-    "y18n": "^4.0.1"
+    "**/@octokit/core": "4.2.0"
   }
 }

src/index.ts

@@ -48,11 +48,11 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
 
   switch (true) {
     case !hasChangesets && !hasPublishScript:
-      core.info("No changesets present or were removed by merging release PR. Not publishing because no publish script found.");
+      core.info("No changesets found");
       return;
     case !hasChangesets && hasPublishScript: {
       core.info(
-        "No changesets found. Attempting to publish any unpublished packages to npm"
+        "No changesets found, attempting to publish any unpublished packages to npm"
       );
 
       let userNpmrcPath = `${process.env.HOME}/.npmrc`;
@@ -109,7 +109,6 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
         prTitle: getOptionalInput("title"),
         commitMessage: getOptionalInput("commit"),
         hasPublishScript,
-        branch: getOptionalInput("branch"),
       });
 
       core.setOutput("pullRequestNumber", String(pullRequestNumber));

src/readChangesetState.ts

@@ -11,19 +11,17 @@ export default async function readChangesetState(
   cwd: string = process.cwd()
 ): Promise<ChangesetState> {
   let preState = await readPreState(cwd);
+  let isInPreMode = preState !== undefined && preState.mode === "pre";
+
   let changesets = await readChangesets(cwd);
 
-  if (preState !== undefined && preState.mode === "pre") {
+  if (isInPreMode) {
     let changesetsToFilter = new Set(preState.changesets);
-
-    return {
-      preState,
-      changesets: changesets.filter((x) => !changesetsToFilter.has(x.id)),
-    };
+    changesets = changesets.filter((x) => !changesetsToFilter.has(x.id));
   }
 
   return {
-    preState: undefined,
+    preState: isInPreMode ? preState : undefined,
     changesets,
   };
 }

src/run.test.ts

@@ -33,9 +33,11 @@ jest.mock("@actions/github/lib/utils", () => ({
 jest.mock("./gitUtils");
 
 let mockedGithubMethods = {
+  search: {
+    issuesAndPullRequests: jest.fn(),
+  },
   pulls: {
     create: jest.fn(),
-    list: jest.fn(),
   },
   repos: {
     createRelease: jest.fn(),
@@ -63,7 +65,9 @@ describe("version", () => {
     let cwd = f.copy("simple-project");
     linkNodeModules(cwd);
 
-    mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
+    mockedGithubMethods.search.issuesAndPullRequests.mockImplementationOnce(
+      () => ({ data: { items: [] } })
+    );
 
     mockedGithubMethods.pulls.create.mockImplementationOnce(() => ({
       data: { number: 123 },
@@ -100,7 +104,9 @@ describe("version", () => {
     let cwd = f.copy("simple-project");
     linkNodeModules(cwd);
 
-    mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
+    mockedGithubMethods.search.issuesAndPullRequests.mockImplementationOnce(
+      () => ({ data: { items: [] } })
+    );
 
     mockedGithubMethods.pulls.create.mockImplementationOnce(() => ({
       data: { number: 123 },
@@ -133,7 +139,9 @@ describe("version", () => {
     let cwd = f.copy("ignored-package");
     linkNodeModules(cwd);
 
-    mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
+    mockedGithubMethods.search.issuesAndPullRequests.mockImplementationOnce(
+      () => ({ data: { items: [] } })
+    );
 
     mockedGithubMethods.pulls.create.mockImplementationOnce(() => ({
       data: { number: 123 },
@@ -166,7 +174,9 @@ describe("version", () => {
     let cwd = f.copy("simple-project");
     linkNodeModules(cwd);
 
-    mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
+    mockedGithubMethods.search.issuesAndPullRequests.mockImplementationOnce(
+      () => ({ data: { items: [] } })
+    );
 
     mockedGithubMethods.pulls.create.mockImplementationOnce(() => ({
       data: { number: 123 },
@@ -223,7 +233,9 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
     let cwd = f.copy("simple-project");
     linkNodeModules(cwd);
 
-    mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
+    mockedGithubMethods.search.issuesAndPullRequests.mockImplementationOnce(
+      () => ({ data: { items: [] } })
+    );
 
     mockedGithubMethods.pulls.create.mockImplementationOnce(() => ({
       data: { number: 123 },

src/run.ts

@@ -17,6 +17,8 @@ import * as gitUtils from "./gitUtils";
 import readChangesetState from "./readChangesetState";
 import resolveFrom from "resolve-from";
 import { throttling } from "@octokit/plugin-throttling";
+// temporary workaround for https://github.com/octokit/plugin-throttling.js/pull/590
+import type {} from "@octokit/plugin-throttling/dist-types/types.d";
 
 // GitHub Issues/PRs messages have a max size limit on the
 // message body payload.
@@ -24,7 +26,7 @@ import { throttling } from "@octokit/plugin-throttling";
 // To avoid that, we ensure to cap the message to 60k chars.
 const MAX_CHARACTERS_PER_MESSAGE = 60000;
 
-const setupOctokit = (githubToken: string) => {
+const setupOctokit = (githubToken) => {
   return new (GitHub.plugin(throttling))(
     getOctokitOptions(githubToken, {
       throttle: {
@@ -59,7 +61,7 @@ const setupOctokit = (githubToken: string) => {
 };
 
 const createRelease = async (
-  octokit: ReturnType<typeof setupOctokit>,
+  octokit: ReturnType<typeof GitHub>,
   { pkg, tagName }: { pkg: Package; tagName: string }
 ) => {
   try {
@@ -85,12 +87,7 @@ const createRelease = async (
     });
   } catch (err) {
     // if we can't find a changelog, the user has probably disabled changelogs
-    if (
-      err &&
-      typeof err === "object" &&
-      "code" in err &&
-      err.code !== "ENOENT"
-    ) {
+    if (err.code !== "ENOENT") {
       throw err;
     }
   }
@@ -208,12 +205,7 @@ const requireChangesetsCliPkgJson = (cwd: string) => {
   try {
     return require(resolveFrom(cwd, "@changesets/cli/package.json"));
   } catch (err) {
-    if (
-      err &&
-      typeof err === "object" &&
-      "code" in err &&
-      err.code === "MODULE_NOT_FOUND"
-    ) {
+    if (err && err.code === "MODULE_NOT_FOUND") {
       throw new Error(
         `Have you forgotten to install \`@changesets/cli\` in "${cwd}"?`
       );
@@ -299,7 +291,6 @@ type VersionOptions = {
   commitMessage?: string;
   hasPublishScript?: boolean;
   prBodyMaxCharacters?: number;
-  branch?: string;
 };
 
 type RunVersionResult = {
@@ -314,12 +305,11 @@ export async function runVersion({
   commitMessage = "Version Packages",
   hasPublishScript = false,
   prBodyMaxCharacters = MAX_CHARACTERS_PER_MESSAGE,
-  branch,
 }: VersionOptions): Promise<RunVersionResult> {
   const octokit = setupOctokit(githubToken);
 
   let repo = `${github.context.repo.owner}/${github.context.repo.repo}`;
-  branch = branch ?? github.context.ref.replace("refs/heads/", "");
+  let branch = github.context.ref.replace("refs/heads/", "");
   let versionBranch = `changeset-release/${branch}`;
 
   let { preState } = await readChangesetState(cwd);
@@ -342,11 +332,9 @@ export async function runVersion({
     });
   }
 
-  const existingPullRequestsPromise = octokit.rest.pulls.list({
-    ...github.context.repo,
-    state: "open",
-    head: `${github.context.repo.owner}:${versionBranch}`,
-    base: branch,
+  let searchQuery = `repo:${repo}+state:open+head:${versionBranch}+base:${branch}+is:pull-request`;
+  let searchResultPromise = octokit.rest.search.issuesAndPullRequests({
+    q: searchQuery,
   });
   let changedPackages = await getChangedPackages(cwd, versionsByDirectory);
   let changedPackagesInfoPromises = Promise.all(
@@ -378,8 +366,8 @@ export async function runVersion({
 
   await gitUtils.push(versionBranch, { force: true });
 
-  let existingPullRequests = await existingPullRequestsPromise;
-  core.info(JSON.stringify(existingPullRequests.data, null, 2));
+  let searchResult = await searchResultPromise;
+  core.info(JSON.stringify(searchResult.data, null, 2));
 
   const changedPackagesInfo = (await changedPackagesInfoPromises)
     .filter((x) => x)
@@ -393,7 +381,7 @@ export async function runVersion({
     prBodyMaxCharacters,
   });
 
-  if (existingPullRequests.data.length === 0) {
+  if (searchResult.data.items.length === 0) {
     core.info("creating pull request");
     const { data: newPullRequest } = await octokit.rest.pulls.create({
       base: branch,
@@ -407,7 +395,7 @@ export async function runVersion({
       pullRequestNumber: newPullRequest.number,
     };
   } else {
-    const [pullRequest] = existingPullRequests.data;
+    const [pullRequest] = searchResult.data.items;
 
     core.info(`updating found pull request #${pullRequest.number}`);
     await octokit.rest.pulls.update({
@@ -415,7 +403,6 @@ export async function runVersion({
       title: finalPrTitle,
       body: prBody,
       ...github.context.repo,
-      state: "open",
     });
 
     return {

src/utils.ts

@@ -3,6 +3,7 @@ import remarkParse from "remark-parse";
 import remarkStringify from "remark-stringify";
 // @ts-ignore
 import mdastToString from "mdast-util-to-string";
+import { exec } from "@actions/exec";
 import { getPackages, Package } from "@manypkg/get-packages";
 
 export const BumpLevels = {