Merge upstream/master into globby-to-tinyglobby

Author: pralkarz

.github/workflows/release.yml

@@ -18,12 +18,13 @@ jobs:
     name: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
-      - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:
           cache: npm
           node-version: lts/*
       - run: npm clean-install
+      - run: npm install --global corepack@latest
       - run: corepack npm audit signatures
       - run: npx semantic-release
         env:

.github/workflows/test.yml

@@ -26,13 +26,14 @@ jobs:
           - ubuntu-latest
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: "Use Node.js ${{ matrix.node-version }}"
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:
           node-version: "${{ matrix.node-version }}"
           cache: npm
       - run: npm clean-install
+      - run: npm install --global corepack@latest
       - run: corepack npm audit signatures
       - run: npm test
 
@@ -42,15 +43,16 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: git config --global user.name github-actions
       - run: git config --global user.email [email protected]
       - name: Use Node.js from .nvmrc
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:
           node-version-file: .nvmrc
           cache: npm
       - run: npm clean-install
+      - run: npm install --global corepack@latest
       - run: corepack npm audit signatures
       - run: npm test
 

.nvmrc

@@ -1 +1 @@
-20
+22

lib/success.js

@@ -88,7 +88,7 @@ export default async function success(pluginConfig, context, { Octokit }) {
       for (const { nodes, pageInfo } of responseAssociatedPRs) {
         if (nodes.length === 0) continue;
 
-        responsePRs.push(...buildIssuesOrPRsFromResponseNode(nodes, "PR"));
+        responsePRs.push(...buildIssuesOrPRsFromResponseNode(nodes));
         if (pageInfo.hasNextPage) {
           let cursor = pageInfo.endCursor;
           let hasNextPage = true;
@@ -171,7 +171,7 @@ export default async function success(pluginConfig, context, { Octokit }) {
     if (!isEmpty(parsedIssues)) {
       const uniqueParsedIssues = uniqBy(flatten(parsedIssues), "number");
 
-      // Get relatedIssues
+      // Get relatedIssues (or relatedPRs i.e. Issues/PRs that are closed by an associatedPR)
       issues = await inChunks(uniqueParsedIssues, 100, async (chunk) => {
         const { repository } = await octokit.graphql(
           buildRelatedIssuesQuery(chunk.map((issue) => issue.number)),
@@ -360,6 +360,7 @@ async function inChunks(items, chunkSize, callback) {
  * Fields common accross PRs and Issue
  */
 const baseFields = `
+  __typename
   id
   title
   body
@@ -420,8 +421,25 @@ function buildRelatedIssuesQuery(numbers) {
       repository(owner: $owner, name: $repo) {
         ${numbers
           .map((num) => {
-            return `issue${num}: issue(number: ${num}) {
-              ${baseFields}
+            return `issue${num}: issueOrPullRequest(number: ${num}) {
+              ... on Issue {
+                ${baseFields}
+              }
+              ... on PullRequest {
+                ${baseFields}
+                mergeable
+                changedFiles
+                mergedAt
+                isDraft
+                mergedBy {
+                  login
+                  avatarUrl
+                  url
+                }
+                commits {
+                  totalCount
+                }
+              }
             }`;
           })
           .join("")}
@@ -513,10 +531,9 @@ const loadSingleCommitAssociatedPRs = `#graphql
 /**
  * Build associatedPRs or RelatedIssues object (into issue-like object with `pull_request` property) from the GraphQL repository response
  * @param {object} responseNodes
- * @param {"ISSUE" | "PR"} type
  * @returns {object[]}
  */
-function buildIssuesOrPRsFromResponseNode(responseNodes, type = "ISSUE") {
+function buildIssuesOrPRsFromResponseNode(responseNodes) {
   const resultArray = [];
   for (const node of responseNodes) {
     let baseProps = {
@@ -569,7 +586,7 @@ function buildIssuesOrPRsFromResponseNode(responseNodes, type = "ISSUE") {
 
     let result = baseProps;
 
-    if (type === "PR") {
+    if (node.__typename === "PullRequest") {
       const prProps = {
         pull_request: true,
         mergeable: node.mergeable,