Fix a couple of merge issues

Author: timfish

.github/workflows/checks.yml

@@ -131,7 +131,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: ["18", "20", "22"]
+        node-version: [18, 20, 22, 24]
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:

packages/bundler-plugin-core/test/build-plugin-manager.test.ts

@@ -39,13 +39,13 @@ vi.mock("@sentry/core", async () => ({
 vi.mock("../src/glob");
 vi.mock("../src/debug-id-upload");
 
-const mockGlobFiles = globFiles as jest.MockedFunction<typeof globFiles>;
+const mockGlobFiles = globFiles as MockedFunction<typeof globFiles>;
 const mockPrepareBundleForDebugIdUpload =
   prepareBundleForDebugIdUpload as unknown as MockedFunction<typeof prepareBundleForDebugIdUpload>;
 
 describe("createSentryBuildPluginManager", () => {
   beforeEach(() => {
-    vi.resetAllMocks();
+    vi.clearAllMocks();
     // Clean up environment variables
     delete process.env["SENTRY_LOG_LEVEL"];
   });

packages/integration-tests/fixtures/build-information-injection/build-information-injection.test.ts

@@ -38,7 +38,7 @@ test("vite bundle", () => {
   checkBundle(path.join(__dirname, "out", "vite", "index.js"));
 });
 
-test("webpack 5 bundle", () => {
+test("webpack bundle", () => {
   expect.assertions(1);
   checkBundle(path.join(__dirname, "out", "webpack", "index.js"));
 });

packages/integration-tests/fixtures/errorhandling/error-no-handler.test.ts

@@ -7,7 +7,7 @@ describe("Error throwing by default (no errorHandler)", { timeout: 10_000 }, ()
 
   const sentryServer = spawn("node", [path.join(__dirname, "fakeSentry.js")], {
     cwd: __dirname,
-    stdio: "inherit", // <-- set to "inherit" to get server logs. Deactivated to avoid test logs.
+    stdio: "ignore", // <-- set to "inherit" to get server logs. Deactivated to avoid test logs.
     env: { ...process.env, FAKE_SENTRY_PORT },
     shell: true,
   });

packages/integration-tests/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "run-s test:setup test:vitest",
     "test:setup": "ts-node scripts/run-fixture-setups.ts",
-    "test:vitest": "vitest run -t \"Error throwing by default\"",
+    "test:vitest": "vitest run",
     "lint": "eslint .",
     "check:types": "tsc --project ./tsconfig.json --noEmit",
     "clean": "run-s clean:build",