feat(react-router): support react router v8

CHANGELOG.md

@@ -4,6 +4,21 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+- **feat(react): Add version-agnostic React Router SPA exports ([#21633](https://github.com/getsentry/sentry-javascript/pull/21633))**
+
+  `@sentry/react` now exports version-agnostic wrappers for React Router v6+ SPA instrumentation.
+  The new exports replace the version-specific `V6`/`V7` variants, which are now deprecated:
+
+  | Deprecated                                      | New                                    |
+  | ----------------------------------------------- | -------------------------------------- |
+  | `reactRouterV6BrowserTracingIntegration` / `V7` | `reactRouterBrowserTracingIntegration` |
+  | `withSentryReactRouterV6Routing` / `V7`         | `wrapReactRouterRouting`               |
+  | `wrapCreateBrowserRouterV6` / `V7`              | `wrapCreateBrowserRouter`              |
+  | `wrapCreateMemoryRouterV6` / `V7`               | `wrapCreateMemoryRouter`               |
+  | `wrapUseRoutesV6` / `V7`                        | `wrapUseRoutes`                        |
+
+  The deprecated exports continue to work and will be removed in the next major version.
+
 ## 10.58.0
 
 ### Important Changes

dev-packages/e2e-tests/test-applications/react-router-6-use-routes/src/index.tsx

@@ -18,7 +18,7 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.REACT_APP_E2E_TEST_DSN,
   integrations: [
-    Sentry.reactRouterV6BrowserTracingIntegration({
+    Sentry.reactRouterBrowserTracingIntegration({
       useEffect: React.useEffect,
       useLocation,
       useNavigationType,
@@ -39,7 +39,7 @@ Sentry.init({
   tunnel: 'http://localhost:3031', // proxy server
 });
 
-const useSentryRoutes = Sentry.wrapUseRoutesV6(useRoutes);
+const useSentryRoutes = Sentry.wrapUseRoutes(useRoutes);
 
 function App() {
   return useSentryRoutes([

dev-packages/e2e-tests/test-applications/react-router-6-use-routes/tests/transactions.test.ts

@@ -14,7 +14,7 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
     contexts: {
       trace: {
         op: 'pageload',
-        origin: 'auto.pageload.react.reactrouter_v6',
+        origin: 'auto.pageload.react.reactrouter',
       },
     },
     transaction: '/',
@@ -45,7 +45,7 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
     contexts: {
       trace: {
         op: 'navigation',
-        origin: 'auto.navigation.react.reactrouter_v6',
+        origin: 'auto.navigation.react.reactrouter',
       },
     },
     transaction: '/user/:id',

dev-packages/e2e-tests/test-applications/react-router-7-cross-usage/src/index.tsx

@@ -21,7 +21,7 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.REACT_APP_E2E_TEST_DSN,
   integrations: [
-    Sentry.reactRouterV7BrowserTracingIntegration({
+    Sentry.reactRouterBrowserTracingIntegration({
       useEffect: React.useEffect,
       useLocation,
       useNavigationType,
@@ -43,9 +43,9 @@ Sentry.init({
   tunnel: 'http://localhost:3031',
 });
 
-const SentryRoutes = Sentry.withSentryReactRouterV7Routing(Routes);
-const sentryUseRoutes = Sentry.wrapUseRoutesV7(useRoutes);
-const sentryCreateBrowserRouter = Sentry.wrapCreateBrowserRouterV7(createBrowserRouter);
+const SentryRoutes = Sentry.wrapReactRouterRouting(Routes);
+const sentryUseRoutes = Sentry.wrapUseRoutes(useRoutes);
+const sentryCreateBrowserRouter = Sentry.wrapCreateBrowserRouter(createBrowserRouter);
 
 const DetailsRoutes = () =>
   sentryUseRoutes([

dev-packages/e2e-tests/test-applications/react-router-7-cross-usage/tests/transactions.test.ts

@@ -15,7 +15,7 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
     contexts: {
       trace: {
         op: 'pageload',
-        origin: 'auto.pageload.react.reactrouter_v7',
+        origin: 'auto.pageload.react.reactrouter',
       },
     },
     transaction: '/projects/:projectId/views/:viewId/:detailId',
@@ -39,7 +39,7 @@ test('sends a pageload transaction with a parameterized URL - alternative route'
     contexts: {
       trace: {
         op: 'pageload',
-        origin: 'auto.pageload.react.reactrouter_v7',
+        origin: 'auto.pageload.react.reactrouter',
       },
     },
     transaction: '/projects/:projectId/old-views/:viewId/:detailId',
@@ -65,7 +65,7 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
     contexts: {
       trace: {
         op: 'pageload',
-        origin: 'auto.pageload.react.reactrouter_v7',
+        origin: 'auto.pageload.react.reactrouter',
       },
     },
     transaction: '/',
@@ -83,7 +83,7 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
     contexts: {
       trace: {
         op: 'navigation',
-        origin: 'auto.navigation.react.reactrouter_v7',
+        origin: 'auto.navigation.react.reactrouter',
       },
     },
     transaction: '/projects/:projectId/views/:viewId/:detailId',
@@ -109,7 +109,7 @@ test('sends a navigation transaction with a parameterized URL - alternative rout
     contexts: {
       trace: {
         op: 'pageload',
-        origin: 'auto.pageload.react.reactrouter_v7',
+        origin: 'auto.pageload.react.reactrouter',
       },
     },
     transaction: '/',
@@ -127,7 +127,7 @@ test('sends a navigation transaction with a parameterized URL - alternative rout
     contexts: {
       trace: {
         op: 'navigation',
-        origin: 'auto.navigation.react.reactrouter_v7',
+        origin: 'auto.navigation.react.reactrouter',
       },
     },
     transaction: '/projects/:projectId/old-views/:viewId/:detailId',

dev-packages/e2e-tests/test-applications/react-router-7-spa/src/main.tsx

@@ -21,7 +21,7 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: import.meta.env.PUBLIC_E2E_TEST_DSN,
   integrations: [
-    Sentry.reactRouterV7BrowserTracingIntegration({
+    Sentry.reactRouterBrowserTracingIntegration({
       useEffect: React.useEffect,
       useLocation,
       useNavigationType,
@@ -43,7 +43,7 @@ Sentry.init({
   dataCollection: { userInfo: true },
 });
 
-const SentryRoutes = Sentry.withSentryReactRouterV7Routing(Routes);
+const SentryRoutes = Sentry.wrapReactRouterRouting(Routes);
 
 const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
 root.render(

dev-packages/e2e-tests/test-applications/react-router-7-spa/tests/transactions.test.ts

@@ -14,7 +14,7 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
     contexts: {
       trace: {
         op: 'pageload',
-        origin: 'auto.pageload.react.reactrouter_v7',
+        origin: 'auto.pageload.react.reactrouter',
       },
     },
     transaction: '/',
@@ -45,7 +45,7 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
     contexts: {
       trace: {
         op: 'navigation',
-        origin: 'auto.navigation.react.reactrouter_v7',
+        origin: 'auto.navigation.react.reactrouter',
       },
     },
     transaction: '/user/:id',

dev-packages/e2e-tests/test-applications/react-router-8-cross-usage/.gitignore

@@ -0,0 +1,29 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+/test-results/
+/playwright-report/
+/playwright/.cache/
+
+!*.d.ts

dev-packages/e2e-tests/test-applications/react-router-8-cross-usage/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "react-router-8-cross-usage",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@sentry/react": "file:../../packed/sentry-react-packed.tgz",
+    "@types/react": "19.2.17",
+    "@types/react-dom": "19.2.3",
+    "express": "^4.21.2",
+    "react": "19.2.7",
+    "react-dom": "19.2.7",
+    "react-router": "^8.0.0",
+    "react-scripts": "5.0.1",
+    "typescript": "^5.6.3"
+  },
+  "scripts": {
+    "build": "react-scripts build",
+    "start": "serve -s build",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install && npx playwright install && pnpm build",
+    "test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && npx playwright install && pnpm build",
+    "test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && npx playwright install && pnpm build",
+    "test:assert": "pnpm test"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.56.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "serve": "14.0.1",
+    "npm-run-all2": "^6.2.0"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}

dev-packages/e2e-tests/test-applications/react-router-8-cross-usage/playwright.config.mjs

@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/react-router-8-cross-usage/public/index.html

@@ -0,0 +1,24 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta name="description" content="Web site created using create-react-app" />
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

dev-packages/e2e-tests/test-applications/react-router-8-cross-usage/src/globals.d.ts

@@ -0,0 +1,5 @@
+interface Window {
+  recordedTransactions?: string[];
+  capturedExceptionId?: string;
+  sentryReplayId?: string;
+}