fix: typo affecting commit and compareSHA

i also added checks for the merge group event just in case

Author: joseph-sentry

packages/bundler-plugin-core/package.json

@@ -47,7 +47,7 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@octokit/webhooks-definitions": "^3.67.3",
+    "@octokit/webhooks-types": "^7.6.1",
     "@sentry/core": "^8.42.0",
     "@types/node": "^20.11.15",
     "@types/semver": "^7.5.6",

packages/bundler-plugin-core/src/utils/providers/GitHubActions.ts

@@ -7,7 +7,10 @@ import {
 } from "../../types.ts";
 import { type Output } from "../Output.ts";
 import { debug } from "../logging.ts";
-import { type PullRequestEvent } from "@octokit/webhooks-definitions/schema";
+import {
+  type PullRequestEvent,
+  type MergeGroupEvent,
+} from "@octokit/webhooks-types";
 
 export function detect(envs: ProviderEnvs): boolean {
   return Boolean(envs?.GITHUB_ACTIONS);
@@ -42,7 +45,7 @@ async function _getJobURL(
   });
 
   if (res.status !== 200) {
-    debug(`Failed to get job URL: ${res.status}`, { enabled: output.debug });
+    debug(`Failed to get job U1RL: ${res.status}`, { enabled: output.debug });
     return null;
   }
 
@@ -184,9 +187,12 @@ function _getSHA(
 
   const context = GitHub.context;
   let commit = envs?.GITHUB_SHA;
-  if (["pull_request", " pull_request_target"].includes(context.eventName)) {
+  if (["pull_request", "pull_request_target"].includes(context.eventName)) {
     const payload = context.payload as PullRequestEvent;
     commit = payload.pull_request.head.sha;
+  } else if ("merge_group" === context.eventName) {
+    const payload = context.payload as MergeGroupEvent;
+    commit = payload.merge_group.head_sha;
   }
 
   debug(`Using commit: ${commit ?? null}`, { enabled: output.debug });
@@ -205,9 +211,12 @@ function _getCompareSHA(
 
   let compareSha = null;
   const context = GitHub.context;
-  if (["pull_request", " pull_request_target"].includes(context.eventName)) {
+  if (["pull_request", "pull_request_target"].includes(context.eventName)) {
     const payload = context.payload as PullRequestEvent;
     compareSha = payload.pull_request.base.sha;
+  } else if ("merge_group" === context.eventName) {
+    const payload = context.payload as MergeGroupEvent;
+    compareSha = payload.merge_group.base_sha;
   }
 
   debug(`Using compareSha: ${compareSha}`, { enabled: output.debug });

packages/bundler-plugin-core/src/utils/providers/__tests__/GitHubActions.test.ts

@@ -324,7 +324,7 @@ describe("GitHub Actions Params", () => {
         build: "2",
         buildURL: "https://github.com/testOrg/testRepo/actions/runs/2",
         commit: "test-head-sha",
-        compareSha: null,
+        compareSha: "test-base-sha",
         job: "testWorkflow",
         pr: "1",
         service: "github-actions",
@@ -383,7 +383,7 @@ describe("GitHub Actions Params", () => {
         build: "2",
         buildURL: "https://github.com/testOrg/testRepo/actions/runs/2",
         commit: "test-head-sha",
-        compareSha: null,
+        compareSha: "test-base-sha",
         job: "testWorkflow",
         pr: "1",
         service: "github-actions",