From e1510cecac68a85184c65ec97822876defd929f0 Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Mon, 16 Nov 2026 13:57:13 +0100 Subject: [PATCH] fix(tanstackstart-react): Forward request options in the server entry example The documented server entry called `handler.fetch(request)` and dropped the second argument. TanStack Start reads the typed request context from it. Co-Authored-By: Claude Fable 5.2 --- .../tanstackstart-react-static/app/server.ts | 4 ++-- .../src/routes/api.request-context.ts | 11 +++++++++++ .../tanstackstart-react/src/server.ts | 18 +++++++++++++++--- .../tests/request-context.test.ts | 7 +++++++ .../src/server/wrapFetchWithSentry.ts | 4 ++-- .../test/server/wrapFetchWithSentry.test.ts | 15 +++++++++++++++ 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.request-context.ts create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/request-context.test.ts diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/server.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/server.ts index b10a3bc1e37b..5682de572e8c 100644 --- a/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/server.ts +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react-static/app/server.ts @@ -4,8 +4,8 @@ import handler, { createServerEntry } from '@tanstack/react-start/server-entry'; import type { ServerEntry } from '@tanstack/react-start/server-entry'; const requestHandler: ServerEntry = wrapFetchWithSentry({ - fetch(request: Request) { - return handler.fetch(request); + fetch(request, opts) { + return handler.fetch(request, opts); }, }); diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.request-context.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.request-context.ts new file mode 100644 index 000000000000..c53866f2ca60 --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.request-context.ts @@ -0,0 +1,11 @@ +import { createFileRoute } from '@tanstack/react-router'; + +export const Route = createFileRoute('/api/request-context')({ + server: { + handlers: { + GET: async ({ context }) => { + return Response.json({ fromServerEntry: context.fromServerEntry }); + }, + }, + }, +}); diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/server.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/server.ts index f7376fa305e2..58895d4d4dc4 100644 --- a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/server.ts +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/server.ts @@ -4,10 +4,22 @@ import { wrapFetchWithSentry } from '@sentry/tanstackstart-react'; import handler, { createServerEntry } from '@tanstack/react-start/server-entry'; import type { ServerEntry } from '@tanstack/react-start/server-entry'; +declare module '@tanstack/react-router' { + interface Register { + server: { + requestContext: { fromServerEntry: string }; + }; + } +} + const requestHandler: ServerEntry = wrapFetchWithSentry({ - fetch(request: Request) { - return handler.fetch(request); + fetch(request, opts) { + return handler.fetch(request, opts); }, }); -export default createServerEntry(requestHandler); +export default createServerEntry({ + fetch(request, opts) { + return requestHandler.fetch(request, { ...opts, context: { fromServerEntry: 'request-context-value' } }); + }, +}); diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/request-context.test.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/request-context.test.ts new file mode 100644 index 000000000000..42c960a00d32 --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/request-context.test.ts @@ -0,0 +1,7 @@ +import { expect, test } from '@playwright/test'; + +test('Passes the request context from the server entry to a server route', async ({ baseURL }) => { + const response = await fetch(`${baseURL}/api/request-context`); + + expect(await response.json()).toEqual({ fromServerEntry: 'request-context-value' }); +}); diff --git a/packages/tanstackstart-react/src/server/wrapFetchWithSentry.ts b/packages/tanstackstart-react/src/server/wrapFetchWithSentry.ts index 83f148a77771..89cab78809a5 100644 --- a/packages/tanstackstart-react/src/server/wrapFetchWithSentry.ts +++ b/packages/tanstackstart-react/src/server/wrapFetchWithSentry.ts @@ -128,8 +128,8 @@ function injectMetaTagsInResponse(originalResponse: Response): Response { * import type { ServerEntry } from '@tanstack/react-start/server-entry'; * * const requestHandler: ServerEntry = wrapFetchWithSentry({ - * fetch(request: Request) { - * return handler.fetch(request); + * fetch(request, opts) { + * return handler.fetch(request, opts); * }, * }); * diff --git a/packages/tanstackstart-react/test/server/wrapFetchWithSentry.test.ts b/packages/tanstackstart-react/test/server/wrapFetchWithSentry.test.ts index 7e9234ab55da..c606d6c017ab 100644 --- a/packages/tanstackstart-react/test/server/wrapFetchWithSentry.test.ts +++ b/packages/tanstackstart-react/test/server/wrapFetchWithSentry.test.ts @@ -63,6 +63,21 @@ describe('wrapFetchWithSentry', () => { expect(flushIfServerlessSpy).toHaveBeenCalledTimes(1); }); + it.each(['http://localhost:3000/page', 'http://localhost:3000/_serverFn/abc123'])( + 'forwards the request options to the wrapped handler for %s', + async url => { + const fetchFn = vi.fn().mockResolvedValue(new Response('ok')); + + const serverEntry = wrapFetchWithSentry({ fetch: fetchFn }); + const request = new Request(url); + const opts = { context: { user: 'test' } }; + + await serverEntry.fetch(request, opts); + + expect(fetchFn).toHaveBeenCalledWith(request, opts); + }, + ); + it('creates a function span for server function requests', async () => { const mockResponse = new Response('ok'); const fetchFn = vi.fn().mockResolvedValue(mockResponse);