Remove isAlreadyCaptured, clean up RSC tests and E2E app

onurtemizkan · onurtemizkan · commit e082621b32a5 · 2026-02-19T19:39:29.000Z
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/.gitignore b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/.gitignore
@@ -3,6 +3,7 @@ node_modules
 /.cache
 /build
 .env
+.react-router
 
 /test-results/
 /playwright-report/
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/README.md b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/README.md
@@ -2,4 +2,4 @@
 
 E2E test app for React Router 7 RSC (React Server Components) and `@sentry/react-router`.
 
-**Note:** Skipped in CI (`sentryTest.skip: true`) - React Router's RSC Framework Mode is experimental.
+**Note:** Marked as `optional` in CI (`sentryTest.optional: true`) - React Router's RSC Framework Mode is experimental.
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/app.css b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/app.css
@@ -1,47 +1,6 @@
-* {
-  box-sizing: border-box;
-}
-
+html,
 body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
-  margin: 0;
-  padding: 20px;
-  line-height: 1.6;
-}
-
-h1 {
-  margin-top: 0;
-}
-
-nav {
-  margin-bottom: 20px;
-}
-
-nav ul {
-  list-style: none;
-  padding: 0;
-  display: flex;
-  gap: 20px;
-}
-
-nav a {
-  color: #0066cc;
-  text-decoration: none;
-}
-
-nav a:hover {
-  text-decoration: underline;
-}
-
-button {
-  padding: 8px 16px;
-  font-size: 14px;
-  cursor: pointer;
-}
-
-.error {
-  color: #cc0000;
-  background: #ffeeee;
-  padding: 10px;
-  border-radius: 4px;
+  @media (prefers-color-scheme: dark) {
+    color-scheme: dark;
+  }
 }
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/root.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/root.tsx
@@ -19,7 +19,6 @@ export function Layout({ children }: { children: React.ReactNode }) {
         <SentryClient />
         {children}
         <ScrollRestoration />
-        {/* <Scripts /> is not needed in RSC mode - scripts are injected by the RSC framework */}
       </body>
     </html>
   );
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/actions.ts b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/actions.ts
@@ -3,7 +3,6 @@
 export async function submitForm(formData: FormData): Promise<{ success: boolean; message: string }> {
   const name = formData.get('name') as string;
 
-  // Simulate some async work
   await new Promise(resolve => setTimeout(resolve, 50));
 
   return {
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-component-async.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-component-async.tsx
@@ -1,5 +1,4 @@
 import { wrapServerComponent } from '@sentry/react-router';
-import type { Route } from './+types/server-component-async';
 
 async function fetchData(): Promise<{ title: string; content: string }> {
   await new Promise(resolve => setTimeout(resolve, 50));
@@ -9,7 +8,7 @@ async function fetchData(): Promise<{ title: string; content: string }> {
   };
 }
 
-async function AsyncServerComponent(_props: Route.ComponentProps) {
+async function AsyncServerComponent() {
   const data = await fetchData();
 
   return (
@@ -24,8 +23,3 @@ export default wrapServerComponent(AsyncServerComponent, {
   componentRoute: '/rsc/server-component-async',
   componentType: 'Page',
 });
-
-export async function loader() {
-  const data = await fetchData();
-  return data;
-}
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-component.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-component.tsx
@@ -7,7 +7,6 @@ async function ServerComponent({ loaderData }: Route.ComponentProps) {
   return (
     <main>
       <h1>Server Component</h1>
-      <p>This demonstrates a manually wrapped server component.</p>
       <p data-testid="loader-message">Message: {loaderData?.message ?? 'No loader data'}</p>
     </main>
   );
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function-arrow.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function-arrow.tsx
@@ -13,8 +13,6 @@ export default function ServerFunctionArrowPage() {
   return (
     <main>
       <h1>Server Function Arrow Test</h1>
-      <p>This tests export const arrow function wrapping.</p>
-
       <Form method="post">
         <label htmlFor="name">Name:</label>
         <input type="text" id="name" name="name" defaultValue="Arrow User" />
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function-default.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function-default.tsx
@@ -13,8 +13,6 @@ export default function ServerFunctionDefaultPage() {
   return (
     <main>
       <h1>Server Function Default Export Test</h1>
-      <p>This tests "use server" files with only a default export.</p>
-
       <Form method="post">
         <label htmlFor="name">Name:</label>
         <input type="text" id="name" name="name" defaultValue="Default User" />
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function-error.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function-error.tsx
@@ -13,8 +13,6 @@ export default function ServerFunctionErrorPage() {
   return (
     <main>
       <h1>Server Function Error Test</h1>
-      <p>This page tests error capture in wrapServerFunction.</p>
-
       <Form method="post">
         <input type="hidden" name="trigger" value="error" />
         <button type="submit" id="submit">
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/routes/rsc/server-function.tsx
@@ -13,8 +13,6 @@ export default function ServerFunctionPage() {
   return (
     <main>
       <h1>Server Function Test</h1>
-      <p>This page tests wrapServerFunction instrumentation.</p>
-
       <Form method="post">
         <label htmlFor="name">Name:</label>
         <input type="text" id="name" name="name" defaultValue="Sentry User" />
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/sentry-client.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/app/sentry-client.tsx
@@ -18,13 +18,7 @@ export function SentryClient() {
           });
         }
       })
-      .catch(e => {
-        // Silent fail in production, but log in dev for debugging
-        if (import.meta.env.DEV) {
-          // eslint-disable-next-line no-console
-          console.warn('[Sentry] Failed to initialize:', e);
-        }
-      });
+      .catch(() => undefined);
   }, []);
 
   return null;
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/instrument.mjs b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/instrument.mjs
@@ -5,5 +5,4 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   tracesSampleRate: 1.0,
   tunnel: `http://localhost:3031/`, // proxy server
-  debug: true,
 });
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/package.json
@@ -17,7 +17,6 @@
     "@types/react-dom": "19.1.0",
     "@types/node": "^22",
     "@react-router/dev": "7.12.0",
-    "@vitejs/plugin-react": "4.5.1",
     "@vitejs/plugin-rsc": "0.5.14",
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-rsc/vite.config.ts b/dev-packages/e2e-tests/test-applications/react-router-7-rsc/vite.config.ts
@@ -5,8 +5,6 @@ import { defineConfig } from 'vite';
 
 export default defineConfig(async env => ({
   plugins: [...(await sentryReactRouter({}, env)), unstable_reactRouterRSC(), rsc()],
-  // Exclude chokidar from RSC bundling - it's a CommonJS file watcher
-  // that causes parse errors when the RSC plugin tries to process it
   optimizeDeps: {
     exclude: ['chokidar'],
   },
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
@@ -45,7 +45,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@babel/parser": "7.26.9",
+    "@babel/parser": "^7.26.9",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.5.0",
     "@opentelemetry/instrumentation": "^0.211.0",
@@ -57,7 +57,7 @@
     "@sentry/react": "10.39.0",
     "@sentry/vite-plugin": "^4.8.0",
     "glob": "^13.0.1",
-    "recast": "0.23.11"
+    "recast": "^0.23.11"
   },
   "devDependencies": {
     "@react-router/dev": "^7.13.0",
diff --git a/packages/react-router/src/client/index.ts b/packages/react-router/src/client/index.ts
@@ -1,6 +1,8 @@
 // import/export got a false positive, and affects most of our index barrel files
 // can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
+import type { ServerComponentContext, WrapServerFunctionOptions } from '../server/rsc/types';
+
 export * from '@sentry/browser';
 
 export { init } from './sdk';
@@ -18,7 +20,7 @@ export { captureReactException, reactErrorHandler, Profiler, withProfiler, usePr
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function wrapServerComponent<T extends (...args: any[]) => any>(
   serverComponent: T,
-  _context: { componentRoute: string; componentType: string },
+  _context: ServerComponentContext,
 ): T {
   return serverComponent;
 }
@@ -30,7 +32,7 @@ export function wrapServerComponent<T extends (...args: any[]) => any>(
 export function wrapServerFunction<T extends (...args: any[]) => Promise<any>>(
   _functionName: string,
   serverFunction: T,
-  _options?: { name?: string; attributes?: Record<string, unknown> },
+  _options?: WrapServerFunctionOptions,
 ): T {
   return serverFunction;
 }
diff --git a/packages/react-router/src/server/rsc/responseUtils.ts b/packages/react-router/src/server/rsc/responseUtils.ts
@@ -1,19 +1,3 @@
-/**
- * Read-only check for the `__sentry_captured__` flag set by `captureException`.
- * Only reads the flag — does not mark the error — to avoid conflicting with
- * the internal dedup in `captureException`.
- */
-export function isAlreadyCaptured(exception: unknown): boolean {
-  if (exception == null || typeof exception !== 'object') {
-    return false;
-  }
-  try {
-    return !!(exception as Record<string, unknown>).__sentry_captured__;
-  } catch {
-    return false;
-  }
-}
-
 /**
  * Check if an error/response is a redirect.
  * Handles both Response objects and internal React Router throwables.
diff --git a/packages/react-router/src/server/rsc/types.ts b/packages/react-router/src/server/rsc/types.ts
@@ -1,7 +1,7 @@
 export interface ServerComponentContext {
   /** The parameterized route path (e.g., "/users/:id") */
   componentRoute: string;
-  componentType: 'Page' | 'Layout' | 'Loading' | 'Error' | 'Template' | 'Not-found' | 'Unknown';
+  componentType: 'Page' | 'Layout' | 'Error' | 'Unknown';
 }
 
 export interface WrapServerFunctionOptions {
diff --git a/packages/react-router/src/server/rsc/wrapServerComponent.ts b/packages/react-router/src/server/rsc/wrapServerComponent.ts
@@ -8,7 +8,7 @@ import {
   SPAN_STATUS_OK,
 } from '@sentry/core';
 import { DEBUG_BUILD } from '../../common/debug-build';
-import { isAlreadyCaptured, isNotFoundResponse, isRedirectResponse } from './responseUtils';
+import { isNotFoundResponse, isRedirectResponse } from './responseUtils';
 import type { ServerComponentContext } from './types';
 
 /**
@@ -101,17 +101,15 @@ function handleError(error: unknown, componentRoute: string, componentType: stri
     span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
   }
 
-  if (!isAlreadyCaptured(error)) {
-    captureException(error, {
-      mechanism: {
-        type: 'react_router.rsc',
-        handled: false,
-        data: {
-          function: 'ServerComponent',
-          component_route: componentRoute,
-          component_type: componentType,
-        },
+  captureException(error, {
+    mechanism: {
+      type: 'react_router.rsc',
+      handled: false,
+      data: {
+        function: 'ServerComponent',
+        component_route: componentRoute,
+        component_type: componentType,
       },
-    });
-  }
+    },
+  });
 }
diff --git a/packages/react-router/src/server/rsc/wrapServerFunction.ts b/packages/react-router/src/server/rsc/wrapServerFunction.ts
@@ -12,7 +12,7 @@ import {
   startSpan,
 } from '@sentry/core';
 import { DEBUG_BUILD } from '../../common/debug-build';
-import { isAlreadyCaptured, isNotFoundResponse, isRedirectResponse } from './responseUtils';
+import { isNotFoundResponse, isRedirectResponse } from './responseUtils';
 import type { WrapServerFunctionOptions } from './types';
 
 /**
@@ -82,18 +82,16 @@ export function wrapServerFunction<T extends (...args: any[]) => Promise<any>>(
 
             span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 
-            if (!isAlreadyCaptured(error)) {
-              captureException(error, {
-                mechanism: {
-                  type: 'react_router.rsc',
-                  handled: false,
-                  data: {
-                    function: 'serverFunction',
-                    server_function_name: functionName,
-                  },
+            captureException(error, {
+              mechanism: {
+                type: 'react_router.rsc',
+                handled: false,
+                data: {
+                  function: 'serverFunction',
+                  server_function_name: functionName,
                 },
-              });
-            }
+              },
+            });
             throw error;
           } finally {
             await flushIfServerless();
diff --git a/packages/react-router/test/server/rsc/responseUtils.test.ts b/packages/react-router/test/server/rsc/responseUtils.test.ts
@@ -1,27 +1,7 @@
-import { addNonEnumerableProperty } from '@sentry/core';
 import { describe, expect, it } from 'vitest';
-import { isAlreadyCaptured, isNotFoundResponse, isRedirectResponse } from '../../../src/server/rsc/responseUtils';
+import { isNotFoundResponse, isRedirectResponse } from '../../../src/server/rsc/responseUtils';
 
 describe('responseUtils', () => {
-  describe('isAlreadyCaptured', () => {
-    it('should return false for errors without __sentry_captured__', () => {
-      expect(isAlreadyCaptured(new Error('test'))).toBe(false);
-    });
-
-    it('should return true for errors with __sentry_captured__ set', () => {
-      const error = new Error('test');
-      addNonEnumerableProperty(error as unknown as Record<string, unknown>, '__sentry_captured__', true);
-      expect(isAlreadyCaptured(error)).toBe(true);
-    });
-
-    it('should return false for non-object values', () => {
-      expect(isAlreadyCaptured(null)).toBe(false);
-      expect(isAlreadyCaptured(undefined)).toBe(false);
-      expect(isAlreadyCaptured('string')).toBe(false);
-      expect(isAlreadyCaptured(42)).toBe(false);
-    });
-  });
-
   describe('isRedirectResponse', () => {
     it.each([301, 302, 303, 307, 308])('should return true for Response with %d status', status => {
       expect(isRedirectResponse(new Response(null, { status }))).toBe(true);
diff --git a/packages/react-router/test/server/rsc/wrapServerComponent.test.ts b/packages/react-router/test/server/rsc/wrapServerComponent.test.ts
diff --git a/packages/react-router/test/server/rsc/wrapServerFunction.test.ts b/packages/react-router/test/server/rsc/wrapServerFunction.test.ts
diff --git a/packages/react-router/test/vite/makeAutoInstrumentRSCPlugin.test.ts b/packages/react-router/test/vite/makeAutoInstrumentRSCPlugin.test.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	E2E test app for React Router 7 RSC (React Server Components) and `@sentry/react-router`.
`4`	`4`
`5`		-Note: Skipped in CI (`sentryTest.skip: true`) - React Router's RSC Framework Mode is experimental.
	`5`	+Note: Marked as `optional` in CI (`sentryTest.optional: true`) - React Router's RSC Framework Mode is experimental.