From 7cc5b4e7da0cc47ad7ccc9c861e1992cf768c4c6 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Thu, 27 Jun 2024 14:05:47 +0200
Subject: [PATCH 01/30] ref(bug-template): Add reproduction example step
 (#12671)

Additional Changes:
- Updating the versions to more recent ones.
- Adding `@sentry/solid`

---------

Co-authored-by: Francesco Novy <francesco.novy@sentry.io>
---
 .github/ISSUE_TEMPLATE/bug.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 773e13ac54fe..d79eb9f1333e 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -43,6 +43,7 @@ body:
         - '@sentry/node'
         - '@sentry/react'
         - '@sentry/remix'
+        - '@sentry/solid'
         - '@sentry/svelte'
         - '@sentry/sveltekit'
         - '@sentry/vue'
@@ -56,7 +57,7 @@ body:
     attributes:
       label: SDK Version
       description: What version of the SDK are you using?
-      placeholder: ex. 7.8.0
+      placeholder: ex. 8.10.0
     validations:
       required: true
   - type: input
@@ -66,7 +67,7 @@ body:
       description:
         If you're using one of our framework-specific SDKs (`@sentry/react`, for example), what version of the
         _framework_ are you using?
-      placeholder: ex. React 17.0.0
+      placeholder: ex. React 18.3.0 or Next 14.0.0
   - type: input
     id: link-to-sentry
     attributes:
@@ -78,8 +79,10 @@ body:
   - type: textarea
     id: sdk-setup
     attributes:
-      label: SDK Setup
-      description: How do you set up your Sentry SDK? Please show us your `Sentry.init` options.
+      label: SDK Setup/Reproduction Example
+      description:
+        How do you set up your Sentry SDK? Please show us your `Sentry.init` code.
+        Or even better—share a link to a reproduction example.
       placeholder: |-
         ```javascript
         Sentry.init({

From 96b3f2142503feb69b768b9082a2284b44cd3b9c Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:08:22 +0200
Subject: [PATCH 02/30] feat(bug-template): Add `@sentry/nest` (#12679)

ref https://github.com/getsentry/sentry-javascript/pull/12671
---
 .github/ISSUE_TEMPLATE/bug.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index d79eb9f1333e..68842b96e3e7 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -39,6 +39,7 @@ body:
         - '@sentry/ember'
         - '@sentry/gatsby'
         - '@sentry/google-cloud-serverless'
+        - '@sentry/nestjs'
         - '@sentry/nextjs'
         - '@sentry/node'
         - '@sentry/react'

From 36a15fa12c7c569163a1da77673a001c6b7a7130 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Thu, 27 Jun 2024 14:03:57 -0400
Subject: [PATCH 03/30] chore: Remove @codecov/rollup-plugin (#12665)

---
 .../rollup-utils/plugins/npmPlugins.mjs       |  1 -
 package.json                                  |  1 -
 yarn.lock                                     | 43 ++++---------------
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/dev-packages/rollup-utils/plugins/npmPlugins.mjs b/dev-packages/rollup-utils/plugins/npmPlugins.mjs
index fd736d702e07..6597e2244ab8 100644
--- a/dev-packages/rollup-utils/plugins/npmPlugins.mjs
+++ b/dev-packages/rollup-utils/plugins/npmPlugins.mjs
@@ -10,7 +10,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-import { codecovRollupPlugin } from '@codecov/rollup-plugin';
 import json from '@rollup/plugin-json';
 import replace from '@rollup/plugin-replace';
 import cleanup from 'rollup-plugin-cleanup';
diff --git a/package.json b/package.json
index eab00cafbd18..f9583d6074ec 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,6 @@
   ],
   "devDependencies": {
     "@biomejs/biome": "^1.4.0",
-    "@codecov/rollup-plugin": "0.0.1-beta.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-esm-shim": "^0.1.5",
     "@rollup/plugin-json": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 0461250144d3..83754bf8c377 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3840,23 +3840,6 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@codecov/bundler-plugin-core@^0.0.1-beta.5":
-  version "0.0.1-beta.5"
-  resolved "https://registry.yarnpkg.com/@codecov/bundler-plugin-core/-/bundler-plugin-core-0.0.1-beta.5.tgz#f516c080abe4c99fb5cfdc7d39513b277fac2bae"
-  integrity sha512-eltwv1aRJdwonlTD47jQ2GYdKZfMv3jCviDui32JOu12ZAiI3WdJCtjWF9zxpmnHEZ30pn0WbeZir+sXSFLJHw==
-  dependencies:
-    chalk "4.1.2"
-    semver "^7.5.4"
-    unplugin "^1.6.0"
-    zod "^3.22.4"
-
-"@codecov/rollup-plugin@0.0.1-beta.5":
-  version "0.0.1-beta.5"
-  resolved "https://registry.yarnpkg.com/@codecov/rollup-plugin/-/rollup-plugin-0.0.1-beta.5.tgz#cca4c68989efbcf4e2dbe3db5e9a5bf5b7501fe2"
-  integrity sha512-3x6vmt59Hgfpr8jroB7LYa2XX+kFds8HaWsUTBX08sJ2bCw+BzlW1Mnc+IdxBdMtjo1jkYEceRvfwQ0X2LK4ZQ==
-  dependencies:
-    "@codecov/bundler-plugin-core" "^0.0.1-beta.5"
-
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -13985,14 +13968,6 @@ chalk@4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -14004,6 +13979,14 @@ chalk@^1.0.0:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@^5.0.0, chalk@^5.2.0, chalk@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
@@ -33307,16 +33290,6 @@ unplugin@^1.10.0, unplugin@^1.10.1, unplugin@^1.3.1, unplugin@^1.5.0, unplugin@^
     webpack-sources "^3.2.3"
     webpack-virtual-modules "^0.6.1"
 
-unplugin@^1.6.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.10.0.tgz#9cb8140f61e3fbcf27c7c38d305e9d62d5dbbf0b"
-  integrity sha512-CuZtvvO8ua2Wl+9q2jEaqH6m3DoQ38N7pvBYQbbaeNlWGvK2l6GHiKi29aIHDPoSxdUzQ7Unevf1/ugil5X6Pg==
-  dependencies:
-    acorn "^8.11.3"
-    chokidar "^3.6.0"
-    webpack-sources "^3.2.3"
-    webpack-virtual-modules "^0.6.1"
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"

From f91b1334574d021c1b87d89015effec9b52ca0b9 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Thu, 27 Jun 2024 16:20:29 -0400
Subject: [PATCH 04/30] fix(browser): Make sure measure spans have valid start
 timestamps (#12648)

Co-authored-by: Francesco Novy <francesco.novy@sentry.io>
---
 .../metrics/pageload-measure-spans/init.js    | 21 ++++++
 .../metrics/pageload-measure-spans/test.ts    | 35 ++++++++++
 .../src/metrics/browserMetrics.ts             | 66 +++++++++++--------
 3 files changed, 95 insertions(+), 27 deletions(-)
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts

diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js
new file mode 100644
index 000000000000..d34167f7b256
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js
@@ -0,0 +1,21 @@
+// Add measure before SDK initializes
+const end = performance.now();
+performance.measure('Next.js-before-hydration', {
+  duration: 1000,
+  end,
+});
+
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  debug: true,
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [
+    Sentry.browserTracingIntegration({
+      idleTimeout: 9000,
+    }),
+  ],
+  tracesSampleRate: 1,
+});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts
new file mode 100644
index 000000000000..9209e8ca5c32
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts
@@ -0,0 +1,35 @@
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+// Validation test for https://github.com/getsentry/sentry-javascript/issues/12281
+sentryTest('should add browser-related spans to pageload transaction', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const browserSpans = eventData.spans?.filter(({ op }) => op === 'browser');
+
+  // Spans `domContentLoadedEvent`, `connect`, `cache` and `DNS` are not
+  // always inside `pageload` transaction.
+  expect(browserSpans?.length).toBeGreaterThanOrEqual(4);
+
+  const requestSpan = browserSpans!.find(({ description }) => description === 'request');
+  expect(requestSpan).toBeDefined();
+
+  const measureSpan = eventData.spans?.find(({ op }) => op === 'measure');
+  expect(measureSpan).toBeDefined();
+
+  expect(requestSpan!.start_timestamp).toBeLessThanOrEqual(measureSpan!.start_timestamp);
+  expect(measureSpan?.data).toEqual({
+    'sentry.browser.measure_happened_before_request': true,
+    'sentry.browser.measure_start_time': expect.any(Number),
+    'sentry.op': 'measure',
+    'sentry.origin': 'auto.resource.browser.metrics',
+  });
+});
diff --git a/packages/browser-utils/src/metrics/browserMetrics.ts b/packages/browser-utils/src/metrics/browserMetrics.ts
index 6999641a641f..4e473e42ea47 100644
--- a/packages/browser-utils/src/metrics/browserMetrics.ts
+++ b/packages/browser-utils/src/metrics/browserMetrics.ts
@@ -342,15 +342,34 @@ export function _addMeasureSpans(
   duration: number,
   timeOrigin: number,
 ): number {
-  const measureStartTimestamp = timeOrigin + startTime;
-  const measureEndTimestamp = measureStartTimestamp + duration;
+  const navEntry = getNavigationEntry();
+  const requestTime = msToSec(navEntry ? navEntry.requestStart : 0);
+  // Because performance.measure accepts arbitrary timestamps it can produce
+  // spans that happen before the browser even makes a request for the page.
+  //
+  // An example of this is the automatically generated Next.js-before-hydration
+  // spans created by the Next.js framework.
+  //
+  // To prevent this we will pin the start timestamp to the request start time
+  // This does make duration inaccruate, so if this does happen, we will add
+  // an attribute to the span
+  const measureStartTimestamp = timeOrigin + Math.max(startTime, requestTime);
+  const startTimeStamp = timeOrigin + startTime;
+  const measureEndTimestamp = startTimeStamp + duration;
+
+  const attributes: SpanAttributes = {
+    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
+  };
+
+  if (measureStartTimestamp !== startTimeStamp) {
+    attributes['sentry.browser.measure_happened_before_request'] = true;
+    attributes['sentry.browser.measure_start_time'] = measureStartTimestamp;
+  }
 
   startAndEndSpan(span, measureStartTimestamp, measureEndTimestamp, {
     name: entry.name as string,
     op: entry.entryType as string,
-    attributes: {
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
-    },
+    attributes,
   });
 
   return measureStartTimestamp;
@@ -395,36 +414,29 @@ function _addPerformanceNavigationTiming(
 /** Create request and response related spans */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function _addRequest(span: Span, entry: Record<string, any>, timeOrigin: number): void {
+  const requestStartTimestamp = timeOrigin + msToSec(entry.requestStart as number);
+  const responseEndTimestamp = timeOrigin + msToSec(entry.responseEnd as number);
+  const responseStartTimestamp = timeOrigin + msToSec(entry.responseStart as number);
   if (entry.responseEnd) {
     // It is possible that we are collecting these metrics when the page hasn't finished loading yet, for example when the HTML slowly streams in.
     // In this case, ie. when the document request hasn't finished yet, `entry.responseEnd` will be 0.
     // In order not to produce faulty spans, where the end timestamp is before the start timestamp, we will only collect
     // these spans when the responseEnd value is available. The backend (Relay) would drop the entire span if it contained faulty spans.
-    startAndEndSpan(
-      span,
-      timeOrigin + msToSec(entry.requestStart as number),
-      timeOrigin + msToSec(entry.responseEnd as number),
-      {
-        op: 'browser',
-        name: 'request',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
-        },
+    startAndEndSpan(span, requestStartTimestamp, responseEndTimestamp, {
+      op: 'browser',
+      name: 'request',
+      attributes: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
       },
-    );
+    });
 
-    startAndEndSpan(
-      span,
-      timeOrigin + msToSec(entry.responseStart as number),
-      timeOrigin + msToSec(entry.responseEnd as number),
-      {
-        op: 'browser',
-        name: 'response',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
-        },
+    startAndEndSpan(span, responseStartTimestamp, responseEndTimestamp, {
+      op: 'browser',
+      name: 'response',
+      attributes: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
       },
-    );
+    });
   }
 }
 

From c7b8503018f9384bb4f68a2c3f86c43956fa8380 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Fri, 28 Jun 2024 03:19:30 -0400
Subject: [PATCH 05/30] chore: Remove `es-check` from deps (#12686)

ref: https://github.com/getsentry/sentry-javascript/pull/12644

We don't use `es-check` anymore, we can remove it. It was previously
used to validate our es5 builds, but we don't target that anymore.

Extracted from the previous PR because 1 big change was breaking CI and
I couldn't figure out the root cause.
---
 package.json |   1 -
 yarn.lock    | 148 +++++----------------------------------------------
 2 files changed, 13 insertions(+), 136 deletions(-)

diff --git a/package.json b/package.json
index f9583d6074ec..41181d7a0ffd 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,6 @@
     "codecov": "^3.6.5",
     "deepmerge": "^4.2.2",
     "downlevel-dts": "~0.11.0",
-    "es-check": "7.1.0",
     "eslint": "7.32.0",
     "jest": "^27.5.1",
     "jest-environment-node": "^27.5.1",
diff --git a/yarn.lock b/yarn.lock
index 83754bf8c377..3381d4487950 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3958,15 +3958,6 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@dabh/diagnostics@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a"
-  integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==
-  dependencies:
-    colorspace "1.1.x"
-    enabled "2.0.x"
-    kuler "^2.0.0"
-
 "@dependents/detective-less@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@dependents/detective-less/-/detective-less-4.1.0.tgz#4a979ee7a6a79eb33602862d6a1263e30f98002e"
@@ -9450,6 +9441,7 @@
     "@types/unist" "*"
 
 "@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8", "@types/history@*":
+  name "@types/history-4"
   version "4.7.8"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
   integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
@@ -9963,11 +9955,6 @@
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d"
   integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==
 
-"@types/triple-beam@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8"
-  integrity sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==
-
 "@types/unist@*", "@types/unist@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.0.tgz#988ae8af1e5239e89f9fbb1ade4c935f4eeedf9a"
@@ -11291,11 +11278,6 @@ acorn@8.12.0, acorn@^8.6.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c"
   integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==
 
-acorn@8.8.2, acorn@^8.8.1, acorn@^8.8.2:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
 acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
@@ -11321,6 +11303,11 @@ acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
+acorn@^8.8.1, acorn@^8.8.2:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+
 acorn@^8.9.0:
   version "8.11.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
@@ -14399,7 +14386,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.9.0, color-convert@^1.9.3:
+color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -14423,7 +14410,7 @@ color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.6.0, color-string@^1.9.0:
+color-string@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
   integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
@@ -14436,14 +14423,6 @@ color-support@^1.1.2, color-support@^1.1.3:
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@^3.1.3:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
-  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
-  dependencies:
-    color-convert "^1.9.3"
-    color-string "^1.6.0"
-
 color@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
@@ -14472,14 +14451,6 @@ colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-colorspace@1.1.x:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243"
-  integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==
-  dependencies:
-    color "^3.1.3"
-    text-hex "1.0.x"
-
 columnify@1.6.0:
   version "1.6.0"
   resolved "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
@@ -14500,11 +14471,6 @@ comma-separated-tokens@^2.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
   integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
 
-commander@10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.0.tgz#71797971162cd3cf65f0b9d24eb28f8d303acdf1"
-  integrity sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==
-
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -16971,11 +16937,6 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-enabled@2.0.x:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
-  integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
-
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -17164,17 +17125,6 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.19.0, es-
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
-es-check@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/es-check/-/es-check-7.1.0.tgz#1015db640a7b785ff4098baf2e0791c070a25964"
-  integrity sha512-t099vm9tNqNHF28Q/mRcqYxmkbkoo/Qu2ZI5/D+eFeqNUjI3jwkIyHyexXiAtstbZ1FQELi0QCuUaYCtiffi4Q==
-  dependencies:
-    acorn "8.8.2"
-    commander "10.0.0"
-    fast-glob "^3.2.12"
-    supports-color "^8.1.1"
-    winston "^3.8.2"
-
 es-define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
@@ -18393,7 +18343,7 @@ fast-glob@3.2.7:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9:
+fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -18532,11 +18482,6 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fecha@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
-  integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
-
 fflate@0.8.1, fflate@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.1.tgz#1ed92270674d2ad3c73f077cd0acf26486dae6c9"
@@ -18848,11 +18793,6 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-fn.name@1.x.x:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
-  integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
-
 focus-trap@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.5.4.tgz#6c4e342fe1dae6add9c2aa332a6e7a0bbd495ba2"
@@ -22836,11 +22776,6 @@ kolorist@^1.8.0:
   resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
   integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
 
-kuler@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
-  integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
-
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
@@ -23515,18 +23450,6 @@ log-symbols@^5.1.0:
     chalk "^5.0.0"
     is-unicode-supported "^1.1.0"
 
-logform@^2.3.2, logform@^2.4.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/logform/-/logform-2.5.1.tgz#44c77c34becd71b3a42a3970c77929e52c6ed48b"
-  integrity sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==
-  dependencies:
-    "@colors/colors" "1.5.0"
-    "@types/triple-beam" "^1.3.2"
-    fecha "^4.2.0"
-    ms "^2.1.1"
-    safe-stable-stringify "^2.3.1"
-    triple-beam "^1.3.0"
-
 loglevel@^1.6.8:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114"
@@ -26502,13 +26425,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-one-time@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45"
-  integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==
-  dependencies:
-    fn.name "1.x.x"
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -28943,6 +28859,7 @@ react-is@^18.0.0:
     "@remix-run/router" "1.0.2"
 
 "react-router-6@npm:react-router@6.3.0", react-router@6.3.0:
+  name react-router-6
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
   integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
@@ -31299,11 +31216,6 @@ ssri@^9.0.0, ssri@^9.0.1:
   dependencies:
     minipass "^3.1.1"
 
-stack-trace@0.0.x:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
-
 stack-utils@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
@@ -31467,6 +31379,7 @@ string-template@~0.2.1:
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -31803,7 +31716,7 @@ supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0, supports-color@^8.1.1:
+supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -32219,11 +32132,6 @@ text-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
-text-hex@1.0.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
-  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
-
 text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -32532,11 +32440,6 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
   integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
 
-triple-beam@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
-  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
-
 trough@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876"
@@ -34619,32 +34522,6 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-winston-transport@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa"
-  integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==
-  dependencies:
-    logform "^2.3.2"
-    readable-stream "^3.6.0"
-    triple-beam "^1.3.0"
-
-winston@^3.8.2:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.2.tgz#56e16b34022eb4cff2638196d9646d7430fdad50"
-  integrity sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==
-  dependencies:
-    "@colors/colors" "1.5.0"
-    "@dabh/diagnostics" "^2.0.2"
-    async "^3.2.3"
-    is-stream "^2.0.0"
-    logform "^2.4.0"
-    one-time "^1.0.0"
-    readable-stream "^3.4.0"
-    safe-stable-stringify "^2.3.1"
-    stack-trace "0.0.x"
-    triple-beam "^1.3.0"
-    winston-transport "^4.5.0"
-
 word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
@@ -34692,6 +34569,7 @@ workerpool@^6.4.0:
   integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

From 5eafa401c076796fba7663dad9ca254ab6f1972f Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Fri, 28 Jun 2024 11:49:14 +0200
Subject: [PATCH 06/30] fix(nextjs): Attempt to ignore critical dependency
 warnings (#12694)

---
 packages/nextjs/src/config/types.ts   | 18 +++++++++++++++++-
 packages/nextjs/src/config/webpack.ts | 26 ++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/packages/nextjs/src/config/types.ts b/packages/nextjs/src/config/types.ts
index b84c55e5611f..883ba3c26d41 100644
--- a/packages/nextjs/src/config/types.ts
+++ b/packages/nextjs/src/config/types.ts
@@ -404,6 +404,22 @@ export type NextConfigFunction = (
  * Webpack config
  */
 
+// Note: The interface for `ignoreWarnings` is larger but we only need this. See https://webpack.js.org/configuration/other-options/#ignorewarnings
+export type IgnoreWarningsOption = (
+  | { module?: RegExp; message?: RegExp }
+  | ((
+      webpackError: {
+        module?: {
+          readableIdentifier: (requestShortener: unknown) => string;
+        };
+        message: string;
+      },
+      compilation: {
+        requestShortener: unknown;
+      },
+    ) => boolean)
+)[];
+
 // The two possible formats for providing custom webpack config in `next.config.js`
 export type WebpackConfigFunction = (config: WebpackConfigObject, options: BuildContext) => WebpackConfigObject;
 export type WebpackConfigObject = {
@@ -413,7 +429,7 @@ export type WebpackConfigObject = {
   output: { filename: string; path: string };
   target: string;
   context: string;
-  ignoreWarnings?: { module?: RegExp }[]; // Note: The interface for `ignoreWarnings` is larger but we only need this. See https://webpack.js.org/configuration/other-options/#ignorewarnings
+  ignoreWarnings?: IgnoreWarningsOption;
   resolve?: {
     modules?: string[];
     alias?: { [key: string]: string | boolean };
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index eece7ff30305..4002db18f295 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -14,6 +14,7 @@ import type { VercelCronsConfig } from '../common/types';
 import type {
   BuildContext,
   EntryPropertyObject,
+  IgnoreWarningsOption,
   NextConfigObject,
   SentryBuildOptions,
   WebpackConfigFunction,
@@ -72,9 +73,7 @@ export function constructWebpackConfigFunction(
     // Add a loader which will inject code that sets global values
     addValueInjectionLoader(newConfig, userNextConfig, userSentryOptions, buildContext);
 
-    if (isServer) {
-      addOtelWarningIgnoreRule(newConfig);
-    }
+    addOtelWarningIgnoreRule(newConfig);
 
     let pagesDirPath: string | undefined;
     const maybePagesDirPath = path.join(projectDir, 'pages');
@@ -668,9 +667,28 @@ function getRequestAsyncStorageModuleLocation(
 
 function addOtelWarningIgnoreRule(newConfig: WebpackConfigObjectWithModuleRules): void {
   const ignoreRules = [
+    // Inspired by @matmannion: https://github.com/getsentry/sentry-javascript/issues/12077#issuecomment-2180307072
+    (warning, compilation) => {
+      // This is wapped in try-catch because we are vendoring types for this hook and we can't be 100% sure that we are accessing API that is there
+      try {
+        if (!warning.module) {
+          return false;
+        }
+
+        const isDependencyThatMayRaiseCriticalDependencyMessage =
+          /@opentelemetry\/instrumentation/.test(warning.module.readableIdentifier(compilation.requestShortener)) ||
+          /@prisma\/instrumentation/.test(warning.module.readableIdentifier(compilation.requestShortener));
+        const isCriticalDependencyMessage = /Critical dependency/.test(warning.message);
+
+        return isDependencyThatMayRaiseCriticalDependencyMessage && isCriticalDependencyMessage;
+      } catch {
+        return false;
+      }
+    },
+    // We provide these objects in addition to the hook above to provide redundancy in case the hook fails.
     { module: /@opentelemetry\/instrumentation/, message: /Critical dependency/ },
     { module: /@prisma\/instrumentation/, message: /Critical dependency/ },
-  ];
+  ] satisfies IgnoreWarningsOption;
 
   if (newConfig.ignoreWarnings === undefined) {
     newConfig.ignoreWarnings = ignoreRules;

From c548c3c7f9793f6a96c16acf96e0a0a8da574346 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Fri, 28 Jun 2024 17:30:10 +0200
Subject: [PATCH 07/30] feat(node): Add `registerEsmLoaderHooks` option
 (#12684)

Currently the only way to disable ESM loader hook registration is to
set:
```ts
globalThis._sentryEsmLoaderHookRegistered = true;
```

After this PR, you can set the new `registerEsmLoaderHooks` option to
`false`:
```ts
import * as Sentry from '@sentry/node';

Sentry.init({
  dsn: '__DSN__',
  registerEsmLoaderHooks: false,
});
```

---------

Co-authored-by: Francesco Novy <francesco.novy@sentry.io>
---
 packages/node/src/sdk/index.ts |  2 +-
 packages/node/src/types.ts     | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/node/src/sdk/index.ts b/packages/node/src/sdk/index.ts
index 746136c03022..4c30ba2bd2cf 100644
--- a/packages/node/src/sdk/index.ts
+++ b/packages/node/src/sdk/index.ts
@@ -130,7 +130,7 @@ function _init(
     }
   }
 
-  if (!isCjs()) {
+  if (!isCjs() && options.registerEsmLoaderHooks !== false) {
     maybeInitializeEsmLoader();
   }
 
diff --git a/packages/node/src/types.ts b/packages/node/src/types.ts
index 2c00302e2e64..882114a013f9 100644
--- a/packages/node/src/types.ts
+++ b/packages/node/src/types.ts
@@ -85,6 +85,16 @@ export interface BaseNodeOptions {
    */
   maxSpanWaitDuration?: number;
 
+  /**
+   * Whether to register ESM loader hooks to automatically instrument libraries.
+   * This is necessary to auto instrument libraries that are loaded via ESM imports, but might it can cause issues
+   * with certain libraries. If you run into problems running your app with this enabled,
+   * please raise an issue in https://github.com/getsentry/sentry-javascript.
+   *
+   * Defaults to `true`.
+   */
+  registerEsmLoaderHooks?: boolean;
+
   /** Callback that is executed when a fatal global error occurs. */
   onFatalError?(this: void, error: Error): void;
 }

From 24dfc666fae9c2f0ce827acf5ac5c44917d15e99 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Fri, 28 Jun 2024 12:41:49 -0400
Subject: [PATCH 08/30] chore: Remove replace-in-file and inquirer (#12687)

ref: https://github.com/getsentry/sentry-javascript/pull/12644

We can remove `replace-in-file` with some built-in functions and clean
up our lockfile even more.

Extracted from the previous PR because 1 big change was breaking CI and
I couldn't figure out the root cause.
---
 .../bundle-analyzer-scenarios/package.json    |   7 +-
 .../bundle-analyzer-scenarios/webpack.cjs     |  35 ++--
 package.json                                  |  10 +-
 scripts/versionbump.js                        |  44 +++--
 yarn.lock                                     | 167 ++++++------------
 5 files changed, 108 insertions(+), 155 deletions(-)

diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index 2ff890293166..38e946577def 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -8,10 +8,9 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "html-webpack-plugin": "^5.5.0",
-    "inquirer": "^8.2.0",
-    "webpack": "^5.76.0",
-    "webpack-bundle-analyzer": "^4.5.0"
+    "html-webpack-plugin": "^5.6.0",
+    "webpack": "^5.92.1",
+    "webpack-bundle-analyzer": "^4.10.2"
   },
   "scripts": {
     "analyze": "node webpack.cjs"
diff --git a/dev-packages/bundle-analyzer-scenarios/webpack.cjs b/dev-packages/bundle-analyzer-scenarios/webpack.cjs
index aac95e59348a..f5874a607473 100644
--- a/dev-packages/bundle-analyzer-scenarios/webpack.cjs
+++ b/dev-packages/bundle-analyzer-scenarios/webpack.cjs
@@ -1,7 +1,7 @@
-const path = require('path');
-const { promises } = require('fs');
+const path = require('node:path');
+const { promises } = require('node:fs');
+const { parseArgs } = require('node:util');
 
-const inquirer = require('inquirer');
 const webpack = require('webpack');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -9,20 +9,25 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 async function init() {
   const scenarios = await getScenariosFromDirectories();
 
-  const answers = await inquirer.prompt([
-    {
-      type: 'rawlist',
-      name: 'scenario',
-      message: 'Which scenario you want to run?',
-      choices: scenarios,
-      pageSize: scenarios.length,
-      loop: false,
-    },
-  ]);
+  const { values } = parseArgs({
+    args: process.argv.slice(2),
+    options: { scenario: { type: 'string', short: 's' }, list: { type: 'boolean', short: 'l' } },
+  });
+
+  if (values.list) {
+    console.log('Available scenarios:', scenarios);
+    process.exit(0);
+  }
+
+  if (!scenarios.some(scenario => scenario === values.scenario)) {
+    console.error('Invalid scenario:', values.scenario);
+    console.error('Available scenarios:', scenarios);
+    process.exit(1);
+  }
 
-  console.log(`Bundling scenario: ${answers.scenario}`);
+  console.log(`Bundling scenario: ${values.scenario}`);
 
-  await runWebpack(answers.scenario);
+  await runWebpack(values.scenario);
 }
 
 async function runWebpack(scenario) {
diff --git a/package.json b/package.json
index 41181d7a0ffd..a1ff37a848a6 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,6 @@
     "nodemon": "^2.0.16",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.1",
-    "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
     "rollup": "^4.13.0",
     "rollup-plugin-cleanup": "^3.2.1",
@@ -134,8 +133,15 @@
     "vitest": "^1.6.0",
     "yalc": "^1.0.0-pre.53"
   },
+  "//_resolutions_comment": [
+    "Because new versions of strip-ansi, string-width, and wrap-ansi are ESM only packages,",
+    "we need to resolve them to the CommonJS versions.",
+    "This is a temporary solution until we can upgrade to a version of lerna that supports ESM packages"
+  ],
   "resolutions": {
-    "gauge/strip-ansi": "6.0.1"
+    "gauge/strip-ansi": "6.0.1",
+    "wide-align/string-width": "4.2.3",
+    "cliui/wrap-ansi": "7.0.0"
   },
   "version": "0.0.0",
   "name": "sentry-javascript",
diff --git a/scripts/versionbump.js b/scripts/versionbump.js
index e0edddfbca9c..931df2a7829c 100644
--- a/scripts/versionbump.js
+++ b/scripts/versionbump.js
@@ -1,21 +1,31 @@
-const replace = require('replace-in-file');
+const { readFile, writeFile } = require('node:fs').promises;
 const pjson = require(`${process.cwd()}/package.json`);
 
-const files = process.argv.slice(2);
-if (files.length === 0) {
-  console.error('Please provide files to bump');
-  process.exit(1);
-}
+const REPLACE_REGEX = /\d+\.\d+.\d+(?:-\w+(?:\.\w+)?)?/g;
+
+async function run() {
+  const files = process.argv.slice(2);
+  if (files.length === 0) {
+    // eslint-disable-next-line no-console
+    console.error('[versionbump] Please provide files to bump');
+    process.exit(1);
+  }
 
-replace({
-  files: files,
-  from: /\d+\.\d+.\d+(?:-\w+(?:\.\w+)?)?/g,
-  to: pjson.version,
-})
-  .then(changedFiles => {
-    console.log('Modified files:', changedFiles.join(', '));
-  })
-  .catch(error => {
-    console.error('Error occurred:', error);
+  try {
+    await Promise.all(
+      files.map(async file => {
+        const data = String(await readFile(file, 'utf8'));
+        await writeFile(file, data.replace(REPLACE_REGEX, pjson.version));
+      }),
+    );
+
+    // eslint-disable-next-line no-console
+    console.log(`[versionbump] Bumped version for ${files.join(', ')}`);
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error('[versionbump] Error occurred:', error);
     process.exit(1);
-  });
+  }
+}
+
+run();
diff --git a/yarn.lock b/yarn.lock
index 3381d4487950..b8bf4eeeb15c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13855,7 +13855,7 @@ camelcase@5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
   integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
 
-camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -14278,15 +14278,6 @@ clipboardy@^4.0.0:
     is-wsl "^3.1.0"
     is64bit "^2.0.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -15434,7 +15425,7 @@ decamelize-keys@^1.1.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.2.0:
+decamelize@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -16988,7 +16979,7 @@ enhanced-resolve@^4.5.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-enhanced-resolve@^5.10.0, enhanced-resolve@^5.16.0:
+enhanced-resolve@^5.10.0:
   version "5.16.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
   integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
@@ -17012,6 +17003,14 @@ enhanced-resolve@^5.15.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+enhanced-resolve@^5.17.0:
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5"
+  integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 enquirer@^2.3.5, enquirer@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -19183,7 +19182,7 @@ get-amd-module-type@^5.0.1:
     ast-module-types "^5.0.0"
     node-source-walk "^6.0.1"
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -20483,6 +20482,17 @@ html-webpack-plugin@^5.5.0:
     pretty-error "^4.0.0"
     tapable "^2.0.0"
 
+html-webpack-plugin@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
+  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
+  dependencies:
+    "@types/html-minifier-terser" "^6.0.0"
+    html-minifier-terser "^6.0.2"
+    lodash "^4.17.21"
+    pretty-error "^4.0.0"
+    tapable "^2.0.0"
+
 htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
@@ -20962,27 +20972,6 @@ inquirer@^7.0.1:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-inquirer@^8.2.0:
-  version "8.2.6"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.6.tgz#733b74888195d8d400a67ac332011b5fae5ea562"
-  integrity sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.1"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.21"
-    mute-stream "0.0.8"
-    ora "^5.4.1"
-    run-async "^2.4.0"
-    rxjs "^7.5.5"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-    wrap-ansi "^6.0.1"
-
 inquirer@^8.2.4:
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
@@ -29451,15 +29440,6 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-replace-in-file@^4.0.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/replace-in-file/-/replace-in-file-4.3.1.tgz#c67c92178b38052008e379197cc0d86ca927f7b0"
-  integrity sha512-FqVvfmpqGTD2JRGI1JjJ86b24P17x/WWwGdxExeyJxnh/2rVQz2+jXfD1507UnnhEQw092X0u0DPCBf1WC4ooQ==
-  dependencies:
-    chalk "^2.4.2"
-    glob "^7.1.6"
-    yargs "^15.0.2"
-
 require-at@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/require-at/-/require-at-1.0.6.tgz#9eb7e3c5e00727f5a4744070a7f560d4de4f6e6a"
@@ -29484,11 +29464,6 @@ require-in-the-middle@^7.1.1:
     module-details-from-path "^1.0.3"
     resolve "^1.22.1"
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
 requireindex@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
@@ -31378,8 +31353,7 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -34090,10 +34064,10 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-bundle-analyzer@^4.5.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz#84b7473b630a7b8c21c741f81d8fe4593208b454"
-  integrity sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==
+webpack-bundle-analyzer@^4.10.2:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
+  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -34103,7 +34077,6 @@ webpack-bundle-analyzer@^4.5.0:
     escape-string-regexp "^4.0.0"
     gzip-size "^6.0.0"
     html-escaper "^2.0.2"
-    is-plain-object "^5.0.0"
     opener "^1.5.2"
     picocolors "^1.0.0"
     sirv "^2.0.3"
@@ -34252,26 +34225,26 @@ webpack@^4.47.0:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-webpack@^5.76.0:
-  version "5.91.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
-  integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
+webpack@^5.90.3, webpack@~5.90.3:
+  version "5.90.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac"
+  integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
     acorn-import-assertions "^1.9.0"
     browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.16.0"
+    enhanced-resolve "^5.15.0"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.11"
+    graceful-fs "^4.2.9"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
@@ -34279,29 +34252,29 @@ webpack@^5.76.0:
     schema-utils "^3.2.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.1"
+    watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-webpack@^5.90.3, webpack@~5.90.3:
-  version "5.90.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac"
-  integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==
+webpack@^5.92.1:
+  version "5.92.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.1.tgz#eca5c1725b9e189cffbd86e8b6c3c7400efc5788"
+  integrity sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
+    acorn-import-attributes "^1.9.5"
     browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
+    enhanced-resolve "^5.17.0"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
@@ -34309,7 +34282,7 @@ webpack@^5.90.3, webpack@~5.90.3:
     schema-utils "^3.2.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.0"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
@@ -34410,11 +34383,6 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
 which-pm-runs@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35"
@@ -34568,8 +34536,7 @@ workerpool@^6.4.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
   integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -34578,15 +34545,6 @@ workerpool@^6.4.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -34791,14 +34749,6 @@ yargs-parser@21.1.1, yargs-parser@^21.0.0, yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs@16.2.0, yargs@^16.1.1, yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
@@ -34825,23 +34775,6 @@ yargs@17.5.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
-yargs@^15.0.2:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
 yargs@^17.2.1:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"

From f4a289d30e1a638f3f979bbd88102db009e748f8 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 1 Jul 2024 12:44:30 +0200
Subject: [PATCH 09/30] test: Add OTEL E2E test app using sdk-node (#12690)

This adds an E2E app using a custom OTEL setup with
`@opentelemetry/sdk-node`.

It tests that data is sent both to sentry as well as to another OTLP
exporter. For this, I adjusted the event proxy code to also allow to
spin up a generic event proxy server (which I use for the OTLP
exporter). I also rewrote this to use fetch as this is a bit easier to
read IMHO.

This is a decent first step, we should add at least 2 more E2E test apps
IMHO related to OTEL:

1. An app using `@opentelemetry/sdk-trace-node` and some more custom
tracing setup (e.g. more instrumentation, custom sampler, ....)
2. An app using `@opentelemetry/sdk-trace-node` that does not use Sentry
for performance at all, but only for errors, and only uses OTEL for
trace monitoring.

Part of https://github.com/getsentry/sentry-javascript/issues/12494
---
 .github/workflows/build.yml                   |   1 +
 .../node-otel-sdk-node/.gitignore             |   1 +
 .../node-otel-sdk-node/.npmrc                 |   2 +
 .../node-otel-sdk-node/package.json           |  32 +++
 .../node-otel-sdk-node/playwright.config.mjs  |  34 +++
 .../node-otel-sdk-node/src/app.ts             |  53 ++++
 .../node-otel-sdk-node/src/instrument.ts      |  35 +++
 .../node-otel-sdk-node/start-event-proxy.mjs  |   6 +
 .../node-otel-sdk-node/start-otel-proxy.mjs   |   6 +
 .../node-otel-sdk-node/tests/errors.test.ts   |  29 +++
 .../tests/transactions.test.ts                | 213 +++++++++++++++
 .../node-otel-sdk-node/tsconfig.json          |  10 +
 .../test-utils/src/event-proxy-server.ts      | 244 +++++++++++-------
 dev-packages/test-utils/src/index.ts          |   2 +
 14 files changed, 570 insertions(+), 98 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.gitignore
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.npmrc
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/playwright.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/app.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/instrument.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-event-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-otel-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/errors.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tsconfig.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 445c57284056..85fc105d0e42 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1050,6 +1050,7 @@ jobs:
             'node-express-esm-preload',
             'node-express-esm-without-loader',
             'node-express-cjs-preload',
+            'node-otel-sdk-node',
             'nextjs-app-dir',
             'nextjs-14',
             'nextjs-15',
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.gitignore b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.npmrc b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.npmrc
new file mode 100644
index 000000000000..070f80f05092
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.npmrc
@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json
new file mode 100644
index 000000000000..8a1634725184
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "node-otel-sdk-trace",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/app.js",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install && pnpm build",
+    "test:assert": "pnpm test"
+  },
+  "dependencies": {
+    "@opentelemetry/sdk-node": "0.52.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
+    "@sentry/core": "latest || *",
+    "@sentry/node": "latest || *",
+    "@sentry/opentelemetry": "latest || *",
+    "@sentry/types": "latest || *",
+    "@types/express": "4.17.17",
+    "@types/node": "18.15.1",
+    "express": "4.19.2",
+    "typescript": "4.9.5"
+  },
+  "devDependencies": {
+    "@playwright/test": "^1.44.1",
+    "@sentry-internal/test-utils": "link:../../../test-utils"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/playwright.config.mjs
new file mode 100644
index 000000000000..888e61cfb2dc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/playwright.config.mjs
@@ -0,0 +1,34 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig(
+  {
+    startCommand: `pnpm start`,
+  },
+  {
+    webServer: [
+      {
+        command: `node ./start-event-proxy.mjs`,
+        port: 3031,
+        stdout: 'pipe',
+        stderr: 'pipe',
+      },
+      {
+        command: `node ./start-otel-proxy.mjs`,
+        port: 3032,
+        stdout: 'pipe',
+        stderr: 'pipe',
+      },
+      {
+        command: 'pnpm start',
+        port: 3030,
+        stdout: 'pipe',
+        stderr: 'pipe',
+        env: {
+          PORT: 3030,
+        },
+      },
+    ],
+  },
+);
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/app.ts b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/app.ts
new file mode 100644
index 000000000000..26779990f6d1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/app.ts
@@ -0,0 +1,53 @@
+import './instrument';
+
+// Other imports below
+import * as Sentry from '@sentry/node';
+import express from 'express';
+
+const app = express();
+const port = 3030;
+
+app.get('/test-success', function (req, res) {
+  res.send({ version: 'v1' });
+});
+
+app.get('/test-param/:param', function (req, res) {
+  res.send({ paramWas: req.params.param });
+});
+
+app.get('/test-transaction', function (req, res) {
+  Sentry.withActiveSpan(null, async () => {
+    Sentry.startSpan({ name: 'test-transaction', op: 'e2e-test' }, () => {
+      Sentry.startSpan({ name: 'test-span' }, () => undefined);
+    });
+
+    await Sentry.flush();
+
+    res.send({});
+  });
+});
+
+app.get('/test-error', async function (req, res) {
+  const exceptionId = Sentry.captureException(new Error('This is an error'));
+
+  await Sentry.flush(2000);
+
+  res.send({ exceptionId });
+});
+
+app.get('/test-exception/:id', function (req, _res) {
+  throw new Error(`This is an exception with id ${req.params.id}`);
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+app.use(function onError(err: unknown, req: any, res: any, next: any) {
+  // The error id is attached to `res.sentry` to be returned
+  // and optionally displayed to the user for support.
+  res.statusCode = 500;
+  res.end(res.sentry + '\n');
+});
+
+app.listen(port, () => {
+  console.log(`Example app listening on port ${port}`);
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/instrument.ts b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/instrument.ts
new file mode 100644
index 000000000000..fb270e1252d3
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/src/instrument.ts
@@ -0,0 +1,35 @@
+const opentelemetry = require('@opentelemetry/sdk-node');
+const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
+const Sentry = require('@sentry/node');
+const { SentrySpanProcessor, SentryPropagator, SentrySampler } = require('@sentry/opentelemetry');
+
+const sentryClient = Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn:
+    process.env.E2E_TEST_DSN ||
+    'https://3b6c388182fb435097f41d181be2b2ba@o4504321058471936.ingest.sentry.io/4504321066008576',
+  includeLocalVariables: true,
+  debug: !!process.env.DEBUG,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1,
+
+  skipOpenTelemetrySetup: true,
+});
+
+const sdk = new opentelemetry.NodeSDK({
+  sampler: sentryClient ? new SentrySampler(sentryClient) : undefined,
+  textMapPropagator: new SentryPropagator(),
+  contextManager: new Sentry.SentryContextManager(),
+  spanProcessors: [
+    new SentrySpanProcessor(),
+    new opentelemetry.node.BatchSpanProcessor(
+      new OTLPTraceExporter({
+        url: 'http://localhost:3032/',
+      }),
+    ),
+  ],
+});
+
+sdk.start();
+
+Sentry.validateOpenTelemetrySetup();
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-event-proxy.mjs
new file mode 100644
index 000000000000..8c74fa842a1b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'node-otel-sdk-trace',
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-otel-proxy.mjs b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-otel-proxy.mjs
new file mode 100644
index 000000000000..1cf9ef3e2c27
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/start-otel-proxy.mjs
@@ -0,0 +1,6 @@
+import { startProxyServer } from '@sentry-internal/test-utils';
+
+startProxyServer({
+  port: 3032,
+  proxyServerName: 'node-otel-sdk-trace-otel',
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/errors.test.ts
new file mode 100644
index 000000000000..9cb97a051476
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/errors.test.ts
@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends correct error event', async ({ baseURL }) => {
+  const errorEventPromise = waitForError('node-otel-sdk-trace', event => {
+    return !event.type && event.exception?.values?.[0]?.value === 'This is an exception with id 123';
+  });
+
+  await fetch(`${baseURL}/test-exception/123`);
+
+  const errorEvent = await errorEventPromise;
+
+  expect(errorEvent.exception?.values).toHaveLength(1);
+  expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception with id 123');
+
+  expect(errorEvent.request).toEqual({
+    method: 'GET',
+    cookies: {},
+    headers: expect.any(Object),
+    url: 'http://localhost:3030/test-exception/123',
+  });
+
+  expect(errorEvent.transaction).toEqual('GET /test-exception/:id');
+
+  expect(errorEvent.contexts?.trace).toEqual({
+    trace_id: expect.any(String),
+    span_id: expect.any(String),
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
new file mode 100644
index 000000000000..39a7d27e9cb1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
@@ -0,0 +1,213 @@
+import { expect, test } from '@playwright/test';
+import { waitForPlainRequest, waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends an API route transaction', async ({ baseURL }) => {
+  const pageloadTransactionEventPromise = waitForTransaction('node-otel-sdk-trace', transactionEvent => {
+    return (
+      transactionEvent?.contexts?.trace?.op === 'http.server' &&
+      transactionEvent?.transaction === 'GET /test-transaction'
+    );
+  });
+
+  // Ensure we also send data to the OTLP endpoint
+  const otelPromise = waitForPlainRequest('node-otel-sdk-trace-otel', data => {
+    const json = JSON.parse(data) as any;
+
+    return json.resourceSpans.length > 0;
+  });
+
+  await fetch(`${baseURL}/test-transaction`);
+
+  const transactionEvent = await pageloadTransactionEventPromise;
+
+  const otelData = await otelPromise;
+
+  // For now we do not test the actual shape of this, but only existence
+  expect(otelData).toBeDefined();
+
+  expect(transactionEvent.contexts?.trace).toEqual({
+    data: {
+      'sentry.source': 'route',
+      'sentry.origin': 'auto.http.otel.http',
+      'sentry.op': 'http.server',
+      'sentry.sample_rate': 1,
+      url: 'http://localhost:3030/test-transaction',
+      'otel.kind': 'SERVER',
+      'http.response.status_code': 200,
+      'http.url': 'http://localhost:3030/test-transaction',
+      'http.host': 'localhost:3030',
+      'net.host.name': 'localhost',
+      'http.method': 'GET',
+      'http.scheme': 'http',
+      'http.target': '/test-transaction',
+      'http.user_agent': 'node',
+      'http.flavor': '1.1',
+      'net.transport': 'ip_tcp',
+      'net.host.ip': expect.any(String),
+      'net.host.port': expect.any(Number),
+      'net.peer.ip': expect.any(String),
+      'net.peer.port': expect.any(Number),
+      'http.status_code': 200,
+      'http.status_text': 'OK',
+      'http.route': '/test-transaction',
+    },
+    op: 'http.server',
+    span_id: expect.any(String),
+    status: 'ok',
+    trace_id: expect.any(String),
+    origin: 'auto.http.otel.http',
+  });
+
+  expect(transactionEvent).toEqual(
+    expect.objectContaining({
+      transaction: 'GET /test-transaction',
+      type: 'transaction',
+      transaction_info: {
+        source: 'route',
+      },
+    }),
+  );
+
+  const spans = transactionEvent.spans || [];
+
+  expect(spans).toContainEqual({
+    data: {
+      'sentry.origin': 'auto.http.otel.express',
+      'sentry.op': 'middleware.express',
+      'http.route': '/',
+      'express.name': 'query',
+      'express.type': 'middleware',
+      'otel.kind': 'INTERNAL',
+    },
+    description: 'query',
+    op: 'middleware.express',
+    origin: 'auto.http.otel.express',
+    parent_span_id: expect.any(String),
+    span_id: expect.any(String),
+    start_timestamp: expect.any(Number),
+    status: 'ok',
+    timestamp: expect.any(Number),
+    trace_id: expect.any(String),
+  });
+
+  expect(spans).toContainEqual({
+    data: {
+      'sentry.origin': 'auto.http.otel.express',
+      'sentry.op': 'middleware.express',
+      'http.route': '/',
+      'express.name': 'expressInit',
+      'express.type': 'middleware',
+      'otel.kind': 'INTERNAL',
+    },
+    description: 'expressInit',
+    op: 'middleware.express',
+    origin: 'auto.http.otel.express',
+    parent_span_id: expect.any(String),
+    span_id: expect.any(String),
+    start_timestamp: expect.any(Number),
+    status: 'ok',
+    timestamp: expect.any(Number),
+    trace_id: expect.any(String),
+  });
+
+  expect(spans).toContainEqual({
+    data: {
+      'sentry.origin': 'auto.http.otel.express',
+      'sentry.op': 'request_handler.express',
+      'http.route': '/test-transaction',
+      'express.name': '/test-transaction',
+      'express.type': 'request_handler',
+      'otel.kind': 'INTERNAL',
+    },
+    description: '/test-transaction',
+    op: 'request_handler.express',
+    origin: 'auto.http.otel.express',
+    parent_span_id: expect.any(String),
+    span_id: expect.any(String),
+    start_timestamp: expect.any(Number),
+    status: 'ok',
+    timestamp: expect.any(Number),
+    trace_id: expect.any(String),
+  });
+});
+
+test('Sends an API route transaction for an errored route', async ({ baseURL }) => {
+  const transactionEventPromise = waitForTransaction('node-otel-sdk-trace', transactionEvent => {
+    return (
+      transactionEvent.contexts?.trace?.op === 'http.server' &&
+      transactionEvent.transaction === 'GET /test-exception/:id' &&
+      transactionEvent.request?.url === 'http://localhost:3030/test-exception/777'
+    );
+  });
+
+  await fetch(`${baseURL}/test-exception/777`);
+
+  const transactionEvent = await transactionEventPromise;
+
+  expect(transactionEvent.contexts?.trace?.op).toEqual('http.server');
+  expect(transactionEvent.transaction).toEqual('GET /test-exception/:id');
+  expect(transactionEvent.contexts?.trace?.status).toEqual('internal_error');
+  expect(transactionEvent.contexts?.trace?.data?.['http.status_code']).toEqual(500);
+
+  const spans = transactionEvent.spans || [];
+
+  expect(spans).toContainEqual({
+    data: {
+      'sentry.origin': 'auto.http.otel.express',
+      'sentry.op': 'middleware.express',
+      'http.route': '/',
+      'express.name': 'query',
+      'express.type': 'middleware',
+      'otel.kind': 'INTERNAL',
+    },
+    description: 'query',
+    op: 'middleware.express',
+    origin: 'auto.http.otel.express',
+    parent_span_id: expect.any(String),
+    span_id: expect.any(String),
+    start_timestamp: expect.any(Number),
+    status: 'ok',
+    timestamp: expect.any(Number),
+    trace_id: expect.any(String),
+  });
+
+  expect(spans).toContainEqual({
+    data: {
+      'sentry.origin': 'auto.http.otel.express',
+      'sentry.op': 'middleware.express',
+      'http.route': '/',
+      'express.name': 'expressInit',
+      'express.type': 'middleware',
+      'otel.kind': 'INTERNAL',
+    },
+    description: 'expressInit',
+    op: 'middleware.express',
+    origin: 'auto.http.otel.express',
+    parent_span_id: expect.any(String),
+    span_id: expect.any(String),
+    start_timestamp: expect.any(Number),
+    status: 'ok',
+    timestamp: expect.any(Number),
+    trace_id: expect.any(String),
+  });
+
+  expect(spans).toContainEqual({
+    data: {
+      'sentry.origin': 'auto.http.otel.express',
+      'sentry.op': 'request_handler.express',
+      'http.route': '/test-exception/:id',
+      'express.name': '/test-exception/:id',
+      'express.type': 'request_handler',
+      'otel.kind': 'INTERNAL',
+    },
+    description: '/test-exception/:id',
+    op: 'request_handler.express',
+    origin: 'auto.http.otel.express',
+    parent_span_id: expect.any(String),
+    span_id: expect.any(String),
+    start_timestamp: expect.any(Number),
+    status: 'ok',
+    timestamp: expect.any(Number),
+    trace_id: expect.any(String),
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tsconfig.json
new file mode 100644
index 000000000000..8cb64e989ed9
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "types": ["node"],
+    "esModuleInterop": true,
+    "lib": ["es2018"],
+    "strict": true,
+    "outDir": "dist"
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/dev-packages/test-utils/src/event-proxy-server.ts b/dev-packages/test-utils/src/event-proxy-server.ts
index 82693bf4af89..30bedadc38bb 100644
--- a/dev-packages/test-utils/src/event-proxy-server.ts
+++ b/dev-packages/test-utils/src/event-proxy-server.ts
@@ -1,6 +1,5 @@
 import * as fs from 'fs';
 import * as http from 'http';
-import * as https from 'https';
 import type { AddressInfo } from 'net';
 import * as os from 'os';
 import * as path from 'path';
@@ -31,11 +30,27 @@ interface SentryRequestCallbackData {
   sentryResponseStatusCode?: number;
 }
 
+type OnRequest = (
+  eventCallbackListeners: Set<(data: string) => void>,
+  proxyRequest: http.IncomingMessage,
+  proxyRequestBody: string,
+) => Promise<[number, string, Record<string, string> | undefined]>;
+
 /**
- * Starts an event proxy server that will proxy events to sentry when the `tunnel` option is used. Point the `tunnel`
- * option to this server (like this `tunnel: http://localhost:${port option}/`).
+ * Start a generic proxy server.
+ * The `onRequest` callback receives the incoming request and the request body,
+ * and should return a promise that resolves to a tuple with:
+ * statusCode, responseBody, responseHeaders
  */
-export async function startEventProxyServer(options: EventProxyServerOptions): Promise<void> {
+export async function startProxyServer(
+  options: {
+    /** Port to start the event proxy server at. */
+    port: number;
+    /** The name for the proxy server used for referencing it with listener functions */
+    proxyServerName: string;
+  },
+  onRequest?: OnRequest,
+): Promise<void> {
   const eventCallbackListeners: Set<(data: string) => void> = new Set();
 
   const proxyServer = http.createServer((proxyRequest, proxyResponse) => {
@@ -59,102 +74,29 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
           ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
           : Buffer.concat(proxyRequestChunks).toString();
 
-      const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);
-
-      const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;
-
-      if (!envelopeHeader.dsn && shouldForwardEventToSentry) {
-        // eslint-disable-next-line no-console
-        console.log(
-          '[event-proxy-server] Warn: No dsn on envelope header. Maybe a client-report was received. Proxy request body:',
-          proxyRequestBody,
-        );
-
-        proxyResponse.writeHead(200);
-        proxyResponse.write('{}', 'utf-8');
-        proxyResponse.end();
-        return;
-      }
-
-      if (!shouldForwardEventToSentry) {
-        const data: SentryRequestCallbackData = {
-          envelope: parseEnvelope(proxyRequestBody),
-          rawProxyRequestBody: proxyRequestBody,
-          rawSentryResponseBody: '',
-          sentryResponseStatusCode: 200,
-        };
-        eventCallbackListeners.forEach(listener => {
-          listener(Buffer.from(JSON.stringify(data)).toString('base64'));
-        });
-
-        proxyResponse.writeHead(200);
-        proxyResponse.write('{}', 'utf-8');
-        proxyResponse.end();
-        return;
-      }
-
-      const { origin, pathname, host } = new URL(envelopeHeader.dsn as string);
-
-      const projectId = pathname.substring(1);
-      const sentryIngestUrl = `${origin}/api/${projectId}/envelope/`;
-
-      proxyRequest.headers.host = host;
-
-      const sentryResponseChunks: Uint8Array[] = [];
-
-      const sentryRequest = https.request(
-        sentryIngestUrl,
-        { headers: proxyRequest.headers, method: proxyRequest.method },
-        sentryResponse => {
-          sentryResponse.addListener('data', (chunk: Buffer) => {
-            proxyResponse.write(chunk, 'binary');
-            sentryResponseChunks.push(chunk);
-          });
-
-          sentryResponse.addListener('end', () => {
-            eventCallbackListeners.forEach(listener => {
-              const rawSentryResponseBody = Buffer.concat(sentryResponseChunks).toString();
-
-              try {
-                const data: SentryRequestCallbackData = {
-                  envelope: parseEnvelope(proxyRequestBody),
-                  rawProxyRequestBody: proxyRequestBody,
-                  rawSentryResponseBody,
-                  sentryResponseStatusCode: sentryResponse.statusCode,
-                };
-
-                listener(Buffer.from(JSON.stringify(data)).toString('base64'));
-              } catch (error) {
-                if (`${error}`.includes('Unexpected token') && proxyRequestBody.includes('{"type":"replay_event"}')) {
-                  // eslint-disable-next-line no-console
-                  console.log('[event-proxy-server] Info: Received replay event, skipping...');
-                } else {
-                  // eslint-disable-next-line no-console
-                  console.error(
-                    '[event-proxy-server] Error: Failed to parse Sentry request envelope',
-                    error,
-                    proxyRequestBody,
-                  );
-                }
-              }
-            });
-            proxyResponse.end();
+      const callback: OnRequest =
+        onRequest ||
+        (async (eventCallbackListeners, proxyRequest, proxyRequestBody) => {
+          eventCallbackListeners.forEach(listener => {
+            listener(proxyRequestBody);
           });
 
-          sentryResponse.addListener('error', err => {
-            // eslint-disable-next-line no-console
-            console.log('[event-proxy-server] Warn: Proxying to Sentry returned an error!', err);
-            proxyResponse.writeHead(500);
-            proxyResponse.write('{}', 'utf-8');
-            proxyResponse.end();
-          });
-
-          proxyResponse.writeHead(sentryResponse.statusCode || 500, sentryResponse.headers);
-        },
-      );
+          return [200, '{}', {}];
+        });
 
-      sentryRequest.write(Buffer.concat(proxyRequestChunks), 'binary');
-      sentryRequest.end();
+      callback(eventCallbackListeners, proxyRequest, proxyRequestBody)
+        .then(([statusCode, responseBody, responseHeaders]) => {
+          proxyResponse.writeHead(statusCode, responseHeaders);
+          proxyResponse.write(responseBody, 'utf-8');
+          proxyResponse.end();
+        })
+        .catch(error => {
+          // eslint-disable-next-line no-console
+          console.log('[event-proxy-server] Warn: Proxy server returned an error', error);
+          proxyResponse.writeHead(500);
+          proxyResponse.write('{}', 'utf-8');
+          proxyResponse.end();
+        });
     });
   });
 
@@ -193,7 +135,113 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 
   await eventCallbackServerStartupPromise;
   await proxyServerStartupPromise;
-  return;
+}
+
+/**
+ * Starts an event proxy server that will proxy events to sentry when the `tunnel` option is used. Point the `tunnel`
+ * option to this server (like this `tunnel: http://localhost:${port option}/`).
+ */
+export async function startEventProxyServer(options: EventProxyServerOptions): Promise<void> {
+  await startProxyServer(options, async (eventCallbackListeners, proxyRequest, proxyRequestBody) => {
+    const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);
+
+    const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;
+
+    if (!envelopeHeader.dsn && shouldForwardEventToSentry) {
+      // eslint-disable-next-line no-console
+      console.log(
+        '[event-proxy-server] Warn: No dsn on envelope header. Maybe a client-report was received. Proxy request body:',
+        proxyRequestBody,
+      );
+
+      return [200, '{}', {}];
+    }
+
+    if (!shouldForwardEventToSentry) {
+      const data: SentryRequestCallbackData = {
+        envelope: parseEnvelope(proxyRequestBody),
+        rawProxyRequestBody: proxyRequestBody,
+        rawSentryResponseBody: '',
+        sentryResponseStatusCode: 200,
+      };
+      eventCallbackListeners.forEach(listener => {
+        listener(Buffer.from(JSON.stringify(data)).toString('base64'));
+      });
+
+      return [200, '{}', {}];
+    }
+
+    const { origin, pathname, host } = new URL(envelopeHeader.dsn as string);
+
+    const projectId = pathname.substring(1);
+    const sentryIngestUrl = `${origin}/api/${projectId}/envelope/`;
+
+    proxyRequest.headers.host = host;
+
+    const reqHeaders: Record<string, string> = {};
+    for (const [key, value] of Object.entries(proxyRequest.headers)) {
+      reqHeaders[key] = value as string;
+    }
+
+    // Fetch does not like this
+    delete reqHeaders['transfer-encoding'];
+
+    return fetch(sentryIngestUrl, {
+      body: proxyRequestBody,
+      headers: reqHeaders,
+      method: proxyRequest.method,
+    }).then(async res => {
+      const rawSentryResponseBody = await res.text();
+      const data: SentryRequestCallbackData = {
+        envelope: parseEnvelope(proxyRequestBody),
+        rawProxyRequestBody: proxyRequestBody,
+        rawSentryResponseBody,
+        sentryResponseStatusCode: res.status,
+      };
+
+      eventCallbackListeners.forEach(listener => {
+        listener(Buffer.from(JSON.stringify(data)).toString('base64'));
+      });
+
+      const resHeaders: Record<string, string> = {};
+      for (const [key, value] of res.headers.entries()) {
+        resHeaders[key] = value;
+      }
+
+      return [res.status, rawSentryResponseBody, resHeaders];
+    });
+  });
+}
+
+/** Wait for any plain request being made to the proxy. */
+export async function waitForPlainRequest(
+  proxyServerName: string,
+  callback: (eventData: string) => Promise<boolean> | boolean,
+): Promise<string> {
+  const eventCallbackServerPort = await retrieveCallbackServerPort(proxyServerName);
+
+  return new Promise((resolve, reject) => {
+    const request = http.request(`http://localhost:${eventCallbackServerPort}/`, {}, response => {
+      let eventContents = '';
+
+      response.on('error', err => {
+        reject(err);
+      });
+
+      response.on('data', (chunk: Buffer) => {
+        const chunkString = chunk.toString('utf8');
+
+        eventContents = eventContents.concat(chunkString);
+
+        if (callback(eventContents)) {
+          response.destroy();
+          return resolve(eventContents);
+        }
+      });
+    });
+
+    request.end();
+  });
 }
 
 /** Wait for a request to be sent. */
