fix: replace makeQueryClient with cached getQueryClient for consistent query client behavior across requests

Author: jakejarvis

app/[domain]/page.tsx

@@ -5,8 +5,7 @@ import { DomainReportView } from "@/components/domain/domain-report-view";
 import { analytics } from "@/lib/analytics/server";
 import { normalizeDomainInput } from "@/lib/domain";
 import { toRegistrableDomain } from "@/lib/domain-server";
-import { makeQueryClient } from "@/trpc/query-client";
-import { trpc } from "@/trpc/server";
+import { getQueryClient, trpc } from "@/trpc/server";
 
 import "country-flag-icons/3x2/flags.css";
 import "mapbox-gl/dist/mapbox-gl.css";
@@ -52,7 +51,8 @@ export default async function DomainPage({
   analytics.track("report_viewed", { domain: normalized });
 
   // Minimal prefetch: registration only, let sections stream progressively
-  const queryClient = makeQueryClient();
+  // Use getQueryClient() to ensure consistent query client across the request
+  const queryClient = getQueryClient();
   void queryClient.prefetchQuery(
     trpc.domain.registration.queryOptions({ domain: normalized }),
   );

trpc/server.ts

@@ -1,13 +1,19 @@
 import "server-only";
 
 import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";
+import { cache } from "react";
 import { appRouter } from "@/server/routers/_app";
 import { createContext } from "@/trpc/init";
 import { makeQueryClient } from "@/trpc/query-client";
 
+// Create a stable getter for the query client that will return the same client during
+// the same request. This ensures consistent query client behavior across multiple tRPC
+// calls within a single server request.
+export const getQueryClient = cache(makeQueryClient);
+
 // Strongly-typed tRPC proxy for server-side prefetching via queryOptions
 export const trpc = createTRPCOptionsProxy({
   ctx: createContext,
   router: appRouter,
-  queryClient: makeQueryClient,
+  queryClient: getQueryClient,
 });