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 @@ -9,41 +9,40 @@
"test:prod": "TEST_ENV=production playwright test",
"test:dev": "TEST_ENV=development playwright test",
"test:build": "pnpm install && pnpm build",
"test:build-canary": "pnpm install && pnpm add next@canary && pnpm add react@beta && pnpm add react-dom@beta && pnpm build",
"test:build-latest": "pnpm install && pnpm add next@rc && pnpm add react@beta && pnpm add react-dom@beta && pnpm build",
"test:build-canary": "pnpm install && pnpm add next@canary && pnpm add react@rc && pnpm add react-dom@rc && pnpm build",
"test:build-latest": "pnpm install && pnpm add next@rc && pnpm add react@rc && pnpm add react-dom@rc && pnpm build",
"test:assert": "pnpm test:prod && pnpm test:dev"
},
"dependencies": {
"@sentry/nextjs": "latest || *",
"@t3-oss/env-nextjs": "^0.10.1",
"@t3-oss/env-nextjs": "^0.12.0",
"@tanstack/react-query": "^5.50.0",
"@trpc/client": "~11.8.0",
"@trpc/react-query": "~11.8.0",
"@trpc/server": "~11.8.0",
"next": "14.2.35",
"react": "18.3.1",
"react-dom": "18.3.1",
"next": "^15.5.9",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"zod": "^3.23.3"
"zod": "^3.24.2"
},
"devDependencies": {
"@playwright/test": "~1.56.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@types/eslint": "^8.56.10",
"@types/node": "^18.19.1",
"@types/react": "18.3.1",
"@types/react-dom": "^18.3.0",
"@types/node": "^22.15.21",
"@types/react": "^19.1.0",
"@types/react-dom": "^19.1.0",
"@typescript-eslint/eslint-plugin": "^8.1.0",
"@typescript-eslint/parser": "^8.1.0",
"eslint": "^8.57.0",
"eslint-config-next": "^14.2.4",
"eslint-config-next": "^15.5.9",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.3",
"typescript": "^5.5.3"
"typescript": "^5.8.2"
},
"ct3aMetadata": {
"initVersion": "7.37.0"
"initVersion": "7.47.1"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fetchRequestHandler } from '@trpc/server/adapters/fetch';
import { type NextRequest } from 'next/server';
import type { NextRequest } from 'next/server';

import { env } from '~/env';
import { appRouter } from '~/server/api/root';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '~/styles/globals.css';

import { type Metadata } from 'next';
import type { Metadata } from 'next';

import { TRPCReactProvider } from '~/trpc/react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createEnv } from '@t3-oss/env-nextjs';
import { z } from 'zod';
import * as z from 'zod';

export const env = createEnv({
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as Sentry from '@sentry/nextjs';
/**
* YOU PROBABLY DON'T NEED TO EDIT THIS FILE, UNLESS:
* 1. You want to modify request context (see Part 1).
Expand All @@ -7,6 +6,7 @@ import * as Sentry from '@sentry/nextjs';
* TL;DR - This is where all the tRPC server stuff is created and plugged in. The pieces you will
* need to use are documented accordingly near the end.
*/
import * as Sentry from '@sentry/nextjs';
import { initTRPC } from '@trpc/server';
import superjson from 'superjson';
import { ZodError } from 'zod';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryClient, defaultShouldDehydrateQuery } from '@tanstack/react-query';
import { defaultShouldDehydrateQuery, QueryClient } from '@tanstack/react-query';
import SuperJSON from 'superjson';

export const createQueryClient = () =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
'use client';

import { type QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { loggerLink, httpBatchStreamLink } from '@trpc/client';
import { QueryClientProvider, type QueryClient } from '@tanstack/react-query';
import { httpBatchStreamLink, loggerLink } from '@trpc/client';
import { createTRPCReact } from '@trpc/react-query';
import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server';
import type { inferRouterInputs, inferRouterOutputs } from '@trpc/server';
import { useState } from 'react';
import SuperJSON from 'superjson';

import { type AppRouter } from '~/server/api/root';
import type { AppRouter } from '~/server/api/root';
import { createQueryClient } from './query-client';

let clientQueryClientSingleton: QueryClient | undefined = undefined;
Expand All @@ -17,7 +17,9 @@ const getQueryClient = () => {
return createQueryClient();
}
// Browser: use singleton pattern to keep the same query client
return (clientQueryClientSingleton ??= createQueryClient());
clientQueryClientSingleton ??= createQueryClient();

return clientQueryClientSingleton;
};

export const api = createTRPCReact<AppRouter>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@ import 'server-only';

import { createHydrationHelpers } from '@trpc/react-query/rsc';
import { headers } from 'next/headers';
import { cache } from 'react';

import { type AppRouter, createCaller } from '~/server/api/root';
import { createCaller, type AppRouter } from '~/server/api/root';
import { createTRPCContext } from '~/server/api/trpc';
import { createQueryClient } from './query-client';

/**
* This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when
* handling a tRPC call from a React Server Component.
*/
const createContext = () => {
const heads = new Headers(headers());
const createContext = cache(async () => {
const heads = new Headers(await headers());
heads.set('x-trpc-source', 'rsc');

return createTRPCContext({
headers: heads,
});
};
});

const getQueryClient = createQueryClient;
const getQueryClient = cache(createQueryClient);
const caller = createCaller(createContext);

export const { trpc: api, HydrateClient } = createHydrationHelpers<AppRouter>(caller, getQueryClient);
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/test-utils';

startEventProxyServer({
port: 3031,
proxyServerName: 'nextjs-t3',
proxyServerName: 'nextjs-15-t3',
});
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect, test } from '@playwright/test';
import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';

test('should capture error with trpc context', async ({ page }) => {
const errorEventPromise = waitForError('nextjs-t3', errorEvent => {
const errorEventPromise = waitForError('nextjs-15-t3', errorEvent => {
return errorEvent?.exception?.values?.[0]?.value === 'Error thrown in trpc router';
});

Expand All @@ -27,7 +27,7 @@ test('should capture error with trpc context', async ({ page }) => {
});

test('should create transaction with trpc input for error', async ({ page }) => {
const trpcTransactionPromise = waitForTransaction('nextjs-t3', async transactionEvent => {
const trpcTransactionPromise = waitForTransaction('nextjs-15-t3', async transactionEvent => {
return transactionEvent?.transaction === 'POST /api/trpc/[trpc]';
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';

test('should create transaction with trpc input for mutation', async ({ page }) => {
const trpcTransactionPromise = waitForTransaction('nextjs-t3', async transactionEvent => {
const trpcTransactionPromise = waitForTransaction('nextjs-15-t3', async transactionEvent => {
return transactionEvent?.transaction === 'POST /api/trpc/[trpc]';
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"resolveJsonModule": true,
"moduleDetection": "force",
"isolatedModules": true,
"verbatimModuleSyntax": true,

/* Strictness */
"strict": true,
Expand All @@ -29,6 +30,6 @@
"~/*": ["./src/*"]
}
},
"include": [".eslintrc.cjs", "next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.cjs", "**/*.js", ".next/types/**/*.ts"],
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.cjs", "**/*.js", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
}
Loading