diff --git a/dev-packages/test-utils/src/index.ts b/dev-packages/test-utils/src/index.ts
index 4425d2688800..49685a6b18c2 100644
--- a/dev-packages/test-utils/src/index.ts
+++ b/dev-packages/test-utils/src/index.ts
@@ -1,9 +1,11 @@
 export {
+  startProxyServer,
   startEventProxyServer,
   waitForEnvelopeItem,
   waitForError,
   waitForRequest,
   waitForTransaction,
+  waitForPlainRequest,
 } from './event-proxy-server';
 
 export { getPlaywrightConfig } from './playwright-config';

From f60aae569eacf444014c19cf28177f74f2e0a657 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 1 Jul 2024 13:14:30 +0200
Subject: [PATCH 10/30] feat(nuxt): Configure sentry in external config
 (#12681)

To be able to differentiate between a browser/client execution context,
sentry is initialized in an external config file. An import statement in
`nuxt-root.vue` is added which loads this config file.

Nuxt tracking issue:
https://github.com/getsentry/sentry-javascript/issues/9095

---------

Co-authored-by: Abhijeet Prasad <aprasad@sentry.io>
---
 packages/nuxt/README.md                       | 28 +++---
 packages/nuxt/package.json                    | 38 ++++---
 packages/nuxt/rollup.npm.config.mjs           |  7 ++
 packages/nuxt/src/client/sdk.ts               |  8 +-
 packages/nuxt/src/common/debug-build.ts       |  8 ++
 packages/nuxt/src/common/snippets.ts          | 47 +++++++++
 packages/nuxt/src/common/types.ts             |  3 +-
 packages/nuxt/src/index.types.ts              |  2 +-
 packages/nuxt/src/module.ts                   | 38 +++++--
 .../nuxt/src/runtime/plugins/sentry.client.ts | 15 +--
 packages/nuxt/test/client/sdk.test.ts         |  4 +-
 packages/nuxt/test/common/snippets.test.ts    | 98 +++++++++++++++++++
 12 files changed, 253 insertions(+), 43 deletions(-)
 create mode 100644 packages/nuxt/rollup.npm.config.mjs
 create mode 100644 packages/nuxt/src/common/debug-build.ts
 create mode 100644 packages/nuxt/src/common/snippets.ts
 create mode 100644 packages/nuxt/test/common/snippets.test.ts

diff --git a/packages/nuxt/README.md b/packages/nuxt/README.md
index dcfc869cb108..e33201b21518 100644
--- a/packages/nuxt/README.md
+++ b/packages/nuxt/README.md
@@ -49,27 +49,33 @@ If the setup through the wizard doesn't work for you, you can also set up the SD
    yarn add @sentry/nuxt
    ```
 
-### 2. Client-side Setup
+### 2. Nuxt Module Setup
 
 The Sentry Nuxt SDK is based on [Nuxt Modules](https://nuxt.com/docs/api/kit/modules).
 
-1. Add `@sentry/nuxt` to the modules section of `nuxt.config.ts`:
+1. Add `@sentry/nuxt/module` to the modules section of `nuxt.config.ts`:
 
 ```javascript
 // nuxt.config.ts
 export default defineNuxtConfig({
-  modules: ['@sentry/nuxt'],
-  runtimeConfig: {
-    public: {
-      sentry: {
-        dsn: env.DSN,
-        // Additional config
-      },
-    },
-  },
+  modules: ['@sentry/nuxt/module'],
 });
 ```
 
+2. Add a `sentry.client.config.(js|ts)` file to the root of your project:
+
+```javascript
+import * as Sentry from '@sentry/nuxt';
+
+if (!import.meta.env.SSR) {
+  Sentry.init({
+    dsn: env.DSN,
+    replaysSessionSampleRate: 0.1,
+    replaysOnErrorSampleRate: 1.0,
+  });
+}
+```
+
 ### 3. Server-side Setup
 
 todo: add server-side setup
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 4862d08aba2d..1a9bbb4c009a 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -12,16 +12,28 @@
   "files": [
     "/build"
   ],
-  "main": "build/module.cjs",
-  "module": "build/module.mjs",
-  "types": "build/types.d.ts",
+  "main": "build/cjs/index.server.js",
+  "module": "build/esm/index.server.js",
+  "browser": "build/esm/index.client.js",
+  "types": "build/types/index.types.d.ts",
   "exports": {
+    "./package.json": "./package.json",
     ".": {
-      "types": "./build/types.d.ts",
-      "import": "./build/module.mjs",
-      "require": "./build/module.cjs"
+      "types": "./build/types/index.types.d.ts",
+      "browser": {
+        "import": "./build/esm/index.client.js",
+        "require": "./build/cjs/index.client.js"
+      },
+      "node": {
+        "import": "./build/esm/index.server.js",
+        "require": "./build/cjs/index.server.js"
+      }
     },
-    "./package.json": "./package.json"
+    "./module": {
+      "types": "./build/module/types.d.ts",
+      "import": "./build/module/module.mjs",
+      "require": "./build/module/module.cjs"
+    }
   },
   "publishConfig": {
     "access": "public"
@@ -31,6 +43,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.12.2",
+    "@sentry/browser": "8.13.0",
     "@sentry/core": "8.13.0",
     "@sentry/node": "8.13.0",
     "@sentry/opentelemetry": "8.13.0",
@@ -44,12 +57,14 @@
     "nuxt": "^3.12.2"
   },
   "scripts": {
-    "build": "run-p build:transpile",
+    "build": "run-p build:transpile build:types build:nuxt-module",
     "build:dev": "yarn build",
-    "build:transpile": "nuxt-module-build build --outDir build",
+    "build:nuxt-module": "nuxt-module-build build --outDir build/module",
+    "build:transpile": "rollup -c rollup.npm.config.mjs",
+    "build:types": "tsc -p tsconfig.types.json",
     "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "yarn build:watch",
-    "build:transpile:watch": "nuxt-module-build build --outDir build --watch",
+    "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts",
@@ -72,7 +87,8 @@
           "^build:types"
         ],
         "outputs": [
-          "{projectRoot}/build"
+          "{projectRoot}/build",
+          "{projectRoot}/build/module"
         ]
       }
     }
diff --git a/packages/nuxt/rollup.npm.config.mjs b/packages/nuxt/rollup.npm.config.mjs
new file mode 100644
index 000000000000..e800fdbba474
--- /dev/null
+++ b/packages/nuxt/rollup.npm.config.mjs
@@ -0,0 +1,7 @@
+import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
+
+export default makeNPMConfigVariants(
+  makeBaseNPMConfig({
+    entrypoints: ['src/index.client.ts', 'src/client/index.ts'],
+  }),
+);
diff --git a/packages/nuxt/src/client/sdk.ts b/packages/nuxt/src/client/sdk.ts
index 3a82dfb9f52f..e07c3267c902 100644
--- a/packages/nuxt/src/client/sdk.ts
+++ b/packages/nuxt/src/client/sdk.ts
@@ -1,19 +1,19 @@
+import { init as initBrowser } from '@sentry/browser';
 import { applySdkMetadata } from '@sentry/core';
 import type { Client } from '@sentry/types';
-import { init as initVue } from '@sentry/vue';
-import type { SentryVueOptions } from '../common/types';
+import type { SentryNuxtOptions } from '../common/types';
 
 /**
  * Initializes the client-side of the Nuxt SDK
  *
  * @param options Configuration options for the SDK.
  */
-export function init(options: SentryVueOptions): Client | undefined {
+export function init(options: SentryNuxtOptions): Client | undefined {
   const sentryOptions = {
     ...options,
   };
 
   applySdkMetadata(sentryOptions, 'nuxt', ['nuxt', 'vue']);
 
-  return initVue(sentryOptions);
+  return initBrowser(sentryOptions);
 }
diff --git a/packages/nuxt/src/common/debug-build.ts b/packages/nuxt/src/common/debug-build.ts
new file mode 100644
index 000000000000..60aa50940582
--- /dev/null
+++ b/packages/nuxt/src/common/debug-build.ts
@@ -0,0 +1,8 @@
+declare const __DEBUG_BUILD__: boolean;
+
+/**
+ * This serves as a build time flag that will be true by default, but false in non-debug builds or if users replace `__SENTRY_DEBUG__` in their generated code.
+ *
+ * ATTENTION: This constant must never cross package boundaries (i.e. be exported) to guarantee that it can be used for tree shaking.
+ */
+export const DEBUG_BUILD = __DEBUG_BUILD__;
diff --git a/packages/nuxt/src/common/snippets.ts b/packages/nuxt/src/common/snippets.ts
new file mode 100644
index 000000000000..5b8a3f1f3ea1
--- /dev/null
+++ b/packages/nuxt/src/common/snippets.ts
@@ -0,0 +1,47 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+/** Returns an import snippet */
+export function buildSdkInitFileImportSnippet(filePath: string): string {
+  const posixPath = filePath.split(path.sep).join(path.posix.sep);
+
+  // normalize to forward slashed for Windows-based systems
+  const normalizedPath = posixPath.replace(/\\/g, '/');
+
+  return `import '${normalizedPath}';`;
+}
+
+/**
+ * Script tag inside `nuxt-root.vue` (root component we get from NuxtApp)
+ */
+export const SCRIPT_TAG = '<script setup>';
+
+/**
+ * Adds a top-level import statement right after <script setup>.
+ * This should happen as early as possible (e.g. in root component)
+ */
+export function addImportStatement(filePath: string, importStatement: string): void {
+  try {
+    const data = fs.readFileSync(filePath, 'utf8');
+    const scriptIndex = data.indexOf(SCRIPT_TAG);
+
+    if (scriptIndex === -1) {
+      // eslint-disable-next-line no-console
+      console.warn(`[Sentry] Sentry not initialized. Could not find ${SCRIPT_TAG} in ${filePath}`);
+      return;
+    }
+
+    // Insert the import statement after the script tag
+    const output = data.replace(SCRIPT_TAG, `${SCRIPT_TAG}\n${importStatement}\n`);
+
+    try {
+      fs.writeFileSync(filePath, output, 'utf8');
+    } catch (err) {
+      //  eslint-disable-next-line no-console
+      console.error(`[Sentry] Error writing file to ${filePath}: ${err}`);
+    }
+  } catch (err) {
+    //  eslint-disable-next-line no-console
+    console.error(`[Sentry] Error reading file at ${filePath}: ${err}`);
+  }
+}
diff --git a/packages/nuxt/src/common/types.ts b/packages/nuxt/src/common/types.ts
index ef6edd9f5875..4b924f81192a 100644
--- a/packages/nuxt/src/common/types.ts
+++ b/packages/nuxt/src/common/types.ts
@@ -1,3 +1,4 @@
 import type { init } from '@sentry/vue';
 
-export type SentryVueOptions = Parameters<typeof init>[0] & object;
+// Omitting 'app' as the Nuxt SDK will add the app instance in the client plugin (users do not have to provide this)
+export type SentryNuxtOptions = Omit<Parameters<typeof init>[0] & object, 'app'>;
diff --git a/packages/nuxt/src/index.types.ts b/packages/nuxt/src/index.types.ts
index cb0ff5c3b541..4f1cce44fa36 100644
--- a/packages/nuxt/src/index.types.ts
+++ b/packages/nuxt/src/index.types.ts
@@ -1 +1 @@
-export {};
+export * from './client';
diff --git a/packages/nuxt/src/module.ts b/packages/nuxt/src/module.ts
index 480f70b1bd97..23c16b343b36 100644
--- a/packages/nuxt/src/module.ts
+++ b/packages/nuxt/src/module.ts
@@ -1,23 +1,49 @@
+import * as fs from 'fs';
+import * as path from 'path';
 import { type Resolver, addPlugin, createResolver, defineNuxtModule } from '@nuxt/kit';
-import type { SentryVueOptions } from './common/types';
+import { addImportStatement, buildSdkInitFileImportSnippet } from './common/snippets';
+import type { SentryNuxtOptions } from './common/types';
 
-export type ModuleOptions = SentryVueOptions;
+export type ModuleOptions = SentryNuxtOptions;
 
 export default defineNuxtModule<ModuleOptions>({
   meta: {
-    name: '@sentry/nuxt',
+    name: '@sentry/nuxt/module',
     configKey: 'sentry',
     compatibility: {
       nuxt: '^3.0.0',
     },
   },
-  // Default configuration options of the Nuxt module
   defaults: {},
-  setup(_moduleOptions, _nuxt) {
+  setup(_moduleOptions, nuxt) {
     const resolver: Resolver = createResolver(import.meta.url);
 
+    const pathToClientInit = findDefaultSdkInitFile('client');
+
+    if (pathToClientInit) {
+      nuxt.hook('app:templates', nuxtApp => {
+        if (nuxtApp.rootComponent) {
+          try {
+            addImportStatement(nuxtApp.rootComponent, buildSdkInitFileImportSnippet(pathToClientInit));
+          } catch (err) {
+            // eslint-disable-next-line no-console
+            console.error(`[Sentry] Could not add import statement to root component. ${err}`);
+          }
+        }
+      });
+    }
+
     if (resolver) {
-      addPlugin(resolver.resolve('runtime/plugins/sentry.client.js'));
+      addPlugin(resolver.resolve('./runtime/plugins/sentry.client'));
     }
   },
 });
+
+function findDefaultSdkInitFile(type: /* 'server' | */ 'client'): string | undefined {
+  const possibleFileExtensions = ['ts', 'js', 'mjs', 'cjs', 'mts', 'cts'];
+
+  const cwd = process.cwd();
+  return possibleFileExtensions
+    .map(e => path.resolve(path.join(cwd, `sentry.${type}.config.${e}`)))
+    .find(filename => fs.existsSync(filename));
+}
diff --git a/packages/nuxt/src/runtime/plugins/sentry.client.ts b/packages/nuxt/src/runtime/plugins/sentry.client.ts
index ab28e9ef5f6b..e15cdb31d7c6 100644
--- a/packages/nuxt/src/runtime/plugins/sentry.client.ts
+++ b/packages/nuxt/src/runtime/plugins/sentry.client.ts
@@ -1,12 +1,13 @@
-import { defineNuxtPlugin, useRuntimeConfig } from 'nuxt/app';
-import { init } from '../../client';
+import { getClient } from '@sentry/core';
+import { vueIntegration } from '@sentry/vue';
+import { defineNuxtPlugin } from 'nuxt/app';
 
 export default defineNuxtPlugin(nuxtApp => {
-  const config = useRuntimeConfig();
-  const sentryConfig = config.public.sentry || {};
+  nuxtApp.hook('app:created', vueApp => {
+    const sentryClient = getClient();
 
-  init({
-    ...sentryConfig,
-    app: nuxtApp.vueApp,
+    if (sentryClient) {
+      sentryClient.addIntegration(vueIntegration({ app: vueApp }));
+    }
   });
 });
diff --git a/packages/nuxt/test/client/sdk.test.ts b/packages/nuxt/test/client/sdk.test.ts
index 9a868f132198..23766e9da0e3 100644
--- a/packages/nuxt/test/client/sdk.test.ts
+++ b/packages/nuxt/test/client/sdk.test.ts
@@ -1,9 +1,9 @@
+import * as SentryBrowser from '@sentry/browser';
 import { SDK_VERSION } from '@sentry/vue';
-import * as SentryVue from '@sentry/vue';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { init } from '../../src/client';
 
-const vueInit = vi.spyOn(SentryVue, 'init');
+const vueInit = vi.spyOn(SentryBrowser, 'init');
 
 describe('Nuxt Client SDK', () => {
   describe('init', () => {
diff --git a/packages/nuxt/test/common/snippets.test.ts b/packages/nuxt/test/common/snippets.test.ts
new file mode 100644
index 000000000000..c36921eb9823
--- /dev/null
+++ b/packages/nuxt/test/common/snippets.test.ts
@@ -0,0 +1,98 @@
+import * as fs from 'fs';
+
+import * as path from 'path';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { SCRIPT_TAG, addImportStatement, buildSdkInitFileImportSnippet } from '../../src/common/snippets';
+
+describe('Nuxt Code Snippets', () => {
+  describe('buildSdkInitFileImportSnippet', () => {
+    it('returns correct import statement for POSIX path', () => {
+      const filePath = 'src/myFile.ts';
+      const expectedOutput = "import 'src/myFile.ts';";
+      const result = buildSdkInitFileImportSnippet(filePath);
+      expect(result).toBe(expectedOutput);
+    });
+
+    it('returns correct import statement for Windows path', () => {
+      const filePath = 'src\\myFile.ts';
+      const expectedOutput = "import 'src/myFile.ts';";
+      const result = buildSdkInitFileImportSnippet(filePath);
+      expect(result).toBe(expectedOutput);
+    });
+
+    it('returns correct import statement for path with multiple segments', () => {
+      const filePath = path.join('src', 'myDir', 'myFile.ts');
+      const expectedOutput = "import 'src/myDir/myFile.ts';";
+      const result = buildSdkInitFileImportSnippet(filePath);
+      expect(result).toBe(expectedOutput);
+    });
+  });
+
+  describe('addImportStatement', () => {
+    vi.mock('fs');
+
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it('should add import statement to file', () => {
+      const readFileSyncSpy = vi.spyOn(fs, 'readFileSync');
+      const writeFileSyncSpy = vi.spyOn(fs, 'writeFileSync');
+
+      const filePath = 'testFile.ts';
+      const importStatement = 'import { test } from "./test";';
+      const fileContent =
+        '<template>\n' +
+        '  <Suspense @resolve="onResolve">\n' +
+        '  </Suspense>\n' +
+        '</template>\n' +
+        '\n' +
+        '<script setup>\n' +
+        "import { provide } from 'vue'\n" +
+        "import { useNuxtApp } from '../nuxt'";
+
+      const fileContentExpected =
+        '<template>\n' +
+        '  <Suspense @resolve="onResolve">\n' +
+        '  </Suspense>\n' +
+        '</template>\n' +
+        '\n' +
+        '<script setup>\n' +
+        `${importStatement}\n\n` +
+        "import { provide } from 'vue'\n" +
+        "import { useNuxtApp } from '../nuxt'";
+
+      readFileSyncSpy.mockReturnValue(fileContent);
+      writeFileSyncSpy.mockImplementation(() => {});
+
+      addImportStatement(filePath, importStatement);
+
+      expect(fs.readFileSync).toHaveBeenCalledWith(filePath, 'utf8');
+      expect(fs.writeFileSync).toHaveBeenCalledWith(filePath, fileContentExpected, 'utf8');
+    });
+
+    it('should handle when SCRIPT_TAG is not found in file', () => {
+      const readFileSyncSpy = vi.spyOn(fs, 'readFileSync');
+      const writeFileSyncSpy = vi.spyOn(fs, 'writeFileSync');
+      const consoleWarnSpy = vi.spyOn(console, 'warn');
+
+      const filePath = 'testFile.ts';
+      const importStatement = 'import { test } from "./test";';
+      const fileContent = "import { provide } from 'vue'\nimport { useNuxtApp } from '../nuxt'";
+
+      // The file content does not contain SCRIPT_TAG
+      readFileSyncSpy.mockReturnValue(fileContent);
+      writeFileSyncSpy.mockImplementation(() => {});
+
+      addImportStatement(filePath, importStatement);
+
+      // The file content should remain the same as SCRIPT_TAG is not found
+      expect(fs.readFileSync).toHaveBeenCalledWith(filePath, 'utf8');
+      expect(fs.writeFileSync).not.toHaveBeenCalled();
+      expect(consoleWarnSpy).toHaveBeenCalledWith(
+        `[Sentry] Sentry not initialized. Could not find ${SCRIPT_TAG} in ${filePath}`,
+      );
+    });
+  });
+});

From de07108d8eab2977130dbaf4c91de1ffa7bba6fd Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 1 Jul 2024 13:27:11 +0200
Subject: [PATCH 11/30] test: Fix tsconfig for browser-integration-tests
 (#12708)

Not sure how this worked before, but there was a bunch of stuff that
conflicted with `noUncheckedIndexedAccess` :thinking:

Noticed this locally when running browser integration tests now.
---
 .../browser-integration-tests/tsconfig.json   |  3 +-
 .../utils/generatePlugin.ts                   | 58 ++++++++++---------
 .../utils/helpers.ts                          | 20 +++++--
 3 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/dev-packages/browser-integration-tests/tsconfig.json b/dev-packages/browser-integration-tests/tsconfig.json
index 2587befcce14..ecc3b11d5e32 100644
--- a/dev-packages/browser-integration-tests/tsconfig.json
+++ b/dev-packages/browser-integration-tests/tsconfig.json
@@ -6,7 +6,8 @@
     "moduleResolution": "node",
     "noEmit": true,
     "strict": true,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "noUncheckedIndexedAccess": false
   },
   "include": ["**/*.ts"],
   "exclude": ["node_modules"]
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
index 7b46faa1fd7d..7b4338fa907b 100644
--- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -128,8 +128,9 @@ function generateSentryAlias(): Record<string, string> {
 
       const modulePath = path.resolve(PACKAGES_DIR, packageName);
 
-      if (useCompiledModule && bundleKey && BUNDLE_PATHS[packageName]?.[bundleKey]) {
-        const bundlePath = path.resolve(modulePath, BUNDLE_PATHS[packageName][bundleKey]);
+      const bundleKeyPath = bundleKey && BUNDLE_PATHS[packageName]?.[bundleKey];
+      if (useCompiledModule && bundleKeyPath) {
+        const bundlePath = path.resolve(modulePath, bundleKeyPath);
 
         return [packageJSON['name'], bundlePath];
       }
@@ -175,8 +176,8 @@ class SentryScenarioGenerationPlugin {
           (statement: { specifiers: [{ imported: { name: string } }] }, source: string) => {
             const imported = statement.specifiers?.[0]?.imported?.name;
 
-            if (imported && IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS[imported]) {
-              const bundleName = IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS[imported];
+            const bundleName = imported && IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS[imported];
+            if (bundleName) {
               this.requiredIntegrations.push(bundleName);
             } else if (source === '@sentry/wasm') {
               this.requiresWASMIntegration = true;
@@ -190,7 +191,7 @@ class SentryScenarioGenerationPlugin {
       HtmlWebpackPlugin.getHooks(compilation).alterAssetTags.tapAsync(this._name, (data, cb) => {
         if (useBundleOrLoader) {
           const bundleName = 'browser';
-          const bundlePath = BUNDLE_PATHS[bundleName][bundleKey];
+          const bundlePath = BUNDLE_PATHS[bundleName]?.[bundleKey];
 
           if (!bundlePath) {
             throw new Error(`Could not find bundle or loader for key ${bundleKey}`);
@@ -215,10 +216,10 @@ class SentryScenarioGenerationPlugin {
                   '__LOADER_OPTIONS__',
                   JSON.stringify({
                     dsn: 'https://public@dsn.ingest.sentry.io/1337',
-                    ...loaderConfig.options,
+                    ...loaderConfig?.options,
                   }),
                 )
-                .replace('__LOADER_LAZY__', loaderConfig.lazy ? 'true' : 'false');
+                .replace('__LOADER_LAZY__', loaderConfig?.lazy ? 'true' : 'false');
             });
           }
 
@@ -240,36 +241,41 @@ class SentryScenarioGenerationPlugin {
                 path.resolve(
                   PACKAGES_DIR,
                   'feedback',
-                  BUNDLE_PATHS['feedback'][integrationBundleKey].replace('[INTEGRATION_NAME]', integration),
+                  BUNDLE_PATHS['feedback']?.[integrationBundleKey]?.replace('[INTEGRATION_NAME]', integration) || '',
                 ),
                 fileName,
               );
             });
           }
 
-          this.requiredIntegrations.forEach(integration => {
-            const fileName = `${integration}.bundle.js`;
-            addStaticAssetSymlink(
-              this.localOutPath,
-              path.resolve(
-                PACKAGES_DIR,
-                'browser',
-                BUNDLE_PATHS['integrations'][integrationBundleKey].replace('[INTEGRATION_NAME]', integration),
-              ),
-              fileName,
-            );
+          const baseIntegrationFileName = BUNDLE_PATHS['integrations']?.[integrationBundleKey];
 
-            const integrationObject = createHtmlTagObject('script', {
-              src: fileName,
-            });
+          if (baseIntegrationFileName) {
+            this.requiredIntegrations.forEach(integration => {
+              const fileName = `${integration}.bundle.js`;
+              addStaticAssetSymlink(
+                this.localOutPath,
+                path.resolve(
+                  PACKAGES_DIR,
+                  'browser',
+                  baseIntegrationFileName.replace('[INTEGRATION_NAME]', integration),
+                ),
+                fileName,
+              );
 
-            data.assetTags.scripts.unshift(integrationObject);
-          });
+              const integrationObject = createHtmlTagObject('script', {
+                src: fileName,
+              });
+
+              data.assetTags.scripts.unshift(integrationObject);
+            });
+          }
 
-          if (this.requiresWASMIntegration && BUNDLE_PATHS['wasm'][integrationBundleKey]) {
+          const baseWasmFileName = BUNDLE_PATHS['wasm']?.[integrationBundleKey];
+          if (this.requiresWASMIntegration && baseWasmFileName) {
             addStaticAssetSymlink(
               this.localOutPath,
-              path.resolve(PACKAGES_DIR, 'wasm', BUNDLE_PATHS['wasm'][integrationBundleKey]),
+              path.resolve(PACKAGES_DIR, 'wasm', baseWasmFileName),
               'wasm.bundle.js',
             );
 
diff --git a/dev-packages/browser-integration-tests/utils/helpers.ts b/dev-packages/browser-integration-tests/utils/helpers.ts
index ab55da449ad2..e0f72bdfacbc 100644
--- a/dev-packages/browser-integration-tests/utils/helpers.ts
+++ b/dev-packages/browser-integration-tests/utils/helpers.ts
@@ -65,13 +65,18 @@ const properFullEnvelopeParser = <T extends Envelope>(request: Request | null):
 };
 
 function getEventAndTraceHeader(envelope: EventEnvelope): EventAndTraceHeader {
-  const event = envelope[1][0][1] as Event;
-  const trace = envelope[0].trace;
+  const event = envelope[1][0]?.[1] as Event | undefined;
+  const trace = envelope[0]?.trace;
+
+  if (!event || !trace) {
+    throw new Error('Could not get event or trace from envelope');
+  }
+
   return [event, trace];
 }
 
 export const properEnvelopeRequestParser = <T = Event>(request: Request | null, envelopeIndex = 1): T => {
-  return properEnvelopeParser(request)[0][envelopeIndex] as T;
+  return properEnvelopeParser(request)[0]?.[envelopeIndex] as T;
 };
 
 export const properFullEnvelopeRequestParser = <T extends Envelope>(request: Request | null): T => {
@@ -361,7 +366,14 @@ async function getFirstSentryEnvelopeRequest<T>(
   url?: string,
   requestParser: (req: Request) => T = envelopeRequestParser as (req: Request) => T,
 ): Promise<T> {
-  return (await getMultipleSentryEnvelopeRequests<T>(page, 1, { url }, requestParser))[0];
+  const reqs = await getMultipleSentryEnvelopeRequests<T>(page, 1, { url }, requestParser);
+
+  const req = reqs[0];
+  if (!req) {
+    throw new Error('No request found');
+  }
+
+  return req;
 }
 
 export { runScriptInSandbox, getMultipleSentryEnvelopeRequests, getFirstSentryEnvelopeRequest, getSentryEvents };

From 3d4a3e0d5fe2aef8ab822a532d0884158ea30159 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 1 Jul 2024 14:28:24 +0200
Subject: [PATCH 12/30] fix(hapi): Widen type definitions (#12710)

fixes https://github.com/getsentry/sentry-javascript/issues/12703
---
 .../src/integrations/tracing/hapi/index.ts    |  4 +-
 .../src/integrations/tracing/hapi/types.ts    | 61 ++-----------------
 2 files changed, 6 insertions(+), 59 deletions(-)

diff --git a/packages/node/src/integrations/tracing/hapi/index.ts b/packages/node/src/integrations/tracing/hapi/index.ts
index 2d951142275e..1303464c5374 100644
--- a/packages/node/src/integrations/tracing/hapi/index.ts
+++ b/packages/node/src/integrations/tracing/hapi/index.ts
@@ -15,7 +15,7 @@ import { logger } from '@sentry/utils';
 import { DEBUG_BUILD } from '../../../debug-build';
 import { generateInstrumentOnce } from '../../../otel/instrument';
 import { ensureIsWrapped } from '../../../utils/ensureIsWrapped';
-import type { RequestEvent, Server } from './types';
+import type { Request, RequestEvent, Server } from './types';
 
 const INTEGRATION_NAME = 'Hapi';
 
@@ -61,7 +61,7 @@ export const hapiErrorPlugin = {
   register: async function (serverArg: Record<any, any>) {
     const server = serverArg as unknown as Server;
 
-    server.events.on('request', (request, event) => {
+    server.events.on('request', (request: Request, event: RequestEvent) => {
       if (getIsolationScope() !== getDefaultIsolationScope()) {
         const route = request.route;
         if (route && route.path) {
diff --git a/packages/node/src/integrations/tracing/hapi/types.ts b/packages/node/src/integrations/tracing/hapi/types.ts
index 4da83f672076..db3404499148 100644
--- a/packages/node/src/integrations/tracing/hapi/types.ts
+++ b/packages/node/src/integrations/tracing/hapi/types.ts
@@ -103,38 +103,6 @@ export interface Listener {
 
 export type Tags = { [tag: string]: boolean };
 
-type Dependencies =
-  | string
-  | string[]
-  | {
-      [key: string]: string;
-    };
-
-interface PluginNameVersion {
-  name: string;
-  version?: string | undefined;
-}
-
-interface PluginPackage {
-  pkg: any;
-}
-
-interface PluginBase<T> {
-  register: (server: Server, options: T) => void | Promise<void>;
-  multiple?: boolean | undefined;
-  dependencies?: Dependencies | undefined;
-  requirements?:
-    | {
-        node?: string | undefined;
-        hapi?: string | undefined;
-      }
-    | undefined;
-
-  once?: boolean | undefined;
-}
-
-type Plugin<T> = PluginBase<T> & (PluginNameVersion | PluginPackage);
-
 interface UserCredentials {}
 
 interface AppCredentials {}
@@ -205,7 +173,7 @@ interface RequestRoute {
   };
 }
 
-interface Request extends Podium {
+export interface Request extends Podium {
   app: ApplicationState;
   readonly auth: RequestAuth;
   events: RequestEvents;
@@ -232,16 +200,6 @@ interface ResponseToolkit {
   readonly continue: symbol;
 }
 
-interface ServerEventCriteria<T> {
-  name: T;
-  channels?: string | string[] | undefined;
-  clone?: boolean | undefined;
-  count?: number | undefined;
-  filter?: string | string[] | { tags: string | string[]; all?: boolean | undefined } | undefined;
-  spread?: boolean | undefined;
-  tags?: boolean | undefined;
-}
-
 export interface RequestEvent {
   timestamp: string;
   tags: string[];
@@ -250,26 +208,15 @@ export interface RequestEvent {
   error: object;
 }
 
-type RequestEventHandler = (request: Request, event: RequestEvent, tags: { [key: string]: true }) => void;
 interface ServerEvents {
-  on(criteria: 'request' | ServerEventCriteria<'request'>, listener: RequestEventHandler): void;
+  on(criteria: any, listener: any): void;
 }
 
-type RouteRequestExtType =
-  | 'onPreAuth'
-  | 'onCredentials'
-  | 'onPostAuth'
-  | 'onPreHandler'
-  | 'onPostHandler'
-  | 'onPreResponse';
-
-type ServerRequestExtType = RouteRequestExtType | 'onRequest';
-
 export type Server = Record<string, any> & {
   events: ServerEvents;
-  ext(event: ServerRequestExtType, method: Lifecycle.Method, options?: Record<string, any>): void;
+  register: any;
+  ext(event: any, method: Lifecycle.Method, options?: Record<string, any>): void;
   initialize(): Promise<void>;
-  register(plugins: Plugin<any> | Array<Plugin<any>>, options?: Record<string, any>): Promise<void>;
   start(): Promise<void>;
 };
 

From 0d558dea4a580dce7717f5093ad3b62a3c4733bd Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Mon, 1 Jul 2024 17:58:21 +0200
Subject: [PATCH 13/30] feat(nestjs): Filter 4xx errors (#12695)

Small change filtering expected errors from being reported to sentry in
the nestjs sdk.

Tested manually on my sample app.

Fixes https://github.com/getsentry/sentry-javascript/issues/12523
---
 .../nestjs/src/app.controller.ts              |  5 ++++
 .../nestjs/src/app.service.ts                 |  6 ++++-
 .../nestjs/tests/errors.test.ts               | 27 ++++++++++++++++++-
 .../node/src/integrations/tracing/nest.ts     |  7 +++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/nestjs/src/app.controller.ts b/dev-packages/e2e-tests/test-applications/nestjs/src/app.controller.ts
index 6350cb49f1c5..154f62ada912 100644
--- a/dev-packages/e2e-tests/test-applications/nestjs/src/app.controller.ts
+++ b/dev-packages/e2e-tests/test-applications/nestjs/src/app.controller.ts
@@ -45,6 +45,11 @@ export class AppController1 {
     return this.appService.testException(id);
   }
 
+  @Get('test-expected-exception/:id')
+  async testExpectedException(@Param('id') id: string) {
+    return this.appService.testExpectedException(id);
+  }
+
   @Get('test-outgoing-fetch-external-allowed')
   async testOutgoingFetchExternalAllowed() {
     return this.appService.testOutgoingFetchExternalAllowed();
diff --git a/dev-packages/e2e-tests/test-applications/nestjs/src/app.service.ts b/dev-packages/e2e-tests/test-applications/nestjs/src/app.service.ts
index 01a96549546b..1103c65941a1 100644
--- a/dev-packages/e2e-tests/test-applications/nestjs/src/app.service.ts
+++ b/dev-packages/e2e-tests/test-applications/nestjs/src/app.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import * as Sentry from '@sentry/nestjs';
 import { makeHttpRequest } from './utils';
 
@@ -52,6 +52,10 @@ export class AppService1 {
     throw new Error(`This is an exception with id ${id}`);
   }
 
+  testExpectedException(id: string) {
+    throw new HttpException(`This is an expected exception with id ${id}`, HttpStatus.FORBIDDEN);
+  }
+
   async testOutgoingFetchExternalAllowed() {
     const fetchResponse = await fetch('http://localhost:3040/external-allowed');
 
diff --git a/dev-packages/e2e-tests/test-applications/nestjs/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/nestjs/tests/errors.test.ts
index aa46f77815d4..349b25b0eee9 100644
--- a/dev-packages/e2e-tests/test-applications/nestjs/tests/errors.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nestjs/tests/errors.test.ts
@@ -1,5 +1,5 @@
 import { expect, test } from '@playwright/test';
-import { waitForError } from '@sentry-internal/test-utils';
+import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Sends exception to Sentry', async ({ baseURL }) => {
   const errorEventPromise = waitForError('nestjs', event => {
@@ -28,3 +28,28 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
     span_id: expect.any(String),
   });
 });
+
+test('Does not send expected exception to Sentry', async ({ baseURL }) => {
+  let errorEventOccurred = false;
+
+  waitForError('nestjs', event => {
+    if (!event.type && event.exception?.values?.[0]?.value === 'This is an expected exception with id 123') {
+      errorEventOccurred = true;
+    }
+
+    return event?.transaction === 'GET /test-expected-exception/:id';
+  });
+
+  const transactionEventPromise = waitForTransaction('nestjs', transactionEvent => {
+    return transactionEvent?.transaction === 'GET /test-expected-exception/:id';
+  });
+
+  const response = await fetch(`${baseURL}/test-expected-exception/123`);
+  expect(response.status).toBe(403);
+
+  await transactionEventPromise;
+
+  await new Promise(resolve => setTimeout(resolve, 10000));
+
+  expect(errorEventOccurred).toBe(false);
+});
diff --git a/packages/node/src/integrations/tracing/nest.ts b/packages/node/src/integrations/tracing/nest.ts
index bbb658318946..ab6a66fdb895 100644
--- a/packages/node/src/integrations/tracing/nest.ts
+++ b/packages/node/src/integrations/tracing/nest.ts
@@ -100,6 +100,13 @@ export function setupNestErrorHandler(app: MinimalNestJsApp, baseFilter: NestJsE
         const originalCatch = Reflect.get(target, prop, receiver);
 
         return (exception: unknown, host: unknown) => {
+          const status_code = (exception as { status?: number }).status;
+
+          // don't report expected errors
+          if (status_code !== undefined && status_code >= 400 && status_code < 500) {
+            return originalCatch.apply(target, [exception, host]);
+          }
+
           captureException(exception);
           return originalCatch.apply(target, [exception, host]);
         };

From 968301afd598fc51746dc45a69a3eae1d3146bfe Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 2 Jul 2024 11:34:28 +0200
Subject: [PATCH 14/30] fix(replay): Start replay in `afterAllSetup` instead of
 next tick (#12709)

This should hopefully fix some race conditions.

Instead of initializing replay in the next tick, do it in the current
tick but in `afterAllSetup`, to ensure this runs e.g. after the
replay-canvas integration.

Fixes https://github.com/getsentry/sentry-javascript/issues/12707
---
 .github/workflows/build.yml                   |  1 +
 .../loader/noOnLoad/replay/test.ts            |  5 +-
 .../loader/noOnLoad/replayError/subject.js    |  1 +
 .../loader/noOnLoad/replayError/test.ts       | 35 +++++++++++++
 .../loader/onLoad/customReplay/init.js        |  2 +
 .../loader/onLoad/replay/init.js              |  4 +-
 .../browser-integration-tests/package.json    |  1 +
 .../{bufferMode => bufferModeManual}/init.js  |  0
 .../subject.js                                |  0
 .../template.html                             |  0
 .../{bufferMode => bufferModeManual}/test.ts  |  0
 .../replay/errors/immediateError/subject.js   |  1 +
 .../replay/errors/immediateError/test.ts      | 38 ++++++++++++++
 .../utils/generatePlugin.ts                   |  5 ++
 packages/replay-internal/src/integration.ts   | 50 +++++--------------
 .../coreHandlers/handleGlobalEvent.test.ts    |  5 +-
 .../test/integration/errorSampleRate.test.ts  |  6 +--
 .../test/integration/sampling.test.ts         |  4 +-
 .../replay-internal/test/mocks/mockSdk.ts     | 18 +++----
 .../replay-internal/test/utils/TestClient.ts  |  5 +-
 20 files changed, 122 insertions(+), 59 deletions(-)
 create mode 100644 dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/subject.js
 create mode 100644 dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts
 rename dev-packages/browser-integration-tests/suites/replay/{bufferMode => bufferModeManual}/init.js (100%)
 rename dev-packages/browser-integration-tests/suites/replay/{bufferMode => bufferModeManual}/subject.js (100%)
 rename dev-packages/browser-integration-tests/suites/replay/{bufferMode => bufferModeManual}/template.html (100%)
 rename dev-packages/browser-integration-tests/suites/replay/{bufferMode => bufferModeManual}/test.ts (100%)
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/errors/immediateError/subject.js
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 85fc105d0e42..9edd073a637c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -761,6 +761,7 @@ jobs:
           - loader_debug
           - loader_tracing
           - loader_replay
+          - loader_replay_buffer
           - loader_tracing_replay
 
     steps:
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts
index c162db40a9e5..25bcebcd074c 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts
@@ -3,8 +3,11 @@ import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../utils/fixtures';
 import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
 
+const bundle = process.env.PW_BUNDLE || '';
+
 sentryTest('should capture a replay', async ({ getLocalTestUrl, page }) => {
-  if (shouldSkipReplayTest()) {
+  // When in buffer mode, there will not be a replay by default
+  if (shouldSkipReplayTest() || bundle === 'loader_replay_buffer') {
     sentryTest.skip();
   }
 
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/subject.js b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/subject.js
new file mode 100644
index 000000000000..544cbfad3179
--- /dev/null
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/subject.js
@@ -0,0 +1 @@
+window.doSomethingWrong();
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts
new file mode 100644
index 000000000000..379697881165
--- /dev/null
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts
@@ -0,0 +1,35 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
+import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
+
+sentryTest('should capture a replay & attach an error', async ({ getLocalTestUrl, page }) => {
+  if (shouldSkipReplayTest()) {
+    sentryTest.skip();
+  }
+
+  await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({ id: 'test-id' }),
+    });
+  });
+
+  const req = waitForReplayRequest(page);
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  const reqError = await waitForErrorRequestOnUrl(page, url);
+
+  const errorEventData = envelopeRequestParser(reqError);
+  expect(errorEventData.exception?.values?.length).toBe(1);
+  expect(errorEventData.exception?.values?.[0]?.value).toContain('window.doSomethingWrong is not a function');
+
+  const eventData = getReplayEvent(await req);
+
+  expect(eventData).toBeDefined();
+  expect(eventData.segment_id).toBe(0);
+
+  expect(errorEventData.tags?.replayId).toEqual(eventData.replay_id);
+});
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js
index 150a9f6a20ae..f37879cc19db 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js
@@ -6,5 +6,7 @@ Sentry.onLoad(function () {
         useCompression: false,
       }),
     ],
+
+    replaysSessionSampleRate: 1,
   });
 });
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/init.js b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/init.js
index e63705186b2f..e55a8aefdc0b 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/init.js
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/init.js
@@ -1,3 +1,5 @@
 Sentry.onLoad(function () {
-  Sentry.init({});
+  Sentry.init({
+    replaysSessionSampleRate: 1,
+  });
 });
diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 5000f5be97f7..9be2adc9b744 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -32,6 +32,7 @@
     "test:loader:eager": "PW_BUNDLE=loader_eager yarn test:loader",
     "test:loader:tracing": "PW_BUNDLE=loader_tracing yarn test:loader",
     "test:loader:replay": "PW_BUNDLE=loader_replay yarn test:loader",
+    "test:loader:replay_buffer": "PW_BUNDLE=loader_replay_buffer yarn test:loader",
     "test:loader:full": "PW_BUNDLE=loader_tracing_replay yarn test:loader",
     "test:loader:debug": "PW_BUNDLE=loader_debug yarn test:loader",
     "test:ci": "yarn test:all --reporter='line'",
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferMode/init.js b/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/init.js
similarity index 100%
rename from dev-packages/browser-integration-tests/suites/replay/bufferMode/init.js
rename to dev-packages/browser-integration-tests/suites/replay/bufferModeManual/init.js
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferMode/subject.js b/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/subject.js
similarity index 100%
rename from dev-packages/browser-integration-tests/suites/replay/bufferMode/subject.js
rename to dev-packages/browser-integration-tests/suites/replay/bufferModeManual/subject.js
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferMode/template.html b/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/template.html
similarity index 100%
rename from dev-packages/browser-integration-tests/suites/replay/bufferMode/template.html
rename to dev-packages/browser-integration-tests/suites/replay/bufferModeManual/template.html
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferMode/test.ts b/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/test.ts
similarity index 100%
rename from dev-packages/browser-integration-tests/suites/replay/bufferMode/test.ts
rename to dev-packages/browser-integration-tests/suites/replay/bufferModeManual/test.ts
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/subject.js b/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/subject.js
new file mode 100644
index 000000000000..544cbfad3179
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/subject.js
@@ -0,0 +1 @@
+window.doSomethingWrong();
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts b/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts
new file mode 100644
index 000000000000..7c82f29256d9
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts
@@ -0,0 +1,38 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
+import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
+
+sentryTest(
+  '[error-mode] should capture error that happens immediately after init',
+  async ({ getLocalTestUrl, page }) => {
+    if (shouldSkipReplayTest()) {
+      sentryTest.skip();
+    }
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const req = waitForReplayRequest(page);
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+    const reqError = await waitForErrorRequestOnUrl(page, url);
+
+    const errorEventData = envelopeRequestParser(reqError);
+    expect(errorEventData.exception?.values?.length).toBe(1);
+    expect(errorEventData.exception?.values?.[0]?.value).toContain('window.doSomethingWrong is not a function');
+
+    const eventData = getReplayEvent(await req);
+
+    expect(eventData).toBeDefined();
+    expect(eventData.segment_id).toBe(0);
+
+    expect(errorEventData.tags?.replayId).toEqual(eventData.replay_id);
+  },
+);
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
index 7b4338fa907b..94f3dd20ae81 100644
--- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -55,6 +55,7 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     loader_debug: 'build/bundles/bundle.debug.min.js',
     loader_tracing: 'build/bundles/bundle.tracing.min.js',
     loader_replay: 'build/bundles/bundle.replay.min.js',
+    loader_replay_buffer: 'build/bundles/bundle.replay.min.js',
     loader_tracing_replay: 'build/bundles/bundle.tracing.replay.debug.min.js',
   },
   integrations: {
@@ -96,6 +97,10 @@ export const LOADER_CONFIGS: Record<string, { options: Record<string, unknown>;
     options: { replaysSessionSampleRate: 1, replaysOnErrorSampleRate: 1 },
     lazy: false,
   },
+  loader_replay_buffer: {
+    options: { replaysSessionSampleRate: 0, replaysOnErrorSampleRate: 1 },
+    lazy: false,
+  },
   loader_tracing_replay: {
     options: { tracesSampleRate: 1, replaysSessionSampleRate: 1, replaysOnErrorSampleRate: 1, debug: true },
     lazy: false,
diff --git a/packages/replay-internal/src/integration.ts b/packages/replay-internal/src/integration.ts
index f4759ebff26c..2b1ef71287ae 100644
--- a/packages/replay-internal/src/integration.ts
+++ b/packages/replay-internal/src/integration.ts
@@ -1,5 +1,5 @@
-import { getClient, parseSampleRate } from '@sentry/core';
-import type { BrowserClientReplayOptions, Integration, IntegrationFn } from '@sentry/types';
+import { parseSampleRate } from '@sentry/core';
+import type { BrowserClientReplayOptions, Client, Integration, IntegrationFn } from '@sentry/types';
 import { consoleSandbox, dropUndefinedKeys, isBrowser } from '@sentry/utils';
 
 import {
@@ -215,22 +215,13 @@ export class Replay implements Integration {
   /**
    * Setup and initialize replay container
    */
-  public setupOnce(): void {
-    if (!isBrowser()) {
+  public afterAllSetup(client: Client): void {
+    if (!isBrowser() || this._replay) {
       return;
     }
 
-    this._setup();
-
-    // Once upon a time, we tried to create a transaction in `setupOnce` and it would
-    // potentially create a transaction before some native SDK integrations have run
-    // and applied their own global event processor. An example is:
-    // https://github.com/getsentry/sentry-javascript/blob/b47ceafbdac7f8b99093ce6023726ad4687edc48/packages/browser/src/integrations/useragent.ts
-    //
-    // So we call `this._initialize()` in next event loop as a workaround to wait for other
-    // global event processors to finish. This is no longer needed, but keeping it
-    // here to avoid any future issues.
-    setTimeout(() => this._initialize());
+    this._setup(client);
+    this._initialize(client);
   }
 
   /**
@@ -301,24 +292,19 @@ export class Replay implements Integration {
   /**
    * Initializes replay.
    */
-  protected _initialize(): void {
+  protected _initialize(client: Client): void {
     if (!this._replay) {
       return;
     }
 
-    // We have to run this in _initialize, because this runs in setTimeout
-    // So when this runs all integrations have been added
-    // Before this, we cannot access integrations on the client,
-    // so we need to mutate the options here
-    this._maybeLoadFromReplayCanvasIntegration();
-
+    this._maybeLoadFromReplayCanvasIntegration(client);
     this._replay.initializeSampling();
   }
 
   /** Setup the integration. */
-  private _setup(): void {
+  private _setup(client: Client): void {
     // Client is not available in constructor, so we need to wait until setupOnce
-    const finalOptions = loadReplayOptionsFromClient(this._initialOptions);
+    const finalOptions = loadReplayOptionsFromClient(this._initialOptions, client);
 
     this._replay = new ReplayContainer({
       options: finalOptions,
@@ -327,12 +313,11 @@ export class Replay implements Integration {
   }
 
   /** Get canvas options from ReplayCanvas integration, if it is also added. */
-  private _maybeLoadFromReplayCanvasIntegration(): void {
+  private _maybeLoadFromReplayCanvasIntegration(client: Client): void {
     // To save bundle size, we skip checking for stuff here
     // and instead just try-catch everything - as generally this should all be defined
     /* eslint-disable @typescript-eslint/no-non-null-assertion */
     try {
-      const client = getClient()!;
       const canvasIntegration = client.getIntegrationByName('ReplayCanvas') as Integration & {
         getOptions(): ReplayCanvasIntegrationOptions;
       };
@@ -349,9 +334,8 @@ export class Replay implements Integration {
 }
 
 /** Parse Replay-related options from SDK options */
-function loadReplayOptionsFromClient(initialOptions: InitialReplayPluginOptions): ReplayPluginOptions {
-  const client = getClient();
-  const opt = client && (client.getOptions() as BrowserClientReplayOptions);
+function loadReplayOptionsFromClient(initialOptions: InitialReplayPluginOptions, client: Client): ReplayPluginOptions {
+  const opt = client.getOptions() as BrowserClientReplayOptions;
 
   const finalOptions: ReplayPluginOptions = {
     sessionSampleRate: 0,
@@ -359,14 +343,6 @@ function loadReplayOptionsFromClient(initialOptions: InitialReplayPluginOptions)
     ...dropUndefinedKeys(initialOptions),
   };
 
-  if (!opt) {
-    consoleSandbox(() => {
-      // eslint-disable-next-line no-console
-      console.warn('SDK client is not available.');
-    });
-    return finalOptions;
-  }
-
   const replaysSessionSampleRate = parseSampleRate(opt.replaysSessionSampleRate);
   const replaysOnErrorSampleRate = parseSampleRate(opt.replaysOnErrorSampleRate);
 
diff --git a/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts b/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts
index ebe43c25eb98..1526e7175f4f 100644
--- a/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts
+++ b/packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts
@@ -1,3 +1,4 @@
+import { getClient } from '@sentry/core';
 import type { Event } from '@sentry/types';
 
 import { REPLAY_EVENT_NAME, SESSION_IDLE_EXPIRE_DURATION } from '../../../src/constants';
@@ -133,8 +134,8 @@ describe('Integration | coreHandlers | handleGlobalEvent', () => {
 
   it('tags errors and transactions with replay id for session samples', async () => {
     const { replay, integration } = await resetSdkMock({});
-    // @ts-expect-error protected but ok to use for testing
-    integration._initialize();
+    integration['_initialize'](getClient()!);
+
     const transaction = Transaction();
     const error = Error();
     expect(handleGlobalEventListener(replay)(transaction, {})).toEqual(
diff --git a/packages/replay-internal/test/integration/errorSampleRate.test.ts b/packages/replay-internal/test/integration/errorSampleRate.test.ts
index b3b605f28c12..ef6d80dfeac6 100644
--- a/packages/replay-internal/test/integration/errorSampleRate.test.ts
+++ b/packages/replay-internal/test/integration/errorSampleRate.test.ts
@@ -866,7 +866,7 @@ describe('Integration | errorSampleRate', () => {
       },
       autoStart: false,
     });
-    integration['_initialize']();
+    integration['_initialize'](getClient()!);
 
     expect(replay.recordingMode).toBe('session');
     const sessionId = replay.getSessionId();
@@ -899,7 +899,7 @@ describe('Integration | errorSampleRate', () => {
       },
       autoStart: false,
     });
-    integration['_initialize']();
+    integration['_initialize'](getClient()!);
 
     vi.runAllTimers();
 
@@ -943,7 +943,7 @@ describe('Integration | errorSampleRate', () => {
       },
       autoStart: false,
     });
-    integration['_initialize']();
+    integration['_initialize'](getClient()!);
     const optionsEvent = createOptionsEvent(replay);
 
     const TEST_EVENT = getTestEventIncremental({ timestamp: BASE_TIMESTAMP });
diff --git a/packages/replay-internal/test/integration/sampling.test.ts b/packages/replay-internal/test/integration/sampling.test.ts
index 433a010b76aa..c0e5404056a1 100644
--- a/packages/replay-internal/test/integration/sampling.test.ts
+++ b/packages/replay-internal/test/integration/sampling.test.ts
@@ -1,3 +1,4 @@
+import { getClient } from '@sentry/core';
 import { resetSdkMock } from '../mocks/resetSdkMock';
 import { useFakeTimers } from '../utils/use-fake-timers';
 
@@ -57,8 +58,7 @@ describe('Integration | sampling', () => {
     // @ts-expect-error private API
     const spyAddListeners = vi.spyOn(replay, '_addListeners');
 
-    // @ts-expect-error protected
-    integration._initialize();
+    integration['_initialize'](getClient()!);
 
     vi.runAllTimers();
 
diff --git a/packages/replay-internal/test/mocks/mockSdk.ts b/packages/replay-internal/test/mocks/mockSdk.ts
index d5c9a088b779..38adc7f9c476 100644
--- a/packages/replay-internal/test/mocks/mockSdk.ts
+++ b/packages/replay-internal/test/mocks/mockSdk.ts
@@ -61,12 +61,8 @@ export async function mockSdk({ replayOptions, sentryOptions, autoStart = true }
       _initialized = value;
     }
 
-    public setupOnce(): void {
-      // do nothing
-    }
-
-    public initialize(): void {
-      return super._initialize();
+    public afterAllSetup(): void {
+      // do nothing, we need to manually initialize this
     }
   }
 
@@ -76,7 +72,7 @@ export async function mockSdk({ replayOptions, sentryOptions, autoStart = true }
     ...replayOptions,
   });
 
-  init({
+  const client = init({
     ...getDefaultClientOptions(),
     dsn: 'https://dsn@ingest.f00.f00/1',
     autoSessionTracking: false,
@@ -86,14 +82,14 @@ export async function mockSdk({ replayOptions, sentryOptions, autoStart = true }
     replaysOnErrorSampleRate: 0.0,
     ...sentryOptions,
     integrations: [replayIntegration],
-  });
+  })!;
 
-  // Instead of `setupOnce`, which is tricky to test, we call this manually here
-  replayIntegration['_setup']();
+  // Instead of `afterAllSetup`, which is tricky to test, we call this manually here
+  replayIntegration['_setup'](client);
 
   if (autoStart) {
     // Only exists in our mock
-    replayIntegration.initialize();
+    replayIntegration['_initialize'](client);
   }
 
   const replay = replayIntegration['_replay']!;
diff --git a/packages/replay-internal/test/utils/TestClient.ts b/packages/replay-internal/test/utils/TestClient.ts
index f95eb5309bcb..2651dfe1c91a 100644
--- a/packages/replay-internal/test/utils/TestClient.ts
+++ b/packages/replay-internal/test/utils/TestClient.ts
@@ -1,6 +1,7 @@
 import { BaseClient, createTransport, initAndBind } from '@sentry/core';
 import type {
   BrowserClientReplayOptions,
+  Client,
   ClientOptions,
   Event,
   ParameterizedString,
@@ -33,8 +34,8 @@ export class TestClient extends BaseClient<TestClientOptions> {
   }
 }
 
-export function init(options: TestClientOptions): void {
-  initAndBind(TestClient, options);
+export function init(options: TestClientOptions): Client {
+  return initAndBind(TestClient, options);
 }
 
 export function getDefaultClientOptions(options: Partial<TestClientOptions> = {}): ClientOptions {

From a6e2f777d305212b19d8e8698a96b89590c582cd Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 2 Jul 2024 16:05:53 +0200
Subject: [PATCH 15/30] ci: Refactor/fix external contribution handling
 (#12724)

This should fix the old behavior...

previously, we made a PR against a PR branch when we detected that it
was opened by an external contributor. This is problematic, turns out,
because external contributors will usually have a fork of the repo and
thus the action will fail.

Now, instead, we will make a PR against develop when a contributor PR is
_merged_.

See example PR:
https://github.com/getsentry/sentry-javascript/pull/12728
---
 .github/workflows/build.yml                 | 38 ------------------
 .github/workflows/external-contributors.yml | 44 +++++++++++++++++++++
 2 files changed, 44 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/external-contributors.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9edd073a637c..8930bcaf3c64 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -229,44 +229,6 @@ jobs:
           message: |
             ⚠️ This PR is opened against **master**. You probably want to open it against **develop**.
 
-  job_external_contributor:
-    name: External Contributors
-    needs: job_install_deps
-    runs-on: ubuntu-20.04
-    if: |
-      github.event_name == 'pull_request'
-      && (github.event.action == 'opened' || github.event.action == 'reopened')
-      && github.event.pull_request.author_association != 'COLLABORATOR'
-      && github.event.pull_request.author_association != 'MEMBER'
-      && github.event.pull_request.author_association != 'OWNER'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: 'package.json'
-      - name: Check dependency cache
-        uses: actions/cache/restore@v4
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_install_deps.outputs.dependency_cache_key }}
-          fail-on-cache-miss: true
-
-      - name: Add external contributor to CHANGELOG.md
-        uses: ./dev-packages/external-contributor-gh-action
-        with:
-          name: ${{ github.event.pull_request.user.login }}
-      - name: Create PR with changes
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: "ref: Add external contributor to CHANGELOG.md"
-          title: "ref: Add external contributor to CHANGELOG.md"
-          branch: 'external-contributor/patch-${{ github.event.pull_request.user.login }}'
-          delete-branch: true
-          body: This PR adds the external contributor to the CHANGELOG.md file, so that they are credited for their contribution.
-
   job_build:
     name: Build
     needs: [job_get_metadata, job_install_deps]
diff --git a/.github/workflows/external-contributors.yml b/.github/workflows/external-contributors.yml
new file mode 100644
index 000000000000..a797d93732eb
--- /dev/null
+++ b/.github/workflows/external-contributors.yml
@@ -0,0 +1,44 @@
+name: "CI: Mention external contributors"
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - develop
+
+jobs:
+  external_contributor:
+    name: External Contributors
+    runs-on: ubuntu-20.04
+    if: |
+      github.event.pull_request.author_association != 'COLLABORATOR'
+      && github.event.pull_request.author_association != 'MEMBER'
+      && github.event.pull_request.author_association != 'OWNER'
+      && github.actor != 'dependabot[bot]'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: 'package.json'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Add external contributor to CHANGELOG.md
+        uses: ./dev-packages/external-contributor-gh-action
+        with:
+          name: ${{ github.event.pull_request.user.login }}
+      - name: Create PR with changes
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
+        with:
+          commit-message: "ref: Add external contributor to CHANGELOG.md"
+          title: "ref: Add external contributor to CHANGELOG.md"
+          branch: 'external-contributor/patch-${{ github.event.pull_request.user.login }}'
+          base: 'develop'
+          delete-branch: true
+          body: This PR adds the external contributor to the CHANGELOG.md file, so that they are credited for their contribution.
+

From 58af1d725dfffb8f0daa80b617a5c0f638ca1a37 Mon Sep 17 00:00:00 2001
From: "quisi.do" <github@quisi.do>
Date: Tue, 2 Jul 2024 07:12:47 -0700
Subject: [PATCH 16/30] chore(react): Remove private namespace `JSX` (#12691)

---
 packages/react/src/reactrouter.tsx | 3 ++-
 packages/react/src/types.ts        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/reactrouter.tsx b/packages/react/src/reactrouter.tsx
index c15fb9d0b191..d52885dffa8d 100644
--- a/packages/react/src/reactrouter.tsx
+++ b/packages/react/src/reactrouter.tsx
@@ -16,6 +16,7 @@ import {
 import type { Client, Integration, Span, TransactionSource } from '@sentry/types';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import * as React from 'react';
+import type { ReactElement } from 'react';
 
 import type { Action, Location } from './types';
 
@@ -32,7 +33,7 @@ export type RouteConfig = {
   [propName: string]: unknown;
   path?: string | string[];
   exact?: boolean;
-  component?: JSX.Element;
+  component?: ReactElement;
   routes?: RouteConfig[];
 };
 
diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
index ffb961bbfe3b..9c81f63cc0d5 100644
--- a/packages/react/src/types.ts
+++ b/packages/react/src/types.ts
@@ -1,5 +1,6 @@
 // Disabling `no-explicit-any` for the whole file as `any` has became common requirement.
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import type { ReactElement } from 'react';
 
 export type Action = 'PUSH' | 'REPLACE' | 'POP';
 
@@ -67,7 +68,7 @@ export type UseNavigationType = () => Action;
 // react-router > 6.0.0 and >= 6.4.2.
 export type RouteObjectArrayAlias = any;
 export type RouteMatchAlias = any;
-export type CreateRoutesFromChildren = (children: JSX.Element[]) => RouteObjectArrayAlias;
+export type CreateRoutesFromChildren = (children: ReactElement[]) => RouteObjectArrayAlias;
 export type MatchRoutes = (
   routes: RouteObjectArrayAlias,
   location: Location,

From f243167038773eeb2f036e2b541e2c9355b804c6 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 2 Jul 2024 10:14:18 -0400
Subject: [PATCH 17/30] chore: Use npm-run-all2 (#12701)

https://github.com/mysticatea/npm-run-all is no longer maintained, so
switching to npm-run-all2.

Eliminates some deps from `yarn.lock` and should be faster!
---
 .../test-applications/vue-3/package.json      |  2 +-
 package.json                                  |  2 +-
 yarn.lock                                     | 52 +++++++------------
 3 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/vue-3/package.json b/dev-packages/e2e-tests/test-applications/vue-3/package.json
index f356285a79d9..6b837910fc02 100644
--- a/dev-packages/e2e-tests/test-applications/vue-3/package.json
+++ b/dev-packages/e2e-tests/test-applications/vue-3/package.json
@@ -30,7 +30,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/tsconfig": "^0.5.1",
     "http-server": "^14.1.1",
-    "npm-run-all2": "^6.1.1",
+    "npm-run-all2": "^6.2.0",
     "typescript": "~5.3.0",
     "vite": "^5.0.11",
     "vue-tsc": "^1.8.27"
diff --git a/package.json b/package.json
index a1ff37a848a6..f22a482e09c1 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "lerna": "7.1.1",
     "madge": "7.0.0",
     "nodemon": "^2.0.16",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all2": "^6.2.0",
     "prettier": "^3.1.1",
     "rimraf": "^3.0.2",
     "rollup": "^4.13.0",
diff --git a/yarn.lock b/yarn.lock
index b8bf4eeeb15c..56ef39daf62b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11517,7 +11517,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.1.0:
+ansi-styles@^6.1.0, ansi-styles@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
@@ -15044,7 +15044,7 @@ cross-env@^7.0.3:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -26037,20 +26037,18 @@ npm-registry-fetch@^17.0.0:
     npm-package-arg "^11.0.0"
     proc-log "^4.0.0"
 
-npm-run-all@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
-  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+npm-run-all2@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/npm-run-all2/-/npm-run-all2-6.2.0.tgz#ac0a893a593e1ab3ef85c5ac3526321d2e3137bd"
+  integrity sha512-wA7yVIkthe6qJBfiJ2g6aweaaRlw72itsFGF6HuwCHKwtwAx/4BY1vVpk6bw6lS8RLMsexoasOkd0aYOmsFG7Q==
   dependencies:
-    ansi-styles "^3.2.1"
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
+    ansi-styles "^6.2.1"
+    cross-spawn "^7.0.3"
     memorystream "^0.3.1"
-    minimatch "^3.0.4"
-    pidtree "^0.3.0"
-    read-pkg "^3.0.0"
-    shell-quote "^1.6.1"
-    string.prototype.padend "^3.0.0"
+    minimatch "^9.0.0"
+    pidtree "^0.6.0"
+    read-package-json-fast "^3.0.2"
+    shell-quote "^1.7.3"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -27350,10 +27348,10 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pidtree@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
-  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+pidtree@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
+  integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
 
 pify@5.0.0:
   version "5.0.0"
@@ -28890,7 +28888,7 @@ read-package-json-fast@^2.0.3:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json-fast@^3.0.0:
+read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
   integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
@@ -30483,12 +30481,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.6.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
-  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
-
-shell-quote@^1.8.1:
+shell-quote@^1.7.3, shell-quote@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
@@ -31411,15 +31404,6 @@ string.prototype.matchall@^4.0.5, string.prototype.matchall@^4.0.6, string.proto
     regexp.prototype.flags "^1.4.3"
     side-channel "^1.0.4"
 
-string.prototype.padend@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz#6858ca4f35c5268ebd5e8615e1327d55f59ee311"
-  integrity sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-
 string.prototype.trimend@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"

From 840dd8faf0ab6cabd25fe993f21c3a77e794af32 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 2 Jul 2024 10:28:53 -0400
Subject: [PATCH 18/30] fix(deno): Add prepack for deno build (#12700)

fixes https://github.com/getsentry/sentry-javascript/issues/12698

Adds back prepack script just for deno which was removed in
https://github.com/getsentry/sentry-javascript/pull/12656 because it's a
breaking change for the deno package which relies on the directory
structure for their import path.
---
 packages/deno/package.json       |   6 +-
 packages/deno/scripts/prepack.js | 111 +++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 packages/deno/scripts/prepack.js

diff --git a/packages/deno/package.json b/packages/deno/package.json
index 7450d7a57e24..eb17293ef66c 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -41,9 +41,9 @@
     "build:types": "run-s deno-types build:types:tsc build:types:bundle",
     "build:types:tsc": "tsc -p tsconfig.types.json",
     "build:types:bundle": "rollup -c rollup.types.config.mjs",
-    "build:tarball": "npm pack",
+    "build:tarball": "node ./scripts/prepack.js && npm pack",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf build build-types build-test coverage",
+    "clean": "rimraf build build-types build-test coverage sentry-deno-*.tgz",
     "prefix": "yarn deno-types",
     "fix": "eslint . --format stylish --fix",
     "prelint": "yarn deno-types",
@@ -55,7 +55,7 @@
     "test:types": "deno check ./build/index.mjs",
     "test:unit": "deno test --allow-read --allow-run",
     "test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update",
-    "yalc:publish": "yalc publish --push --sig"
+    "yalc:publish": "node ./scripts/prepack.js && yalc publish --push --sig"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/deno/scripts/prepack.js b/packages/deno/scripts/prepack.js
new file mode 100644
index 000000000000..19422f912715
--- /dev/null
+++ b/packages/deno/scripts/prepack.js
@@ -0,0 +1,111 @@
+/* eslint-disable no-console */
+
+/**
+ * This script prepares the central `build` directory for NPM package creation.
+ * It first copies all non-code files into the `build` directory, including `package.json`, which
+ * is edited to adjust entry point paths. These corrections are performed so that the paths align with
+ * the directory structure inside `build`.
+ *
+ * TODO(v9): Remove this script and change the Deno SDK to import from build/X.
+ */
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+const BUILD_DIR = 'build';
+
+const ENTRY_POINTS = ['main', 'module', 'types', 'browser'];
+const EXPORT_MAP_ENTRY_POINT = 'exports';
+const TYPES_VERSIONS_ENTRY_POINT = 'typesVersions';
+
+const PACKAGE_JSON = 'package.json';
+
+/**
+ * @typedef {Record<(typeof ENTRY_POINTS)[number], string>} PackageJsonEntryPoints - an object containing module details
+ */
+
+/**
+ * @typedef {Record<string, string>} ConditionalExportEntryPoints - an object containing module details
+ */
+
+/**
+ * @typedef {Record<string, Record<string, string[]>>} TypeVersions - an object containing module details
+ */
+
+/**
+ * @typedef {Partial<ConditionalExportEntryPoints> & Record<string, Partial<ConditionalExportEntryPoints>>} PackageJsonExports - types for `package.json` exports
+ */
+
+/**
+ * @typedef {Record<string, unknown> & PackageJsonEntryPoints & {[EXPORT_MAP_ENTRY_POINT]: PackageJsonExports} & {[TYPES_VERSIONS_ENTRY_POINT]: TypeVersions}} PackageJson - types for `package.json`
+ */
+
+/**
+ * @type {PackageJson}
+ */
+const pkgJson = require(path.resolve(PACKAGE_JSON));
+
+// check if build dir exists
+if (!fs.existsSync(path.resolve(BUILD_DIR))) {
+  console.error(`\nERROR: Directory '${BUILD_DIR}' does not exist in ${pkgJson.name}.`);
+  console.error("This script should only be executed after you've run `yarn build`.");
+  process.exit(1);
+}
+
+// package.json modifications
+/**
+ * @type {PackageJson}
+ */
+const newPkgJson = { ...pkgJson };
+
+// modify entry points to point to correct paths (i.e. strip out the build directory)
+ENTRY_POINTS.filter(entryPoint => newPkgJson[entryPoint]).forEach(entryPoint => {
+  newPkgJson[entryPoint] = newPkgJson[entryPoint].replace(`${BUILD_DIR}/`, '');
+});
+
+/**
+ * Recursively traverses the exports object and rewrites all string values to remove the build directory.
+ *
+ * @param {PackageJsonExports} exportsObject - the exports object to traverse
+ * @param {string} key - the key of the current exports object
+ */
+function rewriteConditionalExportEntryPoint(exportsObject, key) {
+  const exportsField = exportsObject[key];
+  if (!exportsField) {
+    return;
+  }
+
+  if (typeof exportsField === 'string') {
+    exportsObject[key] = exportsField.replace(`${BUILD_DIR}/`, '');
+    return;
+  }
+  Object.keys(exportsField).forEach(subfieldKey => {
+    rewriteConditionalExportEntryPoint(exportsField, subfieldKey);
+  });
+}
+
+if (newPkgJson[EXPORT_MAP_ENTRY_POINT]) {
+  Object.keys(newPkgJson[EXPORT_MAP_ENTRY_POINT]).forEach(key => {
+    rewriteConditionalExportEntryPoint(newPkgJson[EXPORT_MAP_ENTRY_POINT], key);
+  });
+}
+
+if (newPkgJson[TYPES_VERSIONS_ENTRY_POINT]) {
+  Object.entries(newPkgJson[TYPES_VERSIONS_ENTRY_POINT]).forEach(([key, val]) => {
+    newPkgJson[TYPES_VERSIONS_ENTRY_POINT][key] = Object.entries(val).reduce((acc, [key, val]) => {
+      const newKey = key.replace(`${BUILD_DIR}/`, '');
+      acc[newKey] = val.map(v => v.replace(`${BUILD_DIR}/`, ''));
+      return acc;
+    }, {});
+  });
+}
+
+const newPackageJsonPath = path.resolve(BUILD_DIR, PACKAGE_JSON);
+
+// write modified package.json to file (pretty-printed with 2 spaces)
+try {
+  fs.writeFileSync(newPackageJsonPath, JSON.stringify(newPkgJson, null, 2));
+} catch (error) {
+  console.error(`\nERROR: Error while writing modified ${PACKAGE_JSON} to disk in ${pkgJson.name}:\n`, error);
+  process.exit(1);
+}

From eec98a388b7d3093191cd1b4e72d9f0b524ae10a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:40:29 +0000
Subject: [PATCH 19/30] feat(deps): bump @prisma/instrumentation from 5.16.0 to
 5.16.1 (#12718)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[@prisma/instrumentation](https://github.com/prisma/prisma/tree/HEAD/packages/instrumentation)
from 5.16.0 to 5.16.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/prisma/prisma/releases"><code>@​prisma/instrumentation</code>'s
releases</a>.</em></p>
<blockquote>
<h2>5.16.1</h2>
<p>Today, we are issuing the 5.16.1 patch release to fix an issue in
Prisma client.</p>
<h2>Fix in Prisma Client</h2>
<ul>
<li><a
href="https://redirect.github.com/prisma/prisma/issues/24634">dotenv
loading issue with PrismaClient </a></li>
<li><a
href="https://redirect.github.com/prisma/prisma/issues/24658">Prisma
Seed Script Fails After Upgrading to v5.16.0 (DATABASE_URL
Error)</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/prisma/prisma/commits/5.16.1/packages/instrumentation">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@prisma/instrumentation&package-manager=npm_and_yarn&previous-version=5.16.0&new-version=5.16.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
Dependabot will merge this PR once CI passes on it, as requested by
@AbhiPrasad.

[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/node/package.json |  2 +-
 yarn.lock                  | 99 ++++++++++++++++++++++++++------------
 2 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/packages/node/package.json b/packages/node/package.json
index c37a34b515c0..1722f8876fbd 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -87,7 +87,7 @@
     "@opentelemetry/resources": "^1.25.1",
     "@opentelemetry/sdk-trace-base": "^1.25.1",
     "@opentelemetry/semantic-conventions": "^1.25.1",
-    "@prisma/instrumentation": "5.16.0",
+    "@prisma/instrumentation": "5.16.1",
     "@sentry/core": "8.13.0",
     "@sentry/opentelemetry": "8.13.0",
     "@sentry/types": "8.13.0",
diff --git a/yarn.lock b/yarn.lock
index 56ef39daf62b..b3427bc38599 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7062,14 +7062,6 @@
     "@opentelemetry/core" "1.23.0"
     "@opentelemetry/semantic-conventions" "1.23.0"
 
-"@opentelemetry/resources@1.24.1", "@opentelemetry/resources@^1.8.0":
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.24.1.tgz#5e2cb84814824f3b1e1017e6caeeee8402e0ad6e"
-  integrity sha512-cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ==
-  dependencies:
-    "@opentelemetry/core" "1.24.1"
-    "@opentelemetry/semantic-conventions" "1.24.1"
-
 "@opentelemetry/resources@1.25.0":
   version "1.25.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.25.0.tgz#84a1e70097e342aa2047aac97be114ad14966793"
@@ -7094,6 +7086,14 @@
     "@opentelemetry/api" "^0.12.0"
     "@opentelemetry/core" "^0.12.0"
 
+"@opentelemetry/resources@^1.8.0":
+  version "1.24.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.24.1.tgz#5e2cb84814824f3b1e1017e6caeeee8402e0ad6e"
+  integrity sha512-cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ==
+  dependencies:
+    "@opentelemetry/core" "1.24.1"
+    "@opentelemetry/semantic-conventions" "1.24.1"
+
 "@opentelemetry/sdk-logs@0.50.0":
   version "0.50.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.50.0.tgz#6636492cf626a9666f61d91025e25243d1a43bfc"
@@ -7129,16 +7129,7 @@
     "@opentelemetry/resources" "1.23.0"
     "@opentelemetry/semantic-conventions" "1.23.0"
 
-"@opentelemetry/sdk-trace-base@^1.22":
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.24.1.tgz#dc2ab89126e75e442913fb5af98803fde67b2536"
-  integrity sha512-zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg==
-  dependencies:
-    "@opentelemetry/core" "1.24.1"
-    "@opentelemetry/resources" "1.24.1"
-    "@opentelemetry/semantic-conventions" "1.24.1"
-
-"@opentelemetry/sdk-trace-base@^1.23.0", "@opentelemetry/sdk-trace-base@^1.25.1":
+"@opentelemetry/sdk-trace-base@^1.22", "@opentelemetry/sdk-trace-base@^1.23.0", "@opentelemetry/sdk-trace-base@^1.25.1":
   version "1.25.1"
   resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.1.tgz#cbc1e60af255655d2020aa14cde17b37bd13df37"
   integrity sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==
@@ -7317,10 +7308,10 @@
   resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.9.1.tgz#d92bd2f7f006e0316cb4fda9d73f235965cf2c64"
   integrity sha512-caSOnG4kxcSkhqC/2ShV7rEoWwd3XrftokxJqOCMVvia4NYV/TPtJlS9C2os3Igxw/Qyxumj9GBQzcStzECvtQ==
 
-"@prisma/instrumentation@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@prisma/instrumentation/-/instrumentation-5.16.0.tgz#ee50f851945364c43e4067b84fe4071235ca3dd2"
-  integrity sha512-MVzNRW2ikWvVNnMIEgQMcwWxpFD+XF2U2h0Qz7MjutRqJxrhWexWV2aSi2OXRaU8UL5wzWw7pnjdKUzYhWauLg==
+"@prisma/instrumentation@5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@prisma/instrumentation/-/instrumentation-5.16.1.tgz#93f996f9c95874156badbb5edbb97994667f7c3f"
+  integrity sha512-4m5gRFWnQb8s/yTyGbMZkL7A5uJgqOWcWJxapwcAD0T0kh5sGPEVSQl/zTQvE9aduXhFAxOtC3gO+R8Hb5xO1Q==
   dependencies:
     "@opentelemetry/api" "^1.8"
     "@opentelemetry/instrumentation" "^0.49 || ^0.50 || ^0.51 || ^0.52.0"
@@ -9440,8 +9431,17 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8", "@types/history@*":
-  name "@types/history-4"
+"@types/history-4@npm:@types/history@4.7.8":
+  version "4.7.8"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
+  integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
+
+"@types/history-5@npm:@types/history@4.7.8":
+  version "4.7.8"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
+  integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
+
+"@types/history@*":
   version "4.7.8"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
   integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
@@ -9800,7 +9800,15 @@
     "@types/history" "^3"
     "@types/react" "*"
 
-"@types/react-router-4@npm:@types/react-router@5.1.14", "@types/react-router-5@npm:@types/react-router@5.1.14":
+"@types/react-router-4@npm:@types/react-router@5.1.14":
+  version "5.1.14"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.14.tgz#e0442f4eb4c446541ad7435d44a97f8fe6df40da"
+  integrity sha512-LAJpqYUaCTMT2anZheoidiIymt8MuX286zoVFPM3DVb23aQBH0mAkFvzpd4LKqiolV8bBtZWT5Qp7hClCNDENw==
+  dependencies:
+    "@types/history" "*"
+    "@types/react" "*"
+
+"@types/react-router-5@npm:@types/react-router@5.1.14":
   version "5.1.14"
   resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.14.tgz#e0442f4eb4c446541ad7435d44a97f8fe6df40da"
   integrity sha512-LAJpqYUaCTMT2anZheoidiIymt8MuX286zoVFPM3DVb23aQBH0mAkFvzpd4LKqiolV8bBtZWT5Qp7hClCNDENw==
@@ -28845,8 +28853,7 @@ react-is@^18.0.0:
   dependencies:
     "@remix-run/router" "1.0.2"
 
-"react-router-6@npm:react-router@6.3.0", react-router@6.3.0:
-  name react-router-6
+"react-router-6@npm:react-router@6.3.0":
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
   integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
@@ -28861,6 +28868,13 @@ react-router-dom@^6.2.2:
     history "^5.2.0"
     react-router "6.3.0"
 
+react-router@6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
+  integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
+  dependencies:
+    history "^5.2.0"
+
 react@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
@@ -31346,7 +31360,16 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@4.2.3, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -31458,7 +31481,14 @@ stringify-object@^3.2.1:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -34520,7 +34550,16 @@ workerpool@^6.4.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
   integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

From 747e23657c716e1bb8936b2fe3db77c155731a05 Mon Sep 17 00:00:00 2001
From: Damian Senn <damian.senn@gmail.com>
Date: Tue, 2 Jul 2024 17:46:50 +0200
Subject: [PATCH 20/30] fix(remix): add esm export for node (#12663)

We are running remix in ESM mode, but the exports in package.json is
pointing to the CommonJS module, which results in the SDK running in
CommonJS mode instead of ESM.

This lead to the instrumentations not running/detecting properly.
---
 packages/remix/package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index 5a5bca033904..8e4e450d966b 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -28,6 +28,9 @@
         "import": "./build/esm/index.client.js",
         "require": "./build/cjs/index.client.js"
       },
+      "import": {
+        "default": "./build/esm/index.server.js"
+      },
       "node": "./build/cjs/index.server.js"
     },
     "./import": {

From 11aea16d8684e2fcf4ae7bccd1db0fdf9df73c1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 16:01:59 +0000
Subject: [PATCH 21/30] feat(deps): bump @opentelemetry/propagator-aws-xray
 from 1.25.0 to 1.25.1 (#12719)

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b3427bc38599..82b28afb55da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7043,11 +7043,11 @@
   integrity sha512-hhTW8pFp9PSyosYzzuUL9rdm7HF97w3OCyElufFHyUnYnKkCBbu8ne2LyF/KSdI/xZ81ubxWZs78hX4S7pLq5g==
 
 "@opentelemetry/propagator-aws-xray@^1.3.1":
-  version "1.25.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-aws-xray/-/propagator-aws-xray-1.25.0.tgz#cbbe70cc45235e195d1f07c6e845df766b674b88"
-  integrity sha512-+honT9J/Xa6Mxk7AO/VlSUGaVSSQzqHr0wZDWrSunnc3eVbS5YTuv7UrcoHTED+AYziawTlx7ICeAX2VPc1M+w==
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-aws-xray/-/propagator-aws-xray-1.25.1.tgz#8bfc812308c0b94c2d80203863b53572cd9f1f72"
+  integrity sha512-soZQdO9EAROMwa9bL2C0VLadbrfRjSA9t7g6X8sL0X1B8V59pzOayYMyTW9qTECn9uuJV98A7qOnJm6KH6yk8w==
   dependencies:
-    "@opentelemetry/core" "1.25.0"
+    "@opentelemetry/core" "1.25.1"
 
 "@opentelemetry/redis-common@^0.36.2":
   version "0.36.2"

From bd484cfeb81a51db1066d242f0042387a3198305 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:41:59 +0000
Subject: [PATCH 22/30] ci(deps): bump oven-sh/setup-bun from 1 to 2

Bumps [oven-sh/setup-bun](https://github.com/oven-sh/setup-bun) from 1 to 2.
- [Release notes](https://github.com/oven-sh/setup-bun/releases)
- [Commits](https://github.com/oven-sh/setup-bun/compare/v1...v2)

---
updated-dependencies:
- dependency-name: oven-sh/setup-bun
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8930bcaf3c64..ba49c52fef94 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -464,7 +464,7 @@ jobs:
         with:
           node-version-file: 'package.json'
       - name: Set up Bun
-        uses: oven-sh/setup-bun@v1
+        uses: oven-sh/setup-bun@v2
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -1076,7 +1076,7 @@ jobs:
           node-version-file: 'dev-packages/e2e-tests/package.json'
       - name: Set up Bun
         if: matrix.test-application == 'node-exports-test-app'
-        uses: oven-sh/setup-bun@v1
+        uses: oven-sh/setup-bun@v2
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:

From 8c655e4bdabc3cf77878098034c67d8557c0f503 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Tue, 2 Jul 2024 20:09:22 +0200
Subject: [PATCH 23/30] feat(solidstart): Add solidstart SDK basic package
 (#12730)

---
 .../e2e-tests/verdaccio-config/config.yaml    |   6 +
 package.json                                  |   1 +
 packages/solid/README.md                      |   2 +-
 packages/solid/package.json                   |   2 +-
 packages/solid/test/errorboundary.test.tsx    |  10 +-
 packages/solid/test/sdk.test.ts               |   2 +-
 packages/solidstart/.eslintignore             |   4 +
 packages/solidstart/.eslintrc.js              |  21 ++
 packages/solidstart/.gitignore                |   5 +
 packages/solidstart/LICENSE                   |  21 ++
 packages/solidstart/README.md                 | 131 ++++++++
 packages/solidstart/package.json              | 122 ++++++++
 packages/solidstart/rollup.npm.config.mjs     |  25 ++
 packages/solidstart/src/client/index.ts       |   3 +
 packages/solidstart/src/client/sdk.ts         |  21 ++
 packages/solidstart/src/client/solidrouter.ts |   1 +
 packages/solidstart/src/common/debug-build.ts |   8 +
 packages/solidstart/src/index.client.ts       |   1 +
 packages/solidstart/src/index.server.ts       |   1 +
 packages/solidstart/src/index.types.ts        |  29 ++
 packages/solidstart/src/server/index.ts       | 128 ++++++++
 packages/solidstart/src/server/sdk.ts         |  20 ++
 packages/solidstart/src/server/solidrouter.ts |  43 +++
 packages/solidstart/src/solidrouter.client.ts |   1 +
 packages/solidstart/src/solidrouter.server.ts |   1 +
 packages/solidstart/src/solidrouter.ts        |  10 +
 .../test/client/errorboundary.test.tsx        | 112 +++++++
 packages/solidstart/test/client/sdk.test.ts   |  42 +++
 .../test/client/solidrouter.test.tsx          | 198 ++++++++++++
 .../test/server/errorboundary.test.tsx        | 112 +++++++
 packages/solidstart/test/server/sdk.test.ts   |  42 +++
 .../test/server/solidrouter.test.tsx          |  32 ++
 packages/solidstart/test/tsconfig.json        |   3 +
 packages/solidstart/tsconfig.json             |   7 +
 .../tsconfig.solidrouter-types.json           |  21 ++
 packages/solidstart/tsconfig.test.json        |  14 +
 packages/solidstart/tsconfig.types.json       |  19 ++
 packages/solidstart/vite.config.ts            |  14 +
 scripts/node-unit-tests.ts                    |   9 +-
 yarn.lock                                     | 288 ++++++++++++++++--
 40 files changed, 1506 insertions(+), 26 deletions(-)
 create mode 100644 packages/solidstart/.eslintignore
 create mode 100644 packages/solidstart/.eslintrc.js
 create mode 100644 packages/solidstart/.gitignore
 create mode 100644 packages/solidstart/LICENSE
 create mode 100644 packages/solidstart/README.md
 create mode 100644 packages/solidstart/package.json
 create mode 100644 packages/solidstart/rollup.npm.config.mjs
 create mode 100644 packages/solidstart/src/client/index.ts
 create mode 100644 packages/solidstart/src/client/sdk.ts
 create mode 100644 packages/solidstart/src/client/solidrouter.ts
 create mode 100644 packages/solidstart/src/common/debug-build.ts
 create mode 100644 packages/solidstart/src/index.client.ts
 create mode 100644 packages/solidstart/src/index.server.ts
 create mode 100644 packages/solidstart/src/index.types.ts
 create mode 100644 packages/solidstart/src/server/index.ts
 create mode 100644 packages/solidstart/src/server/sdk.ts
 create mode 100644 packages/solidstart/src/server/solidrouter.ts
 create mode 100644 packages/solidstart/src/solidrouter.client.ts
 create mode 100644 packages/solidstart/src/solidrouter.server.ts
 create mode 100644 packages/solidstart/src/solidrouter.ts
 create mode 100644 packages/solidstart/test/client/errorboundary.test.tsx
 create mode 100644 packages/solidstart/test/client/sdk.test.ts
 create mode 100644 packages/solidstart/test/client/solidrouter.test.tsx
 create mode 100644 packages/solidstart/test/server/errorboundary.test.tsx
 create mode 100644 packages/solidstart/test/server/sdk.test.ts
 create mode 100644 packages/solidstart/test/server/solidrouter.test.tsx
 create mode 100644 packages/solidstart/test/tsconfig.json
 create mode 100644 packages/solidstart/tsconfig.json
 create mode 100644 packages/solidstart/tsconfig.solidrouter-types.json
 create mode 100644 packages/solidstart/tsconfig.test.json
 create mode 100644 packages/solidstart/tsconfig.types.json
 create mode 100644 packages/solidstart/vite.config.ts

diff --git a/dev-packages/e2e-tests/verdaccio-config/config.yaml b/dev-packages/e2e-tests/verdaccio-config/config.yaml
index 5f77ba7cccea..973d2173aefa 100644
--- a/dev-packages/e2e-tests/verdaccio-config/config.yaml
+++ b/dev-packages/e2e-tests/verdaccio-config/config.yaml
@@ -140,6 +140,12 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
+  '@sentry/solidstart':
+    access: $all
+    publish: $all
+    unpublish: $all
+    # proxy: npmjs # Don't proxy for E2E tests!
+
   '@sentry/svelte':
     access: $all
     publish: $all
diff --git a/package.json b/package.json
index f22a482e09c1..e4427db47729 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "packages/replay-canvas",
     "packages/replay-worker",
     "packages/solid",
+    "packages/solidstart",
     "packages/svelte",
     "packages/sveltekit",
     "packages/types",
diff --git a/packages/solid/README.md b/packages/solid/README.md
index 7e042887854f..06012bb34be8 100644
--- a/packages/solid/README.md
+++ b/packages/solid/README.md
@@ -52,7 +52,7 @@ render(
 );
 ```
 
-# ErrorBoundary
+# Solid ErrorBoundary
 
 To automatically capture exceptions from inside a component tree and render a fallback component, wrap the native Solid
 JS `ErrorBoundary` component with `Sentry.withSentryErrorBoundary`.
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 1ecff5e8e284..b27ea8262d3d 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -78,7 +78,7 @@
     "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
-    "circularDepCheck": "madge --circular src/index.ts",
+    "circularDepCheck": "madge --circular src/index.ts && madge --circular src/solidrouter.ts",
     "clean": "rimraf build coverage sentry-solid-*.tgz ./*.d.ts ./*.d.ts.map",
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
diff --git a/packages/solid/test/errorboundary.test.tsx b/packages/solid/test/errorboundary.test.tsx
index f1e3f2c0e56a..ff907fc37af0 100644
--- a/packages/solid/test/errorboundary.test.tsx
+++ b/packages/solid/test/errorboundary.test.tsx
@@ -44,6 +44,7 @@ describe('withSentryErrorBoundary', () => {
   it('calls `captureException` when an error occurs`', () => {
     render(() => (
       <SentryErrorBoundary fallback={<div>Ooops, an error occurred.</div>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
         <NonExistentComponent />
       </SentryErrorBoundary>
     ));
@@ -55,6 +56,7 @@ describe('withSentryErrorBoundary', () => {
   it('renders the fallback component', async () => {
     const { findByText } = render(() => (
       <SentryErrorBoundary fallback={<div>Ooops, an error occurred.</div>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
         <NonExistentComponent />
       </SentryErrorBoundary>
     ));
@@ -65,11 +67,12 @@ describe('withSentryErrorBoundary', () => {
   it('passes the `error` and `reset` function to the fallback component', () => {
     const mockFallback = vi.fn();
 
-    render(() => {
+    render(() => (
       <SentryErrorBoundary fallback={mockFallback}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
         <NonExistentComponent />
-      </SentryErrorBoundary>;
-    });
+      </SentryErrorBoundary>
+    ));
 
     expect(mockFallback).toHaveBeenCalledTimes(1);
     expect(mockFallback).toHaveBeenCalledWith(
@@ -81,6 +84,7 @@ describe('withSentryErrorBoundary', () => {
   it('calls `captureException` again after resetting', async () => {
     const { findByRole } = render(() => (
       <SentryErrorBoundary fallback={(_, reset) => <button onClick={reset}>Reset</button>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
         <NonExistentComponent />
       </SentryErrorBoundary>
     ));
diff --git a/packages/solid/test/sdk.test.ts b/packages/solid/test/sdk.test.ts
index 2b5547091ff7..c912eda2809a 100644
--- a/packages/solid/test/sdk.test.ts
+++ b/packages/solid/test/sdk.test.ts
@@ -6,7 +6,7 @@ import { init as solidInit } from '../src/sdk';
 
 const browserInit = vi.spyOn(SentryBrowser, 'init');
 
-describe('Initialize Solid SDk', () => {
+describe('Initialize Solid SDK', () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
diff --git a/packages/solidstart/.eslintignore b/packages/solidstart/.eslintignore
new file mode 100644
index 000000000000..b8788c686e12
--- /dev/null
+++ b/packages/solidstart/.eslintignore
@@ -0,0 +1,4 @@
+/client
+/server
+/*.d.ts
+/*.d.ts.map
diff --git a/packages/solidstart/.eslintrc.js b/packages/solidstart/.eslintrc.js
new file mode 100644
index 000000000000..c1f55c94aadf
--- /dev/null
+++ b/packages/solidstart/.eslintrc.js
@@ -0,0 +1,21 @@
+module.exports = {
+  env: {
+    browser: true,
+    node: true,
+  },
+  overrides: [
+    {
+      files: ['vite.config.ts'],
+      parserOptions: {
+        project: ['tsconfig.test.json'],
+      },
+    },
+    {
+      files: ['src/vite/**', 'src/server/**'],
+      rules: {
+        '@sentry-internal/sdk/no-optional-chaining': 'off',
+      },
+    },
+  ],
+  extends: ['../../.eslintrc.js'],
+};
diff --git a/packages/solidstart/.gitignore b/packages/solidstart/.gitignore
new file mode 100644
index 000000000000..9d5e99bfb5a5
--- /dev/null
+++ b/packages/solidstart/.gitignore
@@ -0,0 +1,5 @@
+# types for the solidrouter integration that get output in root
+/client
+/server
+/*.d.ts
+/*.d.ts.map
diff --git a/packages/solidstart/LICENSE b/packages/solidstart/LICENSE
new file mode 100644
index 000000000000..6bfafc44539c
--- /dev/null
+++ b/packages/solidstart/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-2024 Functional Software, Inc. dba Sentry
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/solidstart/README.md b/packages/solidstart/README.md
new file mode 100644
index 000000000000..e27e73447f2d
--- /dev/null
+++ b/packages/solidstart/README.md
@@ -0,0 +1,131 @@
+<p align="center">
+  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
+    <img src="https://sentry-brand.storage.googleapis.com/sentry-wordmark-dark-280x84.png" alt="Sentry" width="280" height="84">
+  </a>
+</p>
+
+# Official Sentry SDK for Solid Start (EXPERIMENTAL)
+
+[![npm version](https://img.shields.io/npm/v/@sentry/solidstart.svg)](https://www.npmjs.com/package/@sentry/solidstart)
+[![npm dm](https://img.shields.io/npm/dm/@sentry/solidstart.svg)](https://www.npmjs.com/package/@sentry/solidstart)
+[![npm dt](https://img.shields.io/npm/dt/@sentry/solidstart.svg)](https://www.npmjs.com/package/@sentry/solidstart)
+
+This SDK is considered ⚠️ **experimental and in an alpha state**. It may experience breaking changes. Please reach out
+on [GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback or concerns. This
+SDK is for [Solid Start](https://start.solidjs.com/). If you're using [Solid](https://www.solidjs.com/) see our
+[Solid SDK here](https://github.com/getsentry/sentry-javascript/tree/develop/packages/solid).
+
+## Links
+
+- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/solidstart/)
+
+## General
+
+This package is a wrapper around `@sentry/node` for the server and `@sentry/solid` for the client side, with added
+functionality related to Solid Start.
+
+## Manual Setup
+
+If the setup through the wizard doesn't work for you, you can also set up the SDK manually.
+
+### 1. Prerequesits & Installation
+
+Install the Sentry Solid Start SDK:
+
+```bash
+# Using npm
+npm install @sentry/solidstart
+
+# Using yarn
+yarn add @sentry/solidstart
+```
+
+### 2. Client-side Setup
+
+Initialize the SDK in `entry-client.jsx`
+
+```jsx
+import * as Sentry from '@sentry/solidstart';
+import { mount, StartClient } from '@solidjs/start/client';
+
+Sentry.init({
+  dsn: '__PUBLIC_DSN__',
+  tracesSampleRate: 1.0, //  Capture 100% of the transactions
+});
+
+mount(() => <StartClient />, document.getElementById('app'));
+```
+
+### 3. Server-side Setup
+
+Create an instrument file named `instrument.server.mjs` and add your initialization code for the server-side SDK.
+
+```javascript
+import * as Sentry from '@sentry/solidstart';
+
+Sentry.init({
+  dsn: 'https://0e67f7dd5326d51506e92d7f1eff887a@o447951.ingest.us.sentry.io/4507459091824640',
+  tracesSampleRate: 1.0, //  Capture 100% of the transactions
+});
+```
+
+### 4. Run your application
+
+Then run your app
+
+```bash
+NODE_OPTIONS='--import=./instrument.server.mjs' yarn start
+# or
+NODE_OPTIONS='--require=./instrument.server.js' yarn start
+```
+
+# Solid Router
+
+The Solid Router instrumentation uses the Solid Router library to create navigation spans to ensure you collect
+meaningful performance data about the health of your page loads and associated requests.
+
+Wrap `Router`, `MemoryRouter` or `HashRouter` from `@solidjs/router` using `withSentryRouterRouting`. This creates a
+higher order component, which will enable Sentry to reach your router context.
+
+```js
+import { withSentryRouterRouting } from '@sentry/solidstart/solidrouter';
+import { Route, Router } from '@solidjs/router';
+
+const SentryRouter = Sentry.withSentryRouterRouting(Router);
+
+render(
+  () => (
+    <SentryRouter>
+      <Route path="/" component={App} />
+      ...
+    </SentryRouter>
+  ),
+  document.getElementById('root'),
+);
+```
+
+# Solid ErrorBoundary
+
+To automatically capture exceptions from inside a component tree and render a fallback component, wrap the native Solid
+JS `ErrorBoundary` component with `Sentry.withSentryErrorBoundary`.
+
+```js
+import * as Sentry from '@sentry/solidstart';
+import { ErrorBoundary } from 'solid-js';
+
+Sentry.init({
+  dsn: '__PUBLIC_DSN__',
+  tracesSampleRate: 1.0, //  Capture 100% of the transactions
+});
+
+const SentryErrorBoundary = Sentry.withSentryErrorBoundary(ErrorBoundary);
+
+render(
+  () => (
+    <SentryErrorBoundary fallback={err => <div>Error: {err.message}</div>}>
+      <ProblematicComponent />
+    </SentryErrorBoundary>
+  ),
+  document.getElementById('root'),
+);
+```
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
new file mode 100644
index 000000000000..3b6e04a13429
--- /dev/null
+++ b/packages/solidstart/package.json
@@ -0,0 +1,122 @@
+{
+  "name": "@sentry/solidstart",
+  "version": "8.13.0",
+  "description": "Official Sentry SDK for Solid Start",
+  "repository": "git://github.com/getsentry/sentry-javascript.git",
+  "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
+  "author": "Sentry",
+  "license": "MIT",
+  "engines": {
+    "node": ">=16"
+  },
+  "files": [
+    "/build",
+    "/client",
+    "/server",
+    "/*.d.ts",
+    "/*.d.ts.map"
+  ],
+  "main": "build/cjs/index.server.js",
+  "module": "build/esm/index.server.js",
+  "browser": "build/esm/index.client.js",
+  "types": "build/types/index.types.d.ts",
+  "//": [
+    "For `@sentry/solidstart/solidrouter` types to resolve correctly for both `moduleResolution: bundler` and `moduleResolution: node`",
+    "- type definitions have to be exported at root level (/build won't work)",
+    "- type definitions have to match in name (i.e. `solidrouter.d.ts`)",
+    "- the `types` entry needs to be set both at the root of the export and within `browser` and `node`"
+  ],
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "types": "./build/types/index.types.d.ts",
+      "browser": {
+        "import": "./build/esm/index.client.js",
+        "require": "./build/cjs/index.client.js"
+      },
+      "node": {
+        "import": "./build/esm/index.server.js",
+        "require": "./build/cjs/index.server.js"
+      }
+    },
+    "./solidrouter": {
+      "types": "./solidrouter.d.ts",
+      "browser": {
+        "types": "./solidrouter.d.ts",
+        "import": "./build/esm/solidrouter.client.js",
+        "require": "./build/cjs/solidrouter.client.js"
+      },
+      "node": {
+        "types": "./solidrouter.d.ts",
+        "import": "./build/esm/solidrouter.server.js",
+        "require": "./build/cjs/solidrouter.server.js"
+      }
+    }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "peerDependencies": {
+    "@solidjs/router": "^0.13.4",
+    "@solidjs/start": "^1.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@solidjs/router": {
+      "optional": true
+    }
+  },
+  "dependencies": {
+    "@sentry/core": "8.13.0",
+    "@sentry/node": "8.13.0",
+    "@sentry/opentelemetry": "8.13.0",
+    "@sentry/solid": "8.13.0",
+    "@sentry/types": "8.13.0",
+    "@sentry/utils": "8.13.0",
+    "@sentry/vite-plugin": "2.19.0"
+  },
+  "devDependencies": {
+    "@solidjs/start": "^1.0.0",
+    "@solidjs/router": "^0.13.4",
+    "@solidjs/testing-library": "0.8.5",
+    "@testing-library/jest-dom": "^6.4.5",
+    "@testing-library/user-event": "^14.5.2",
+    "vite-plugin-solid": "^2.8.2"
+  },
+  "scripts": {
+    "build": "run-p build:transpile build:types",
+    "build:dev": "yarn build",
+    "build:transpile": "rollup -c rollup.npm.config.mjs",
+    "build:types": "run-s build:types:core build:types:solidrouter",
+    "build:types:core": "tsc -p tsconfig.types.json",
+    "build:types:solidrouter": "tsc -p tsconfig.solidrouter-types.json",
+    "build:watch": "run-p build:transpile:watch build:types:watch",
+    "build:dev:watch": "yarn build:watch",
+    "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
+    "build:types:watch": "tsc -p tsconfig.types.json --watch",
+    "build:tarball": "npm pack",
+    "circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts && madge --circular src/solidrouter.client.ts && madge --circular src/solidrouter.server.ts && madge --circular src/solidrouter.ts",
+    "clean": "rimraf build coverage sentry-solidstart-*.tgz ./*.d.ts ./*.d.ts.map ./client ./server",
+    "fix": "eslint . --format stylish --fix",
+    "lint": "eslint . --format stylish",
+    "test": "yarn test:unit",
+    "test:unit": "vitest run",
+    "test:watch": "vitest --watch",
+    "yalc:publish": "yalc publish --push --sig"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "nx": {
+    "targets": {
+      "build:types": {
+        "outputs": [
+          "{projectRoot}/build/types",
+          "{projectRoot}/client",
+          "{projectRoot}/server",
+          "{projectRoot}/*.d.ts",
+          "{projectRoot}/*.d.ts.map"
+        ]
+      }
+    }
+  }
+}
diff --git a/packages/solidstart/rollup.npm.config.mjs b/packages/solidstart/rollup.npm.config.mjs
new file mode 100644
index 000000000000..5a36889c70f0
--- /dev/null
+++ b/packages/solidstart/rollup.npm.config.mjs
@@ -0,0 +1,25 @@
+import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
+
+export default makeNPMConfigVariants(
+  makeBaseNPMConfig({
+    entrypoints: [
+      'src/index.client.ts',
+      'src/index.server.ts',
+      'src/client/index.ts',
+      'src/server/index.ts',
+      'src/solidrouter.ts',
+      'src/solidrouter.client.ts',
+      'src/solidrouter.server.ts',
+      'src/client/solidrouter.ts',
+      'src/server/solidrouter.ts',
+    ],
+    // prevent this internal code from ending up in our built package (this doesn't happen automatially because
+    // the name doesn't match an SDK dependency)
+    packageSpecificConfig: {
+      external: ['solid-js', '@sentry/solid', '@sentry/solid/solidrouter'],
+      output: {
+        dynamicImportInCjs: true,
+      },
+    },
+  }),
+);
diff --git a/packages/solidstart/src/client/index.ts b/packages/solidstart/src/client/index.ts
new file mode 100644
index 000000000000..9b455bb3048c
--- /dev/null
+++ b/packages/solidstart/src/client/index.ts
@@ -0,0 +1,3 @@
+export * from '@sentry/solid';
+
+export { init } from './sdk';
diff --git a/packages/solidstart/src/client/sdk.ts b/packages/solidstart/src/client/sdk.ts
new file mode 100644
index 000000000000..1b5cf2359306
--- /dev/null
+++ b/packages/solidstart/src/client/sdk.ts
@@ -0,0 +1,21 @@
+import { applySdkMetadata, setTag } from '@sentry/core';
+import type { BrowserOptions } from '@sentry/solid';
+import { init as initSolidSDK } from '@sentry/solid';
+import type { Client } from '@sentry/types';
+
+/**
+ * Initializes the client side of the Solid Start SDK.
+ */
+export function init(options: BrowserOptions): Client | undefined {
+  const opts = {
+    ...options,
+  };
+
+  applySdkMetadata(opts, 'solidstart', ['solidstart', 'solid']);
+
+  const client = initSolidSDK(opts);
+
+  setTag('runtime', 'browser');
+
+  return client;
+}
diff --git a/packages/solidstart/src/client/solidrouter.ts b/packages/solidstart/src/client/solidrouter.ts
new file mode 100644
index 000000000000..34d3b324f9d3
--- /dev/null
+++ b/packages/solidstart/src/client/solidrouter.ts
@@ -0,0 +1 @@
+export * from '@sentry/solid/solidrouter';
diff --git a/packages/solidstart/src/common/debug-build.ts b/packages/solidstart/src/common/debug-build.ts
new file mode 100644
index 000000000000..60aa50940582
--- /dev/null
+++ b/packages/solidstart/src/common/debug-build.ts
@@ -0,0 +1,8 @@
+declare const __DEBUG_BUILD__: boolean;
+
+/**
+ * This serves as a build time flag that will be true by default, but false in non-debug builds or if users replace `__SENTRY_DEBUG__` in their generated code.
+ *
+ * ATTENTION: This constant must never cross package boundaries (i.e. be exported) to guarantee that it can be used for tree shaking.
+ */
+export const DEBUG_BUILD = __DEBUG_BUILD__;
diff --git a/packages/solidstart/src/index.client.ts b/packages/solidstart/src/index.client.ts
new file mode 100644
index 000000000000..4f1cce44fa36
--- /dev/null
+++ b/packages/solidstart/src/index.client.ts
@@ -0,0 +1 @@
+export * from './client';
diff --git a/packages/solidstart/src/index.server.ts b/packages/solidstart/src/index.server.ts
new file mode 100644
index 000000000000..0ce5251aa327
--- /dev/null
+++ b/packages/solidstart/src/index.server.ts
@@ -0,0 +1 @@
+export * from './server';
diff --git a/packages/solidstart/src/index.types.ts b/packages/solidstart/src/index.types.ts
new file mode 100644
index 000000000000..a2c4d1ab7c06
--- /dev/null
+++ b/packages/solidstart/src/index.types.ts
@@ -0,0 +1,29 @@
+// We export everything from both the client part of the SDK and from the server part.
+// Some of the exports collide, which is not allowed, unless we redifine the colliding
+// exports in this file - which we do below.
+export * from './client';
+export * from './server';
+
+import type { Integration, Options, StackParser } from '@sentry/types';
+
+import type * as clientSdk from './client';
+import type * as serverSdk from './server';
+
+/** Initializes Sentry Solid Start SDK */
+export declare function init(options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions): void;
+
+export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
+
+export declare const getDefaultIntegrations: (options: Options) => Integration[];
+export declare const defaultStackParser: StackParser;
+
+export declare const getClient: typeof clientSdk.getClient;
+
+export declare function close(timeout?: number | undefined): PromiseLike<boolean>;
+export declare function flush(timeout?: number | undefined): PromiseLike<boolean>;
+export declare function lastEventId(): string | undefined;
+
+export declare const continueTrace: typeof clientSdk.continueTrace;
+
+export declare const metrics: typeof clientSdk.metrics & typeof serverSdk.metrics;
diff --git a/packages/solidstart/src/server/index.ts b/packages/solidstart/src/server/index.ts
new file mode 100644
index 000000000000..8b6ab6148fb8
--- /dev/null
+++ b/packages/solidstart/src/server/index.ts
@@ -0,0 +1,128 @@
+// Node SDK exports
+// Unfortunately, we cannot `export * from '@sentry/node'` because in prod builds,
+// Vite puts these exports into a `default` property (Sentry.default) rather than
+// on the top - level namespace.
+// Hence, we export everything from the Node SDK explicitly:
+export {
+  addBreadcrumb,
+  addEventProcessor,
+  addIntegration,
+  addOpenTelemetryInstrumentation,
+  addRequestDataToEvent,
+  anrIntegration,
+  captureCheckIn,
+  captureConsoleIntegration,
+  captureEvent,
+  captureException,
+  captureFeedback,
+  captureMessage,
+  captureSession,
+  close,
+  connectIntegration,
+  consoleIntegration,
+  contextLinesIntegration,
+  continueTrace,
+  createGetModuleFromFilename,
+  createTransport,
+  cron,
+  debugIntegration,
+  dedupeIntegration,
+  DEFAULT_USER_INCLUDES,
+  defaultStackParser,
+  endSession,
+  expressErrorHandler,
+  expressIntegration,
+  extractRequestData,
+  extraErrorDataIntegration,
+  fastifyIntegration,
+  flush,
+  functionToStringIntegration,
+  generateInstrumentOnce,
+  getActiveSpan,
+  getAutoPerformanceIntegrations,
+  getClient,
+  // eslint-disable-next-line deprecation/deprecation
+  getCurrentHub,
+  getCurrentScope,
+  getDefaultIntegrations,
+  getGlobalScope,
+  getIsolationScope,
+  getRootSpan,
+  getSentryRelease,
+  getSpanDescendants,
+  getSpanStatusFromHttpCode,
+  graphqlIntegration,
+  hapiIntegration,
+  httpIntegration,
+  inboundFiltersIntegration,
+  initOpenTelemetry,
+  isInitialized,
+  koaIntegration,
+  lastEventId,
+  linkedErrorsIntegration,
+  localVariablesIntegration,
+  makeNodeTransport,
+  metrics,
+  modulesIntegration,
+  mongoIntegration,
+  mongooseIntegration,
+  mysql2Integration,
+  mysqlIntegration,
+  nativeNodeFetchIntegration,
+  nestIntegration,
+  NodeClient,
+  nodeContextIntegration,
+  onUncaughtExceptionIntegration,
+  onUnhandledRejectionIntegration,
+  parameterize,
+  postgresIntegration,
+  prismaIntegration,
+  redisIntegration,
+  requestDataIntegration,
+  rewriteFramesIntegration,
+  Scope,
+  SDK_VERSION,
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  sessionTimingIntegration,
+  setContext,
+  setCurrentClient,
+  setExtra,
+  setExtras,
+  setHttpStatus,
+  setMeasurement,
+  setTag,
+  setTags,
+  setupConnectErrorHandler,
+  setupExpressErrorHandler,
+  setupHapiErrorHandler,
+  setupKoaErrorHandler,
+  setupNestErrorHandler,
+  setUser,
+  spanToBaggageHeader,
+  spanToJSON,
+  spanToTraceHeader,
+  spotlightIntegration,
+  startInactiveSpan,
+  startNewTrace,
+  startSession,
+  startSpan,
+  startSpanManual,
+  trpcMiddleware,
+  withActiveSpan,
+  withIsolationScope,
+  withMonitor,
+  withScope,
+  zodErrorsIntegration,
+} from '@sentry/node';
+
+// We can still leave this for the carrier init and type exports
+export * from '@sentry/node';
+
+export { withSentryErrorBoundary } from '@sentry/solid';
+
+// -------------------------
+// Solid Start SDK exports:
+export { init } from './sdk';
diff --git a/packages/solidstart/src/server/sdk.ts b/packages/solidstart/src/server/sdk.ts
new file mode 100644
index 000000000000..86287f79ea75
--- /dev/null
+++ b/packages/solidstart/src/server/sdk.ts
@@ -0,0 +1,20 @@
+import { applySdkMetadata, setTag } from '@sentry/core';
+import type { NodeClient, NodeOptions } from '@sentry/node';
+import { init as initNodeSdk } from '@sentry/node';
+
+/**
+ * Initializes the server side of the Solid Start SDK
+ */
+export function init(options: NodeOptions): NodeClient | undefined {
+  const opts = {
+    ...options,
+  };
+
+  applySdkMetadata(opts, 'solidstart', ['solidstart', 'node']);
+
+  const client = initNodeSdk(opts);
+
+  setTag('runtime', 'node');
+
+  return client;
+}
diff --git a/packages/solidstart/src/server/solidrouter.ts b/packages/solidstart/src/server/solidrouter.ts
new file mode 100644
index 000000000000..e3ef7b4307ef
--- /dev/null
+++ b/packages/solidstart/src/server/solidrouter.ts
@@ -0,0 +1,43 @@
+import type { HashRouter, MemoryRouter, RouteSectionProps, Router as BaseRouter, StaticRouter } from '@solidjs/router';
+import { mergeProps, splitProps } from 'solid-js';
+import type { Component, JSX, ParentProps } from 'solid-js';
+import { createComponent } from 'solid-js/web';
+
+// We use @sentry/solid/solidrouter on the client.
+// On the server, we have to create matching components
+// in structure to avoid hydration errors.
+
+/** Pass-through component in case user didn't specify a root **/
+function SentryDefaultRoot(props: ParentProps): JSX.Element {
+  return props.children;
+}
+
+/**
+ * On the client, router hooks are used in the router's root render prop.
+ * This creates a matching structure that's purely pass-through to avoid hydration errors.
+ */
+function withSentryRouterRoot(Root: Component<RouteSectionProps>): Component<RouteSectionProps> {
+  const SentryRouterRoot = (props: RouteSectionProps): JSX.Element => {
+    return createComponent(Root, props);
+  };
+
+  return SentryRouterRoot;
+}
+
+export type RouterType = typeof BaseRouter | typeof HashRouter | typeof MemoryRouter | typeof StaticRouter;
+
+/**
+ * On the client, router hooks are used to start navigation spans.
+ * This creates a matching structure that's purely pass-through to avoid hydration errors.
+ */
+export function withSentryRouterRouting(Router: RouterType): RouterType {
+  const SentryRouter = (props: Parameters<RouterType>[0]): JSX.Element => {
+    const [local, others] = splitProps(props, ['root']);
+    // We need to wrap root here in case the user passed in their own root
+    const Root = withSentryRouterRoot(local.root ? local.root : SentryDefaultRoot);
+
+    return createComponent(Router, mergeProps({ root: Root }, others));
+  };
+
+  return SentryRouter;
+}
diff --git a/packages/solidstart/src/solidrouter.client.ts b/packages/solidstart/src/solidrouter.client.ts
new file mode 100644
index 000000000000..ee104bf72e2b
--- /dev/null
+++ b/packages/solidstart/src/solidrouter.client.ts
@@ -0,0 +1 @@
+export * from './client/solidrouter';
diff --git a/packages/solidstart/src/solidrouter.server.ts b/packages/solidstart/src/solidrouter.server.ts
new file mode 100644
index 000000000000..cad6137aeb89
--- /dev/null
+++ b/packages/solidstart/src/solidrouter.server.ts
@@ -0,0 +1 @@
+export * from './server/solidrouter';
diff --git a/packages/solidstart/src/solidrouter.ts b/packages/solidstart/src/solidrouter.ts
new file mode 100644
index 000000000000..f1539b9e3c81
--- /dev/null
+++ b/packages/solidstart/src/solidrouter.ts
@@ -0,0 +1,10 @@
+// We export everything from both the client part of the SDK and from the server part.
+// Some of the exports collide, which is not allowed, unless we redefine the colliding
+// exports in this file - which we do below.
+
+export * from './client/solidrouter';
+export * from './server/solidrouter';
+
+import type { RouterType } from './server/solidrouter';
+
+export declare function withSentryRouterRouting(Router: RouterType): RouterType;
diff --git a/packages/solidstart/test/client/errorboundary.test.tsx b/packages/solidstart/test/client/errorboundary.test.tsx
new file mode 100644
index 000000000000..8ce4e31e89d2
--- /dev/null
+++ b/packages/solidstart/test/client/errorboundary.test.tsx
@@ -0,0 +1,112 @@
+/* eslint-disable @typescript-eslint/unbound-method */
+import type * as SentryBrowser from '@sentry/browser';
+import { createTransport, getCurrentScope, setCurrentClient } from '@sentry/core';
+import { render } from '@solidjs/testing-library';
+import userEvent from '@testing-library/user-event';
+import { vi } from 'vitest';
+
+import { ErrorBoundary } from 'solid-js';
+import { BrowserClient, withSentryErrorBoundary } from '../../src/client';
+
+const mockCaptureException = vi.fn();
+vi.mock('@sentry/browser', async () => {
+  const actual = await vi.importActual<typeof SentryBrowser>('@sentry/browser');
+  return {
+    ...actual,
+    captureException: (...args) => mockCaptureException(...args),
+  } as typeof SentryBrowser;
+});
+
+const user = userEvent.setup();
+const SentryErrorBoundary = withSentryErrorBoundary(ErrorBoundary);
+
+describe('withSentryErrorBoundary', () => {
+  function createMockBrowserClient(): BrowserClient {
+    return new BrowserClient({
+      integrations: [],
+      tracesSampleRate: 1,
+      transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
+      stackParser: () => [],
+    });
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+  });
+
+  afterEach(() => {
+    getCurrentScope().setClient(undefined);
+  });
+
+  it('calls `captureException` when an error occurs`', () => {
+    render(() => (
+      <SentryErrorBoundary fallback={<div>Ooops, an error occurred.</div>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(mockCaptureException).toHaveBeenCalledTimes(1);
+    expect(mockCaptureException).toHaveBeenLastCalledWith(new ReferenceError('NonExistentComponent is not defined'));
+  });
+
+  it('renders the fallback component', async () => {
+    const { findByText } = render(() => (
+      <SentryErrorBoundary fallback={<div>Ooops, an error occurred.</div>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(await findByText('Ooops, an error occurred.')).toBeInTheDocument();
+  });
+
+  it('passes the `error` and `reset` function to the fallback component', () => {
+    const mockFallback = vi.fn();
+
+    render(() => (
+      <SentryErrorBoundary fallback={mockFallback}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(mockFallback).toHaveBeenCalledTimes(1);
+    expect(mockFallback).toHaveBeenCalledWith(
+      new ReferenceError('NonExistentComponent is not defined'),
+      expect.any(Function),
+    );
+  });
+
+  it('calls `captureException` again after resetting', async () => {
+    const { findByRole } = render(() => (
+      <SentryErrorBoundary fallback={(_, reset) => <button onClick={reset}>Reset</button>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(mockCaptureException).toHaveBeenCalledTimes(1);
+    expect(mockCaptureException).toHaveBeenNthCalledWith(1, new ReferenceError('NonExistentComponent is not defined'));
+
+    const button = await findByRole('button');
+    await user.click(button);
+
+    expect(mockCaptureException).toHaveBeenCalledTimes(2);
+    expect(mockCaptureException).toHaveBeenNthCalledWith(2, new ReferenceError('NonExistentComponent is not defined'));
+  });
+
+  it('renders children when there is no error', async () => {
+    const { queryByText } = render(() => (
+      <SentryErrorBoundary fallback={<div>Oops, an error occurred.</div>}>
+        <div>Adopt a cat</div>
+      </SentryErrorBoundary>
+    ));
+
+    expect(await queryByText('Adopt a cat')).toBeInTheDocument();
+    expect(await queryByText('Ooops, an error occurred')).not.toBeInTheDocument();
+  });
+});
diff --git a/packages/solidstart/test/client/sdk.test.ts b/packages/solidstart/test/client/sdk.test.ts
new file mode 100644
index 000000000000..76fa71ade8ec
--- /dev/null
+++ b/packages/solidstart/test/client/sdk.test.ts
@@ -0,0 +1,42 @@
+import { SDK_VERSION } from '@sentry/solid';
+import * as SentrySolid from '@sentry/solid';
+
+import { vi } from 'vitest';
+import { init as solidStartInit } from '../../src/client';
+
+const browserInit = vi.spyOn(SentrySolid, 'init');
+
+describe('Initialize Solid Start SDK', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('has the correct metadata', () => {
+    const client = solidStartInit({
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+    });
+
+    const expectedMetadata = {
+      _metadata: {
+        sdk: {
+          name: 'sentry.javascript.solidstart',
+          packages: [
+            { name: 'npm:@sentry/solidstart', version: SDK_VERSION },
+            { name: 'npm:@sentry/solid', version: SDK_VERSION },
+          ],
+          version: SDK_VERSION,
+        },
+      },
+    };
+
+    expect(client).not.toBeUndefined();
+    expect(browserInit).toHaveBeenCalledTimes(1);
+    expect(browserInit).toHaveBeenLastCalledWith(expect.objectContaining(expectedMetadata));
+  });
+
+  it('sets the runtime tag on the isolation scope', () => {
+    solidStartInit({ dsn: 'https://public@dsn.ingest.sentry.io/1337' });
+
+    expect(SentrySolid.getIsolationScope().getScopeData().tags).toEqual({ runtime: 'browser' });
+  });
+});
diff --git a/packages/solidstart/test/client/solidrouter.test.tsx b/packages/solidstart/test/client/solidrouter.test.tsx
new file mode 100644
index 000000000000..d6b161c3a7d9
--- /dev/null
+++ b/packages/solidstart/test/client/solidrouter.test.tsx
@@ -0,0 +1,198 @@
+import { spanToJSON } from '@sentry/browser';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  createTransport,
+  getCurrentScope,
+  setCurrentClient,
+} from '@sentry/core';
+import type { MemoryHistory } from '@solidjs/router';
+import { MemoryRouter, Navigate, Route, createMemoryHistory } from '@solidjs/router';
+import { render } from '@solidjs/testing-library';
+import { vi } from 'vitest';
+
+import { BrowserClient } from '../../src/client';
+import { solidRouterBrowserTracingIntegration, withSentryRouterRouting } from '../../src/client/solidrouter';
+
+// solid router uses `window.scrollTo` when navigating
+vi.spyOn(global, 'scrollTo').mockImplementation(() => {});
+
+const renderRouter = (SentryRouter: typeof MemoryRouter, history: MemoryHistory) =>
+  render(() => (
+    <SentryRouter history={history}>
+      <Route path="/" component={() => <div>Home</div>} />
+      <Route path="/about">
+        <Route path="/" component={() => <div>About</div>} />
+        <Route path="/us" component={() => <div>us</div>} />
+      </Route>
+      <Route path="/user">
+        <Route path="/:id" component={() => <div>User</div>} />
+        <Route path="/:id/post/:postId" component={() => <div>Post</div>} />
+      </Route>
+      <Route path="/navigate-to-about" component={() => <Navigate href="/about" />} />
+      <Route path="/navigate-to-about-us" component={() => <Navigate href="/about/us" />} />
+      <Route path="/navigate-to-user" component={() => <Navigate href="/user/5" />} />
+      <Route path="/navigate-to-user-post" component={() => <Navigate href="/user/5/post/12" />} />
+    </SentryRouter>
+  ));
+
+describe('solidRouterBrowserTracingIntegration', () => {
+  function createMockBrowserClient(): BrowserClient {
+    return new BrowserClient({
+      integrations: [],
+      tracesSampleRate: 1,
+      transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
+      stackParser: () => [],
+    });
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    getCurrentScope().setClient(undefined);
+  });
+
+  it('starts a pageload span', () => {
+    const spanStartMock = vi.fn();
+
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    client.on('spanStart', span => spanStartMock(spanToJSON(span)));
+    client.addIntegration(solidRouterBrowserTracingIntegration());
+
+    const history = createMemoryHistory();
+    history.set({ value: '/' });
+
+    expect(spanStartMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        op: 'pageload',
+        description: '/',
+        data: expect.objectContaining({
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
+        }),
+      }),
+    );
+  });
+
+  it('skips pageload span, with `instrumentPageLoad: false`', () => {
+    const spanStartMock = vi.fn();
+
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    client.on('spanStart', span => spanStartMock(spanToJSON(span)));
+    client.addIntegration(
+      solidRouterBrowserTracingIntegration({
+        instrumentPageLoad: false,
+      }),
+    );
+    const SentryRouter = withSentryRouterRouting(MemoryRouter);
+
+    const history = createMemoryHistory();
+    history.set({ value: '/' });
+
+    renderRouter(SentryRouter, history);
+
+    expect(spanStartMock).not.toHaveBeenCalledWith(
+      expect.objectContaining({
+        op: 'pageload',
+        description: '/',
+        data: expect.objectContaining({
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
+        }),
+      }),
+    );
+  });
+
+  it.each([
+    ['', '/navigate-to-about', '/about'],
+    ['for nested navigation', '/navigate-to-about-us', '/about/us'],
+    ['for navigation with param', '/navigate-to-user', '/user/5'],
+    ['for nested navigation with params', '/navigate-to-user-post', '/user/5/post/12'],
+  ])('starts a navigation span %s', (_itDescription, navigationPath, path) => {
+    const spanStartMock = vi.fn();
+
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    client.on('spanStart', span => {
+      spanStartMock(spanToJSON(span));
+    });
+    client.addIntegration(solidRouterBrowserTracingIntegration());
+    const SentryRouter = withSentryRouterRouting(MemoryRouter);
+
+    const history = createMemoryHistory();
+    history.set({ value: navigationPath });
+
+    renderRouter(SentryRouter, history);
+
+    expect(spanStartMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        op: 'navigation',
+        description: path,
+        data: expect.objectContaining({
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.solid.solidrouter',
+        }),
+      }),
+    );
+  });
+
+  it('skips navigation span, with `instrumentNavigation: false`', () => {
+    const spanStartMock = vi.fn();
+
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    client.on('spanStart', span => spanStartMock(spanToJSON(span)));
+    client.addIntegration(
+      solidRouterBrowserTracingIntegration({
+        instrumentNavigation: false,
+      }),
+    );
+    const SentryRouter = withSentryRouterRouting(MemoryRouter);
+
+    const history = createMemoryHistory();
+    history.set({ value: '/navigate-to-about' });
+
+    renderRouter(SentryRouter, history);
+
+    expect(spanStartMock).not.toHaveBeenCalledWith(
+      expect.objectContaining({
+        op: 'navigation',
+        description: '/about',
+        data: expect.objectContaining({
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.solid.solidrouter',
+        }),
+      }),
+    );
+  });
+
+  it("updates the scope's `transactionName` on a navigation", () => {
+    const spanStartMock = vi.fn();
+
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    client.on('spanStart', span => {
+      spanStartMock(spanToJSON(span));
+    });
+    client.addIntegration(solidRouterBrowserTracingIntegration());
+    const SentryRouter = withSentryRouterRouting(MemoryRouter);
+
+    const history = createMemoryHistory();
+    history.set({ value: '/navigate-to-about' });
+
+    renderRouter(SentryRouter, history);
+
+    expect(getCurrentScope().getScopeData()?.transactionName).toBe('/about');
+  });
+});
diff --git a/packages/solidstart/test/server/errorboundary.test.tsx b/packages/solidstart/test/server/errorboundary.test.tsx
new file mode 100644
index 000000000000..0d97b6b17a0d
--- /dev/null
+++ b/packages/solidstart/test/server/errorboundary.test.tsx
@@ -0,0 +1,112 @@
+/* eslint-disable @typescript-eslint/unbound-method */
+import type * as SentryCore from '@sentry/core';
+import { createTransport, getCurrentScope, setCurrentClient } from '@sentry/core';
+import { render } from '@solidjs/testing-library';
+import userEvent from '@testing-library/user-event';
+import { vi } from 'vitest';
+
+import { ErrorBoundary } from 'solid-js';
+import { NodeClient, withSentryErrorBoundary } from '../../src/server';
+
+const mockCaptureException = vi.fn();
+vi.mock('@sentry/core', async () => {
+  const actual = await vi.importActual<typeof SentryCore>('@sentry/core');
+  return {
+    ...actual,
+    captureException: (...args) => mockCaptureException(...args),
+  } as typeof SentryCore;
+});
+
+const user = userEvent.setup();
+const SentryErrorBoundary = withSentryErrorBoundary(ErrorBoundary);
+
+describe('withSentryErrorBoundary', () => {
+  function createMockNodeClient(): NodeClient {
+    return new NodeClient({
+      integrations: [],
+      tracesSampleRate: 1,
+      transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
+      stackParser: () => [],
+    });
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    const client = createMockNodeClient();
+    setCurrentClient(client);
+  });
+
+  afterEach(() => {
+    getCurrentScope().setClient(undefined);
+  });
+
+  it('calls `captureException` when an error occurs`', () => {
+    render(() => (
+      <SentryErrorBoundary fallback={<div>Ooops, an error occurred.</div>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(mockCaptureException).toHaveBeenCalledTimes(1);
+    expect(mockCaptureException).toHaveBeenLastCalledWith(new ReferenceError('NonExistentComponent is not defined'));
+  });
+
+  it('renders the fallback component', async () => {
+    const { findByText } = render(() => (
+      <SentryErrorBoundary fallback={<div>Ooops, an error occurred.</div>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(await findByText('Ooops, an error occurred.')).toBeInTheDocument();
+  });
+
+  it('passes the `error` and `reset` function to the fallback component', () => {
+    const mockFallback = vi.fn();
+
+    render(() => (
+      <SentryErrorBoundary fallback={mockFallback}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(mockFallback).toHaveBeenCalledTimes(1);
+    expect(mockFallback).toHaveBeenCalledWith(
+      new ReferenceError('NonExistentComponent is not defined'),
+      expect.any(Function),
+    );
+  });
+
+  it('calls `captureException` again after resetting', async () => {
+    const { findByRole } = render(() => (
+      <SentryErrorBoundary fallback={(_, reset) => <button onClick={reset}>Reset</button>}>
+        {/* @ts-expect-error: component doesn't exist on purpose */}
+        <NonExistentComponent />
+      </SentryErrorBoundary>
+    ));
+
+    expect(mockCaptureException).toHaveBeenCalledTimes(1);
+    expect(mockCaptureException).toHaveBeenNthCalledWith(1, new ReferenceError('NonExistentComponent is not defined'));
+
+    const button = await findByRole('button');
+    await user.click(button);
+
+    expect(mockCaptureException).toHaveBeenCalledTimes(2);
+    expect(mockCaptureException).toHaveBeenNthCalledWith(2, new ReferenceError('NonExistentComponent is not defined'));
+  });
+
+  it('renders children when there is no error', async () => {
+    const { queryByText } = render(() => (
+      <SentryErrorBoundary fallback={<div>Oops, an error occurred.</div>}>
+        <div>Adopt a cat</div>
+      </SentryErrorBoundary>
+    ));
+
+    expect(await queryByText('Adopt a cat')).toBeInTheDocument();
+    expect(await queryByText('Ooops, an error occurred')).not.toBeInTheDocument();
+  });
+});
diff --git a/packages/solidstart/test/server/sdk.test.ts b/packages/solidstart/test/server/sdk.test.ts
new file mode 100644
index 000000000000..ac610ad6dcd4
--- /dev/null
+++ b/packages/solidstart/test/server/sdk.test.ts
@@ -0,0 +1,42 @@
+import { SDK_VERSION } from '@sentry/node';
+import * as SentryNode from '@sentry/node';
+
+import { vi } from 'vitest';
+import { init as solidStartInit } from '../../src/server';
+
+const browserInit = vi.spyOn(SentryNode, 'init');
+
+describe('Initialize Solid Start SDK', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('has the correct metadata', () => {
+    const client = solidStartInit({
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+    });
+
+    const expectedMetadata = {
+      _metadata: {
+        sdk: {
+          name: 'sentry.javascript.solidstart',
+          packages: [
+            { name: 'npm:@sentry/solidstart', version: SDK_VERSION },
+            { name: 'npm:@sentry/node', version: SDK_VERSION },
+          ],
+          version: SDK_VERSION,
+        },
+      },
+    };
+
+    expect(client).not.toBeUndefined();
+    expect(browserInit).toHaveBeenCalledTimes(1);
+    expect(browserInit).toHaveBeenLastCalledWith(expect.objectContaining(expectedMetadata));
+  });
+
+  it('sets the runtime tag on the isolation scope', () => {
+    solidStartInit({ dsn: 'https://public@dsn.ingest.sentry.io/1337' });
+
+    expect(SentryNode.getIsolationScope().getScopeData().tags).toEqual({ runtime: 'node' });
+  });
+});
diff --git a/packages/solidstart/test/server/solidrouter.test.tsx b/packages/solidstart/test/server/solidrouter.test.tsx
new file mode 100644
index 000000000000..17b3f265a049
--- /dev/null
+++ b/packages/solidstart/test/server/solidrouter.test.tsx
@@ -0,0 +1,32 @@
+import type { MemoryHistory } from '@solidjs/router';
+import { MemoryRouter, Route, createMemoryHistory } from '@solidjs/router';
+import { render } from '@solidjs/testing-library';
+import { vi } from 'vitest';
+
+import { withSentryRouterRouting as withSentryClientRouterRouting } from '../../src/client/solidrouter';
+import { withSentryRouterRouting as withSentryServerRouterRouting } from '../../src/server/solidrouter';
+
+// solid router uses `window.scrollTo` when navigating
+vi.spyOn(global, 'scrollTo').mockImplementation(() => {});
+
+const renderRouter = (SentryRouter: typeof MemoryRouter, history: MemoryHistory) =>
+  render(() => (
+    <SentryRouter root={() => <div>Root</div>} history={history}>
+      <Route path="/" component={() => <div>Home</div>} />
+    </SentryRouter>
+  ));
+
+describe('withSentryRouterRouting', () => {
+  it('should render the same output as on client', () => {
+    const SentryClientRouter = withSentryClientRouterRouting(MemoryRouter);
+    const SentryServerRouter = withSentryServerRouterRouting(MemoryRouter);
+
+    const history = createMemoryHistory();
+    history.set({ value: '/' });
+
+    const { asFragment: asClientFragment } = renderRouter(SentryClientRouter, history);
+    const { asFragment: asServerFragment } = renderRouter(SentryServerRouter, history);
+
+    expect(asClientFragment()).toEqual(asServerFragment());
+  });
+});
diff --git a/packages/solidstart/test/tsconfig.json b/packages/solidstart/test/tsconfig.json
new file mode 100644
index 000000000000..38ca0b13bcdd
--- /dev/null
+++ b/packages/solidstart/test/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.test.json"
+}
diff --git a/packages/solidstart/tsconfig.json b/packages/solidstart/tsconfig.json
new file mode 100644
index 000000000000..b0eb9ecb6476
--- /dev/null
+++ b/packages/solidstart/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+
+  "include": ["src/**/*"],
+
+  "compilerOptions": {}
+}
diff --git a/packages/solidstart/tsconfig.solidrouter-types.json b/packages/solidstart/tsconfig.solidrouter-types.json
new file mode 100644
index 000000000000..f800d830c511
--- /dev/null
+++ b/packages/solidstart/tsconfig.solidrouter-types.json
@@ -0,0 +1,21 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "./"
+  },
+
+  // These types are built separately because they are for a subpath export, which has problems if they are not in the root
+  "include": [
+    "src/solidrouter.client.ts",
+    "src/client/solidrouter.ts",
+    "src/solidrouter.server.ts",
+    "src/server/solidrouter.ts",
+    "src/solidrouter.ts",
+  ],
+  // Without this, we cannot output into the root dir
+  "exclude": []
+}
diff --git a/packages/solidstart/tsconfig.test.json b/packages/solidstart/tsconfig.test.json
new file mode 100644
index 000000000000..51c6c9c9b8ea
--- /dev/null
+++ b/packages/solidstart/tsconfig.test.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+
+  "include": ["test/**/*", "vite.config.ts"],
+
+  "compilerOptions": {
+    // should include all types from `./tsconfig.json` plus types for all test frameworks used
+    "types": ["node", "vitest/globals", "vite/client", "@testing-library/jest-dom"],
+
+    // other package-specific, test-specific options
+    "jsx": "preserve",
+    "jsxImportSource": "solid-js"
+  }
+}
diff --git a/packages/solidstart/tsconfig.types.json b/packages/solidstart/tsconfig.types.json
new file mode 100644
index 000000000000..f7cc8c3d1610
--- /dev/null
+++ b/packages/solidstart/tsconfig.types.json
@@ -0,0 +1,19 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "build/types"
+  },
+
+  // These are built separately in tsconfig.solidrouter-types.json
+  "exclude": [
+    "src/solidrouter.client.ts",
+    "src/client/solidrouter.ts",
+    "src/solidrouter.server.ts",
+    "src/server/solidrouter.ts",
+    "src/solidrouter.ts"
+  ]
+}
diff --git a/packages/solidstart/vite.config.ts b/packages/solidstart/vite.config.ts
new file mode 100644
index 000000000000..1dfe27d70c66
--- /dev/null
+++ b/packages/solidstart/vite.config.ts
@@ -0,0 +1,14 @@
+import solidPlugin from 'vite-plugin-solid';
+import type { UserConfig } from 'vitest';
+import baseConfig from '../../vite/vite.config';
+
+export default {
+  ...baseConfig,
+  plugins: [solidPlugin({ hot: !process.env.VITEST })],
+  test: {
+    // test exists, no idea why TS doesn't recognize it
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ...(baseConfig as UserConfig & { test: any }).test,
+    environment: 'jsdom',
+  },
+};
diff --git a/scripts/node-unit-tests.ts b/scripts/node-unit-tests.ts
index 705a8370743f..233cb99b22b3 100644
--- a/scripts/node-unit-tests.ts
+++ b/scripts/node-unit-tests.ts
@@ -30,7 +30,14 @@ const DEFAULT_SKIP_TESTS_PACKAGES = [
 
 const SKIP_TEST_PACKAGES: Record<NodeVersion, VersionConfig> = {
   '14': {
-    ignoredPackages: ['@sentry/sveltekit', '@sentry/vercel-edge', '@sentry/astro', '@sentry/nuxt', '@sentry/nestjs'],
+    ignoredPackages: [
+      '@sentry/solidstart',
+      '@sentry/sveltekit',
+      '@sentry/vercel-edge',
+      '@sentry/astro',
+      '@sentry/nuxt',
+      '@sentry/nestjs',
+    ],
   },
   '16': {
     ignoredPackages: ['@sentry/vercel-edge', '@sentry/astro'],
diff --git a/yarn.lock b/yarn.lock
index 82b28afb55da..035d666481bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -283,7 +283,7 @@
   dependencies:
     tslib "^2.3.0"
 
-"@antfu/utils@^0.7.7", "@antfu/utils@^0.7.8":
+"@antfu/utils@^0.7.6", "@antfu/utils@^0.7.7", "@antfu/utils@^0.7.8":
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.7.8.tgz#86cb0974bcab7e64e29b57d6d9021102307257de"
   integrity sha512-rWQkqXRESdjXtc+7NRfK9lASQjpXJu1ayp7qi1d23zZorY+wBHVLHHoVcMsEnkqEBWTFqbztO7/QdJFzyEcLTg==
@@ -2083,7 +2083,7 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
-"@babel/parser@^7.22.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.6", "@babel/parser@^7.24.7":
+"@babel/parser@^7.22.16", "@babel/parser@^7.22.7", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.24.6", "@babel/parser@^7.24.7":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85"
   integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
@@ -3751,6 +3751,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.17", "@babel/types@^7.23.9", "@babel/types@^7.24.5", "@babel/types@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
+  integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.22.19", "@babel/types@^7.24.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
@@ -3769,15 +3778,6 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.23.9", "@babel/types@^7.24.5", "@babel/types@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
-  integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
-  dependencies:
-    "@babel/helper-string-parser" "^7.24.7"
-    "@babel/helper-validator-identifier" "^7.24.7"
-    to-fast-properties "^2.0.0"
-
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -7663,7 +7663,7 @@
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
-"@rollup/pluginutils@^5.0.2", "@rollup/pluginutils@^5.0.3", "@rollup/pluginutils@^5.0.4", "@rollup/pluginutils@^5.1.0":
+"@rollup/pluginutils@^5.0.2", "@rollup/pluginutils@^5.0.3", "@rollup/pluginutils@^5.0.4", "@rollup/pluginutils@^5.0.5", "@rollup/pluginutils@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0"
   integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==
@@ -7962,6 +7962,11 @@
   resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.16.0.tgz#c831713b85516fb3f9da2985836ddf444dc634e6"
   integrity sha512-+uy1qPkA5MSNgJ0L9ur/vNTydfdHwHnBX2RQ+0thsvkqf90fU788YjkkXwUiBBNuqNyI69JiOW6frixAWy7oUg==
 
+"@sentry/babel-plugin-component-annotate@2.19.0":
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.19.0.tgz#70dcccb336bcec24148e1c9cd4e37724cebf5673"
+  integrity sha512-N2k8cMYu/7X6mzAH5j6bMeNcXQBJLL0lVAF63TDS57hUiT1v2uEqbeYFdH2CZBHb2LepLbMRXmvErIwy76FLTw==
+
 "@sentry/babel-plugin-component-annotate@2.20.1":
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.20.1.tgz#204c63ed006a048f48f633876e1b8bacf87a9722"
@@ -7981,6 +7986,20 @@
     magic-string "0.27.0"
     unplugin "1.0.1"
 
+"@sentry/bundler-plugin-core@2.19.0":
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.19.0.tgz#c21935ff5aea9daccfa4c9e0db405aecdec292f6"
+  integrity sha512-PGTwpue2k4HnLlCuvLeg+cILPWHJorzheNq8KVlXed8mpb8kxKeY9EWQFxBqPS+XyktOMAxZmCMZfKdnHNaJVQ==
+  dependencies:
+    "@babel/core" "^7.18.5"
+    "@sentry/babel-plugin-component-annotate" "2.19.0"
+    "@sentry/cli" "^2.22.3"
+    dotenv "^16.3.1"
+    find-up "^5.0.0"
+    glob "^9.3.2"
+    magic-string "0.30.8"
+    unplugin "1.0.1"
+
 "@sentry/bundler-plugin-core@2.20.1":
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.20.1.tgz#c9dd35e2177a4c22ecf675558eb84fbc2607e465"
@@ -8049,6 +8068,14 @@
     "@sentry/cli-win32-i686" "2.32.1"
     "@sentry/cli-win32-x64" "2.32.1"
 
+"@sentry/vite-plugin@2.19.0":
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/vite-plugin/-/vite-plugin-2.19.0.tgz#c7938fb13eee15036963b87d7b12c4fc851e488b"
+  integrity sha512-xmntz/bvRwhhU9q2thZas1vQQch9CLMyD8oCfYlNqN57t5XKhIs2dsCU/uS7HCnxIXuuUb/cZtIS7AXVg16fFA==
+  dependencies:
+    "@sentry/bundler-plugin-core" "2.19.0"
+    unplugin "1.0.1"
+
 "@sentry/vite-plugin@2.20.1", "@sentry/vite-plugin@^2.20.1":
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/@sentry/vite-plugin/-/vite-plugin-2.20.1.tgz#80d5639fca3f68fbf81c316883272ffb34dbc544"
@@ -8711,6 +8738,27 @@
   resolved "https://registry.yarnpkg.com/@solidjs/router/-/router-0.13.6.tgz#210ca2761d4bf294f06ac0f9e25c16fafdabefac"
   integrity sha512-CdpFsBYoiJ/FQ4wZIamj3KEFRkmrYu5sVXM6PouNkmSENta1YJamsm9wa/VjaPmkw2RsnDnO0UvZ705v6EgOXQ==
 
+"@solidjs/start@^1.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@solidjs/start/-/start-1.0.2.tgz#b1585e61e1ad32ecdf7310da20932a83d108576c"
+  integrity sha512-SRoFvSnL47O1hg4/Er2es2AVoOWRdGBm0C8h2KsHFjbiRe1r2AxsONHR9job+Hmzbl5icSaGmNoXoQ8qpTy4UA==
+  dependencies:
+    "@vinxi/plugin-directives" "^0.3.1"
+    "@vinxi/server-components" "^0.3.3"
+    "@vinxi/server-functions" "^0.3.2"
+    defu "^6.1.2"
+    error-stack-parser "^2.1.4"
+    glob "^10.3.10"
+    html-to-image "^1.11.11"
+    radix3 "^1.1.0"
+    seroval "^1.0.2"
+    seroval-plugins "^1.0.2"
+    shikiji "^0.9.12"
+    source-map-js "^1.0.2"
+    terracotta "^1.0.4"
+    vite-plugin-inspect "^0.7.33"
+    vite-plugin-solid "^2.10.2"
+
 "@solidjs/testing-library@0.8.5":
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/@solidjs/testing-library/-/testing-library-0.8.5.tgz#97061b2286d8641bd43bf474e624c3bb47e486a6"
@@ -10253,6 +10301,47 @@
     node-gyp-build "^4.2.2"
     resolve-from "^5.0.0"
 
+"@vinxi/plugin-directives@0.3.1", "@vinxi/plugin-directives@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@vinxi/plugin-directives/-/plugin-directives-0.3.1.tgz#cac2edb51108c2fc1f29cceb32e71b02b19ac1a7"
+  integrity sha512-4qz5WifjmJ864VS8Ik9nUG0wAkt/xIcxFpP29RXogGLgccRnceBpWQi+ghw5rm0F6LP/YMAhhO5iFORXclWd0Q==
+  dependencies:
+    "@babel/parser" "^7.23.5"
+    acorn "^8.10.0"
+    acorn-jsx "^5.3.2"
+    acorn-loose "^8.3.0"
+    acorn-typescript "^1.4.3"
+    astring "^1.8.6"
+    magicast "^0.2.10"
+    recast "^0.23.4"
+    tslib "^2.6.2"
+
+"@vinxi/server-components@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@vinxi/server-components/-/server-components-0.3.3.tgz#22f8be3fd30ac9d44938c013150fadcbff8b2b16"
+  integrity sha512-xaW92nj9HUMLyswPcCmsIXOsS3TJll0m9u3WEjWjLrtZWheHggina6+kTCSeltp/Qe8WlUfNU5G02Xy8L4xQxA==
+  dependencies:
+    "@vinxi/plugin-directives" "0.3.1"
+    acorn "^8.10.0"
+    acorn-loose "^8.3.0"
+    acorn-typescript "^1.4.3"
+    astring "^1.8.6"
+    magicast "^0.2.10"
+    recast "^0.23.4"
+
+"@vinxi/server-functions@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@vinxi/server-functions/-/server-functions-0.3.3.tgz#a50c73d23d9f0b03586fe0cf3552a8b3229b23b1"
+  integrity sha512-yUrHov1gc+NM/YCEOekM1DCdu2tNSH1/j0mZPyIOhPZH/yAZKWA+t3dP79Q3g4QLDHchf6xf8z9u1INEADTlXw==
+  dependencies:
+    "@vinxi/plugin-directives" "0.3.1"
+    acorn "^8.10.0"
+    acorn-loose "^8.3.0"
+    acorn-typescript "^1.4.3"
+    astring "^1.8.6"
+    magicast "^0.2.10"
+    recast "^0.23.4"
+
 "@vitejs/plugin-vue-jsx@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-4.0.0.tgz#7bb65d57153ebf63b2e6ab0cc81029e82206036c"
@@ -11266,6 +11355,23 @@ acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+acorn-loose@^8.3.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/acorn-loose/-/acorn-loose-8.4.0.tgz#26d3e219756d1e180d006f5bcc8d261a28530f55"
+  integrity sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==
+  dependencies:
+    acorn "^8.11.0"
+
+acorn-typescript@^1.4.3:
+  version "1.4.13"
+  resolved "https://registry.yarnpkg.com/acorn-typescript/-/acorn-typescript-1.4.13.tgz#5f851c8bdda0aa716ffdd5f6ac084df8acc6f5ea"
+  integrity sha512-xsc9Xv0xlVfwp2o7sQ+GCQ1PgbkdcpWdTzrwXxO3xDMTAywVS3oXVOcOHuRjAPkS4P9b+yc/qNF15460v+jp4Q==
+
 acorn-walk@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
@@ -11281,7 +11387,7 @@ acorn-walk@^8.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@8.12.0, acorn@^8.6.0:
+acorn@8.12.0, acorn@^8.11.0, acorn@^8.6.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c"
   integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==
@@ -12042,6 +12148,11 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+astring@^1.8.6:
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.6.tgz#2c9c157cf1739d67561c56ba896e6948f6b93731"
+  integrity sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==
+
 astro@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/astro/-/astro-3.5.0.tgz#45f0852e9384dc997d4285b567c8a0ee89b58c9b"
@@ -12638,6 +12749,11 @@ before-after-hook@^2.2.0:
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
   integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
 
+big-integer@^1.6.44:
+  version "1.6.52"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85"
+  integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -12855,6 +12971,13 @@ boxen@^7.1.1:
     widest-line "^4.0.1"
     wrap-ansi "^8.1.0"
 
+bplist-parser@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
+  integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==
+  dependencies:
+    big-integer "^1.6.44"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -13602,6 +13725,13 @@ bun-types@latest:
   resolved "https://registry.yarnpkg.com/bun-types/-/bun-types-1.0.1.tgz#8bcb10ae3a1548a39f0932fdb365f4b3a649efba"
   integrity sha512-7NrXqhMIaNKmWn2dSWEQ50znMZqrN/5Z0NBMXvQTRu/+Y1CvoXRznFy0pnqLe024CeZgVdXoEpARNO1JZLAPGw==
 
+bundle-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a"
+  integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==
+  dependencies:
+    run-applescript "^5.0.0"
+
 bundle-name@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889"
@@ -15525,11 +15655,29 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+default-browser-id@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c"
+  integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==
+  dependencies:
+    bplist-parser "^0.2.0"
+    untildify "^4.0.0"
+
 default-browser-id@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26"
   integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==
 
+default-browser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da"
+  integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==
+  dependencies:
+    bundle-name "^3.0.0"
+    default-browser-id "^3.0.0"
+    execa "^7.1.1"
+    titleize "^3.0.0"
+
 default-browser@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf"
@@ -17095,6 +17243,13 @@ error-stack-parser-es@^0.1.1:
   resolved "https://registry.yarnpkg.com/error-stack-parser-es/-/error-stack-parser-es-0.1.4.tgz#b470e8fba110f70b8b39b748c985b436a6575659"
   integrity sha512-l0uy0kAoo6toCgVOYaAayqtPa2a1L15efxUMEnQebKwLQX2X0OpS6wMMQdc4juJXmxd9i40DuaUHq+mjIya9TQ==
 
+error-stack-parser@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
+  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
+  dependencies:
+    stackframe "^1.3.4"
+
 error@^7.0.0:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
@@ -18136,7 +18291,7 @@ execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@^7.2.0:
+execa@^7.1.1, execa@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
   integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
@@ -20469,6 +20624,11 @@ html-tags@^3.3.1:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
+html-to-image@^1.11.11:
+  version "1.11.11"
+  resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-1.11.11.tgz#c0f8a34dc9e4b97b93ff7ea286eb8562642ebbea"
+  integrity sha512-9gux8QhvjRO/erSnDPv28noDZcPZmYE7e1vFsBLKLlRlKDSqNJYebj6Qz1TGd5lsRV+X+xYyjCKjuZdABinWjA==
+
 html-void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-2.0.1.tgz#29459b8b05c200b6c5ee98743c41b979d577549f"
@@ -23697,6 +23857,15 @@ magicast@0.2.8:
     "@babel/types" "^7.21.5"
     recast "^0.23.2"
 
+magicast@^0.2.10:
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
+  integrity sha512-6saXbRDA1HMkqbsvHOU6HBjCVgZT460qheRkLhJQHWAbhXoWESI3Kn/dGGXyKs15FFKR85jsUqFx2sMK0wy/5g==
+  dependencies:
+    "@babel/parser" "^7.22.16"
+    "@babel/types" "^7.22.17"
+    recast "^0.23.4"
+
 magicast@^0.3.3, magicast@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.3.4.tgz#bbda1791d03190a24b00ff3dd18151e7fd381d19"
@@ -26469,6 +26638,16 @@ open@^8.0.9:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+open@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6"
+  integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==
+  dependencies:
+    default-browser "^4.0.0"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    is-wsl "^2.2.0"
+
 openapi-typescript@^6.7.5:
   version "6.7.6"
   resolved "https://registry.yarnpkg.com/openapi-typescript/-/openapi-typescript-6.7.6.tgz#4f387199203bd7bfb94545cbc613751b52e3fa37"
@@ -28703,7 +28882,7 @@ quote-unquote@^1.0.0:
   resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b"
   integrity sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==
 
-radix3@^1.1.2:
+radix3@^1.1.0, radix3@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.2.tgz#fd27d2af3896c6bf4bcdfab6427c69c2afc69ec0"
   integrity sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==
@@ -29118,6 +29297,17 @@ recast@^0.23.2:
     source-map "~0.6.1"
     tslib "^2.0.1"
 
+recast@^0.23.4:
+  version "0.23.9"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
+  integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
+  dependencies:
+    ast-types "^0.16.1"
+    esprima "~4.0.0"
+    source-map "~0.6.1"
+    tiny-invariant "^1.3.3"
+    tslib "^2.0.1"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -29980,6 +30170,13 @@ rsvp@~3.2.1:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
   integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
 
+run-applescript@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c"
+  integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==
+  dependencies:
+    execa "^5.0.0"
+
 run-applescript@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb"
@@ -30335,12 +30532,12 @@ serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-seroval-plugins@^1.0.3:
+seroval-plugins@^1.0.2, seroval-plugins@^1.0.3:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.0.7.tgz#c02511a1807e9bc8f68a91fbec13474fa9cea670"
   integrity sha512-GO7TkWvodGp6buMEX9p7tNyIkbwlyuAWbI6G9Ec5bhcm7mQdu3JOK1IXbEUwb3FVzSc363GraG/wLW23NSavIw==
 
-seroval@^1.0.4:
+seroval@^1.0.2, seroval@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.0.7.tgz#ee48ad8ba69f1595bdd5c55d1a0d1da29dee7455"
   integrity sha512-n6ZMQX5q0Vn19Zq7CIKNIo7E75gPkGCFUEqDpa8jgwpYr/vScjqnQ6H09t1uIiZ0ZSK0ypEGvrYK2bhBGWsGdw==
@@ -30521,6 +30718,11 @@ shiki@1.3.0:
   dependencies:
     "@shikijs/core" "1.3.0"
 
+shikiji-core@0.9.19:
+  version "0.9.19"
+  resolved "https://registry.yarnpkg.com/shikiji-core/-/shikiji-core-0.9.19.tgz#227975e998eb2a579cf83de30977762be3802507"
+  integrity sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==
+
 shikiji@^0.6.8:
   version "0.6.12"
   resolved "https://registry.yarnpkg.com/shikiji/-/shikiji-0.6.12.tgz#2cd28f32380337ef2117cdd5328f868a31e6c416"
@@ -30528,6 +30730,13 @@ shikiji@^0.6.8:
   dependencies:
     hast-util-to-html "^9.0.0"
 
+shikiji@^0.9.12:
+  version "0.9.19"
+  resolved "https://registry.yarnpkg.com/shikiji/-/shikiji-0.9.19.tgz#351a32b291a04cf9a6b69933f8044fe135b70f6f"
+  integrity sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==
+  dependencies:
+    shikiji-core "0.9.19"
+
 shimmer@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
@@ -30861,6 +31070,11 @@ solid-refresh@^0.6.3:
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/types" "^7.23.6"
 
+solid-use@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/solid-use/-/solid-use-0.8.0.tgz#d46258c45edb0f4c621285e0ad1aa6b6a674d79b"
+  integrity sha512-YX+XmcKLvSx3bwMimMhFy40ZkDnShnUcEw6cW6fSscwKEgl1TG3GlgAvkBmQ3AeWjvQSd8+HGTr82ImsrjkkqA==
+
 sorcery@0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/sorcery/-/sorcery-0.11.0.tgz#310c80ee993433854bb55bb9aa4003acd147fca8"
@@ -31210,6 +31424,11 @@ stackback@0.0.2:
   resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
   integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
 
+stackframe@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
+  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
+
 stacktrace-parser@^0.1.10:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a"
@@ -31986,6 +32205,13 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
+terracotta@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/terracotta/-/terracotta-1.0.5.tgz#633d3aa630f686f383e2577d156c14d261f7eb4c"
+  integrity sha512-4jkpXGKemeWjsBGDoBK1tnovGfIEMM8+Fa99T0TD4VYUaZq6hXHEWMfHshxy1h+DzsanDAwSBIBM0NnOohzijw==
+  dependencies:
+    solid-use "^0.8.0"
+
 terser-webpack-plugin@^1.4.3:
   version "1.4.5"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
@@ -32200,7 +32426,7 @@ tiny-invariant@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
   integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
 
-tiny-invariant@^1.1.0:
+tiny-invariant@^1.1.0, tiny-invariant@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
   integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
@@ -32237,6 +32463,11 @@ tinyspy@^2.2.0:
   resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.2.1.tgz#117b2342f1f38a0dbdcc73a50a454883adf861d1"
   integrity sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==
 
+titleize@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53"
+  integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==
+
 tmp-promise@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
@@ -33212,6 +33443,11 @@ untildify@^2.1.0:
   dependencies:
     os-homedir "^1.0.0"
 
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
 untun@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/untun/-/untun-0.1.3.tgz#5d10dee37a3a5737ff03d158be877dae0a0e58a6"
@@ -33634,6 +33870,20 @@ vite-plugin-checker@^0.6.4:
     vscode-languageserver-textdocument "^1.0.1"
     vscode-uri "^3.0.2"
 
+vite-plugin-inspect@^0.7.33:
+  version "0.7.42"
+  resolved "https://registry.yarnpkg.com/vite-plugin-inspect/-/vite-plugin-inspect-0.7.42.tgz#e055ad2ff82f3eca2f101fcfb29b5fabfe1e7366"
+  integrity sha512-JCyX86wr3siQc+p9Kd0t8VkFHAJag0RaQVIpdFGSv5FEaePEVB6+V/RGtz2dQkkGSXQzRWrPs4cU3dRKg32bXw==
+  dependencies:
+    "@antfu/utils" "^0.7.6"
+    "@rollup/pluginutils" "^5.0.5"
+    debug "^4.3.4"
+    error-stack-parser-es "^0.1.1"
+    fs-extra "^11.1.1"
+    open "^9.1.0"
+    picocolors "^1.0.0"
+    sirv "^2.0.3"
+
 vite-plugin-inspect@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/vite-plugin-inspect/-/vite-plugin-inspect-0.8.4.tgz#1fcdf6703164d651db3f13c8c6610e1ced5108e1"
@@ -33649,7 +33899,7 @@ vite-plugin-inspect@^0.8.4:
     picocolors "^1.0.0"
     sirv "^2.0.4"
 
-vite-plugin-solid@^2.8.2:
+vite-plugin-solid@^2.10.2, vite-plugin-solid@^2.8.2:
   version "2.10.2"
   resolved "https://registry.yarnpkg.com/vite-plugin-solid/-/vite-plugin-solid-2.10.2.tgz#180f5ec9d8ac03d19160dd5728b313fe9b62ee0d"
   integrity sha512-AOEtwMe2baBSXMXdo+BUwECC8IFHcKS6WQV/1NEd+Q7vHPap5fmIhLcAzr+DUJ04/KHx/1UBU0l1/GWP+rMAPQ==

From 0c1e8775721151e4c8f9e583b6ce1fbf0b37c0ab Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Wed, 3 Jul 2024 09:01:19 +0200
Subject: [PATCH 24/30] build: Bump yarn to `1.22.22` and pnpm to `9.4.0`
 (#12731)

This is just used internally, but we may as well be up to date there.
---
 dev-packages/e2e-tests/package.json | 2 +-
 package.json                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index 97c7cb927857..a37c23a7b4bf 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -27,6 +27,6 @@
   },
   "volta": {
     "extends": "../../package.json",
-    "pnpm": "8.15.8"
+    "pnpm": "9.4.0"
   }
 }
diff --git a/package.json b/package.json
index e4427db47729..a77d4f3a4202 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   },
   "volta": {
     "node": "18.20.3",
-    "yarn": "1.22.19"
+    "yarn": "1.22.22"
   },
   "workspaces": [
     "packages/angular",

From d5bba5876b1b6a941aa46bc9b5e6287a55e4a832 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Wed, 3 Jul 2024 11:50:31 +0200
Subject: [PATCH 25/30] feat(opentelemetry): Expose sampling helper (#12674)

When users want to use a custom sampler, they can use these new helpers
to still have sentry working nicely with whatever they decide to do in
there.

For e.g. trace propagation etc. to work correctly with Sentry, we need
to attach some things to trace state etc. These helpers encapsulate this
for the user, while still allowing them to decide however they want if
the span should be sampled or not.

This was brought up here:
https://github.com/getsentry/sentry-javascript/discussions/12191#discussioncomment-9892777
---
 packages/opentelemetry/src/index.ts   |  5 +-
 packages/opentelemetry/src/sampler.ts | 67 +++++++++++++++++++--------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/packages/opentelemetry/src/index.ts b/packages/opentelemetry/src/index.ts
index 5e99f7eb8c33..e262247bce1e 100644
--- a/packages/opentelemetry/src/index.ts
+++ b/packages/opentelemetry/src/index.ts
@@ -36,7 +36,10 @@ export { setOpenTelemetryContextAsyncContextStrategy } from './asyncContextStrat
 export { wrapContextManagerClass } from './contextManager';
 export { SentryPropagator } from './propagator';
 export { SentrySpanProcessor } from './spanProcessor';
-export { SentrySampler } from './sampler';
+export {
+  SentrySampler,
+  wrapSamplingDecision,
+} from './sampler';
 
 export { openTelemetrySetupCheck } from './utils/setupCheck';
 
diff --git a/packages/opentelemetry/src/sampler.ts b/packages/opentelemetry/src/sampler.ts
index 96342503e72a..0a7d2f9af972 100644
--- a/packages/opentelemetry/src/sampler.ts
+++ b/packages/opentelemetry/src/sampler.ts
@@ -1,4 +1,4 @@
-import type { Attributes, Context, Span } from '@opentelemetry/api';
+import type { Attributes, Context, Span, TraceState as TraceStateInterface } from '@opentelemetry/api';
 import { SpanKind } from '@opentelemetry/api';
 import { isSpanContextValid, trace } from '@opentelemetry/api';
 import { TraceState } from '@opentelemetry/core';
@@ -40,16 +40,8 @@ export class SentrySampler implements Sampler {
     const parentSpan = trace.getSpan(context);
     const parentContext = parentSpan?.spanContext();
 
-    let traceState = parentContext?.traceState || new TraceState();
-
-    // We always keep the URL on the trace state, so we can access it in the propagator
-    const url = spanAttributes[SEMATTRS_HTTP_URL];
-    if (url && typeof url === 'string') {
-      traceState = traceState.set(SENTRY_TRACE_STATE_URL, url);
-    }
-
     if (!hasTracingEnabled(options)) {
-      return { decision: SamplingDecision.NOT_RECORD, traceState };
+      return wrapSamplingDecision({ decision: undefined, context, spanAttributes });
     }
 
     // If we have a http.client span that has no local parent, we never want to sample it
@@ -59,7 +51,7 @@ export class SentrySampler implements Sampler {
       spanAttributes[SEMATTRS_HTTP_METHOD] &&
       (!parentSpan || parentContext?.isRemote)
     ) {
-      return { decision: SamplingDecision.NOT_RECORD, traceState };
+      return wrapSamplingDecision({ decision: undefined, context, spanAttributes });
     }
 
     const parentSampled = parentSpan ? getParentSampled(parentSpan, traceId, spanName) : undefined;
@@ -76,7 +68,7 @@ export class SentrySampler implements Sampler {
       mutableSamplingDecision,
     );
     if (!mutableSamplingDecision.decision) {
-      return { decision: SamplingDecision.NOT_RECORD, traceState: traceState };
+      return wrapSamplingDecision({ decision: undefined, context, spanAttributes });
     }
 
     const [sampled, sampleRate] = sampleSpan(options, {
@@ -96,25 +88,22 @@ export class SentrySampler implements Sampler {
     const method = `${spanAttributes[SEMATTRS_HTTP_METHOD]}`.toUpperCase();
     if (method === 'OPTIONS' || method === 'HEAD') {
       DEBUG_BUILD && logger.log(`[Tracing] Not sampling span because HTTP method is '${method}' for ${spanName}`);
+
       return {
-        decision: SamplingDecision.NOT_RECORD,
+        ...wrapSamplingDecision({ decision: SamplingDecision.NOT_RECORD, context, spanAttributes }),
         attributes,
-        traceState: traceState.set(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, '1'),
       };
     }
 
     if (!sampled) {
       return {
-        decision: SamplingDecision.NOT_RECORD,
+        ...wrapSamplingDecision({ decision: SamplingDecision.NOT_RECORD, context, spanAttributes }),
         attributes,
-        traceState: traceState.set(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, '1'),
       };
     }
-
     return {
-      decision: SamplingDecision.RECORD_AND_SAMPLED,
+      ...wrapSamplingDecision({ decision: SamplingDecision.RECORD_AND_SAMPLED, context, spanAttributes }),
       attributes,
-      traceState,
     };
   }
 
@@ -152,3 +141,43 @@ function getParentSampled(parentSpan: Span, traceId: string, spanName: string):
 
   return undefined;
 }
+
+/**
+ * Wrap a sampling decision with data that Sentry needs to work properly with it.
+ * If you pass `decision: undefined`, it will be treated as `NOT_RECORDING`, but in contrast to passing `NOT_RECORDING`
+ * it will not propagate this decision to downstream Sentry SDKs.
+ */
+export function wrapSamplingDecision({
+  decision,
+  context,
+  spanAttributes,
+}: { decision: SamplingDecision | undefined; context: Context; spanAttributes: SpanAttributes }): SamplingResult {
+  const traceState = getBaseTraceState(context, spanAttributes);
+
+  // If the decision is undefined, we treat it as NOT_RECORDING, but we don't propagate this decision to downstream SDKs
+  // Which is done by not setting `SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING` traceState
+  if (decision == undefined) {
+    return { decision: SamplingDecision.NOT_RECORD, traceState };
+  }
+
+  if (decision === SamplingDecision.NOT_RECORD) {
+    return { decision, traceState: traceState.set(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, '1') };
+  }
+
+  return { decision, traceState };
+}
+
+function getBaseTraceState(context: Context, spanAttributes: SpanAttributes): TraceStateInterface {
+  const parentSpan = trace.getSpan(context);
+  const parentContext = parentSpan?.spanContext();
+
+  let traceState = parentContext?.traceState || new TraceState();
+
+  // We always keep the URL on the trace state, so we can access it in the propagator
+  const url = spanAttributes[SEMATTRS_HTTP_URL];
+  if (url && typeof url === 'string') {
+    traceState = traceState.set(SENTRY_TRACE_STATE_URL, url);
+  }
+
+  return traceState;
+}

From a8c4db8c7d7d26df99e32861c1cb960406d73485 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Wed, 3 Jul 2024 15:55:12 +0200
Subject: [PATCH 26/30] Revert "fix(remix): add esm export for node" (#12742)

---
 packages/remix/package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index 8e4e450d966b..5a5bca033904 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -28,9 +28,6 @@
         "import": "./build/esm/index.client.js",
         "require": "./build/cjs/index.client.js"
       },
-      "import": {
-        "default": "./build/esm/index.server.js"
-      },
       "node": "./build/cjs/index.server.js"
     },
     "./import": {

From 071adae8627ac63639b1a1c18a7fd039c1de7a95 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Wed, 3 Jul 2024 17:15:29 +0200
Subject: [PATCH 27/30] fix(react): Fix React jsx runtime import for esm
 (#12740)

---
 dev-packages/rollup-utils/npmHelpers.mjs          |  8 ++++++--
 .../rollup-utils/plugins/make-esm-plugin.mjs      | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dev-packages/rollup-utils/npmHelpers.mjs b/dev-packages/rollup-utils/npmHelpers.mjs
index 5be51096cf75..e95e63700c09 100644
--- a/dev-packages/rollup-utils/npmHelpers.mjs
+++ b/dev-packages/rollup-utils/npmHelpers.mjs
@@ -22,7 +22,7 @@ import {
   makeSetSDKSourcePlugin,
   makeSucrasePlugin,
 } from './plugins/index.mjs';
-import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
+import { makePackageNodeEsm, makeReactEsmJsxRuntimePlugin } from './plugins/make-esm-plugin.mjs';
 import { mergePlugins } from './utils.mjs';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -140,7 +140,11 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
 
   if (emitEsm) {
     variantSpecificConfigs.push({
-      output: { format: 'esm', dir: path.join(baseConfig.output.dir, 'esm'), plugins: [makePackageNodeEsm()] },
+      output: {
+        format: 'esm',
+        dir: path.join(baseConfig.output.dir, 'esm'),
+        plugins: [makePackageNodeEsm(), makeReactEsmJsxRuntimePlugin()],
+      },
     });
   }
 
diff --git a/dev-packages/rollup-utils/plugins/make-esm-plugin.mjs b/dev-packages/rollup-utils/plugins/make-esm-plugin.mjs
index 04dd68beaa1c..91aba689f888 100644
--- a/dev-packages/rollup-utils/plugins/make-esm-plugin.mjs
+++ b/dev-packages/rollup-utils/plugins/make-esm-plugin.mjs
@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import replacePlugin from '@rollup/plugin-replace';
 
 /**
  * Outputs a package.json file with {type: module} in the root of the output directory so that Node
@@ -29,3 +30,17 @@ export function makePackageNodeEsm() {
     },
   };
 }
+
+/**
+ * Makes sure that whenever we add an `react/jsx-runtime` import, we add a `.js` to make the import esm compatible.
+ */
+export function makeReactEsmJsxRuntimePlugin() {
+  return replacePlugin({
+    preventAssignment: false,
+    sourceMap: true,
+    values: {
+      "'react/jsx-runtime'": "'react/jsx-runtime.js'",
+      '"react/jsx-runtime"': '"react/jsx-runtime.js"',
+    },
+  });
+}

From 13ff71f8adfbdfe3de0f9e50ff59f5ebbfa131f9 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 3 Jul 2024 11:23:16 -0400
Subject: [PATCH 28/30] docs: Add note to changelog linking migration guide
 (#12735)

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46cc4f96f2c5..6fcff88d639f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+> [!IMPORTANT]  
+> If you are upgrading to the `8.x` versions of the SDK from `7.x` or below, make sure you follow our
+> [migration guide](https://docs.sentry.io/platforms/javascript/migration/) first.
+
 ## Unreleased
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

From 8fe0682acd40a04e3038ecc21ad8c455fcaa15ea Mon Sep 17 00:00:00 2001
From: nicohrubec <nico.hrubec@sentry.io>
Date: Thu, 4 Jul 2024 09:57:04 +0200
Subject: [PATCH 29/30] meta(changelog): Update changelog for 8.14.0

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fcff88d639f..4602f8b8c894 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,27 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 8.14.0
+
+### Important Changes
+
+- **feat(nestjs): Filter 4xx errors (#12695)**
+
+The `@sentry/nestjs` SDK no longer captures 4xx errors automatically.
+
+### Other Changes
+
+- chore(react): Remove private namespace `JSX` (#12691)
+- feat(deps): bump @opentelemetry/propagator-aws-xray from 1.25.0 to 1.25.1 (#12719)
+- feat(deps): bump @prisma/instrumentation from 5.16.0 to 5.16.1 (#12718)
+- feat(node): Add `registerEsmLoaderHooks` option (#12684)
+- feat(opentelemetry): Expose sampling helper (#12674)
+- fix(browser): Make sure measure spans have valid start timestamps (#12648)
+- fix(hapi): Widen type definitions (#12710)
+- fix(nextjs): Attempt to ignore critical dependency warnings (#12694)
+- fix(react): Fix React jsx runtime import for esm (#12740)
+- fix(replay): Start replay in `afterAllSetup` instead of next tick (#12709)
+
 ## 8.13.0
 
 ### Important Changes

From 869a0d2c34153e53c03cd3077632e3687a282e88 Mon Sep 17 00:00:00 2001
From: nicohrubec <nico.hrubec@sentry.io>
Date: Thu, 4 Jul 2024 10:00:05 +0200
Subject: [PATCH 30/30] Add external contributor

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4602f8b8c894..469cb8258063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@ The `@sentry/nestjs` SDK no longer captures 4xx errors automatically.
 - fix(react): Fix React jsx runtime import for esm (#12740)
 - fix(replay): Start replay in `afterAllSetup` instead of next tick (#12709)
 
+Work in this release was contributed by @quisido. Thank you for your contribution!
+
 ## 8.13.0
 
 ### Important Changes