Merge branch 'main' into timfish/fix/double-debug-id-injection

Author: timfish

packages/integration-tests/package.json

@@ -39,10 +39,8 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rollup": "3.2.0",
-    "rollup4": "npm:rollup@^4",
     "ts-node": "^10.9.1",
     "vite": "3.0.0",
-    "vite6": "npm:vite@^6",
     "webpack4": "npm:webpack@^4",
     "webpack5": "npm:[email protected]"
   },

packages/integration-tests/utils/create-cjs-bundles.ts

@@ -1,6 +1,6 @@
-import * as vite3 from "vite";
+import * as vite from "vite";
 import * as path from "path";
-import * as rollup3 from "rollup";
+import * as rollup from "rollup";
 import { default as webpack4 } from "webpack4";
 import { webpack as webpack5 } from "webpack5";
 import * as esbuild from "esbuild";
@@ -10,17 +10,9 @@ import { sentryWebpackPlugin } from "@sentry/webpack-plugin";
 import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
 import { sentryRollupPlugin } from "@sentry/rollup-plugin";
 
-const [NODE_MAJOR_VERSION] = process.version.split(".").map(Number) as [number];
+const [NODE_MAJOR_VERSION] = process.version.replace("v", "").split(".").map(Number) as [number];
 
-type Bundlers =
-  | "webpack4"
-  | "webpack5"
-  | "esbuild"
-  | "rollup"
-  | "rollup4"
-  | "vite"
-  | "vite6"
-  | string;
+type Bundlers = "webpack4" | "webpack5" | "esbuild" | "rollup" | "vite" | string;
 
 export function createCjsBundles(
   entrypoints: { [name: string]: string },
@@ -29,29 +21,7 @@ export function createCjsBundles(
   plugins: Bundlers[] = []
 ): void {
   if (plugins.length === 0 || plugins.includes("vite")) {
-    void vite3.build({
-      clearScreen: false,
-      build: {
-        sourcemap: true,
-        outDir: path.join(outFolder, "vite"),
-        rollupOptions: {
-          input: entrypoints,
-          output: {
-            format: "cjs",
-            entryFileNames: "[name].js",
-          },
-        },
-      },
-      plugins: [sentryVitePlugin(sentryUnpluginOptions)],
-    });
-  }
-
-  if (NODE_MAJOR_VERSION >= 18 && (plugins.length === 0 || plugins.includes("vite6"))) {
-    // We can't import this at the top of the file because they are not
-    // compatible with Node v14
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const vite6 = require("vite6") as typeof vite3;
-    void vite6.build({
+    void vite.build({
       clearScreen: false,
       build: {
         sourcemap: true,
@@ -69,27 +39,7 @@ export function createCjsBundles(
   }
 
   if (plugins.length === 0 || plugins.includes("rollup")) {
-    void rollup3
-      .rollup({
-        input: entrypoints,
-        plugins: [sentryRollupPlugin(sentryUnpluginOptions)],
-      })
-      .then((bundle) =>
-        bundle.write({
-          sourcemap: true,
-          dir: path.join(outFolder, "rollup"),
-          format: "cjs",
-          exports: "named",
-        })
-      );
-  }
-
-  if (NODE_MAJOR_VERSION >= 18 && (plugins.length === 0 || plugins.includes("rollup4"))) {
-    // We can't import this at the top of the file because they are not
-    // compatible with Node v14
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const rollup4 = require("rollup4") as typeof rollup3;
-    void rollup4
+    void rollup
       .rollup({
         input: entrypoints,
         plugins: [sentryRollupPlugin(sentryUnpluginOptions)],