Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -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);
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -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 });
},
},
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -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' } });
},
});
Original file line number Diff line number Diff line change
@@ -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' });
});
Original file line number Diff line number Diff line change
Expand Up @@ -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);
* },
* });
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading