Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/react-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
"sentry": "^0.44.0"
},
"devDependencies": {
"@react-router/dev": "^7.17.0",
"@react-router/node": "^7.15.0",
"@react-router/dev": "^8.3.1",
"@react-router/node": "^8.3.1",
"react": "^18.3.1",
"react-router": "^7.18.0",
"react-router": "^8.3.1",
"vite": "^6.4.3"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { createReadableStreamFromReadable } from '@react-router/node';
import type { ReactNode } from 'react';
import React from 'react';
import type { AppLoadContext, EntryContext, RouterContextProvider, ServerRouter } from 'react-router';
import type { EntryContext, RouterContextProvider, ServerRouter } from 'react-router';
import { PassThrough } from 'stream';
import { getMetaTagTransformer } from './getMetaTagTransformer';
import { wrapSentryHandleRequest } from './wrapSentryHandleRequest';
import { type AppLoadContext, wrapSentryHandleRequest } from './wrapSentryHandleRequest';

type RenderToPipeableStreamOptions = {
[key: string]: unknown;
Expand Down
23 changes: 17 additions & 6 deletions packages/react-router/src/server/wrapSentryHandleRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,26 @@ import {
updateSpanName,
} from '@sentry/core';
import { flushIfServerless } from '@sentry/core/server';
import type { AppLoadContext, EntryContext, RouterContextProvider } from 'react-router';
import type { EntryContext, RouterContextProvider } from 'react-router';
import { isInstrumentationApiUsed } from './serverGlobals';

type OriginalHandleRequestWithoutMiddleware = (
/**
* React Router v7's `AppLoadContext`, declared here because v8 removed the export: middleware is
* always enabled there, so the load context is always a `RouterContextProvider`. The SDK supports
* both majors, so the shape is mirrored instead of imported.
*/
export interface AppLoadContext {
[key: string]: unknown;
}

// Generic over the load context so apps that augment `AppLoadContext` via declaration merging keep
// their own shape instead of being widened to the base index signature.
type OriginalHandleRequestWithoutMiddleware<LoadContext extends AppLoadContext = AppLoadContext> = (
request: Request,
responseStatusCode: number,
responseHeaders: Headers,
routerContext: EntryContext,
loadContext: AppLoadContext,
loadContext: LoadContext,
) => Promise<unknown>;

type OriginalHandleRequestWithMiddleware = (
Expand All @@ -32,9 +43,9 @@ type OriginalHandleRequestWithMiddleware = (
* @param originalHandle - The original handleRequest function to wrap
* @returns A wrapped version of the handle request function with Sentry instrumentation
*/
export function wrapSentryHandleRequest(
originalHandle: OriginalHandleRequestWithoutMiddleware,
): OriginalHandleRequestWithoutMiddleware;
export function wrapSentryHandleRequest<LoadContext extends AppLoadContext>(
originalHandle: OriginalHandleRequestWithoutMiddleware<LoadContext>,
): OriginalHandleRequestWithoutMiddleware<LoadContext>;
/**
* Wraps the original handleRequest function to add Sentry instrumentation.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ describe('createSentryHandleRequest', () => {
manifestPath: '/path/to/manifest',
},
routeModules: {},
future: {
v8_middleware: false,
v8_passThroughRequests: false,
v8_trailingSlashAwareDataRequests: false,
},
future: {},
isSpaMode: false,
branches: [],
staticHandlerContext: {
Expand Down
Loading
Loading