merge iniitial context with clerkInitialState

clerk · Oct 27, 2024 · 2ee481a · 2ee481a
1 parent abeb659
commit 2ee481a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/tanstack-start/src/server/middlewareHandler.ts b/packages/tanstack-start/src/server/middlewareHandler.ts
@@ -26,9 +26,9 @@ export function createClerkHandler<TRouter extends AnyRouter>(
 
         const clerkInitialState = getResponseClerkState(requestState, loadedOptions);
 
-        // Updating the TanStack router context with the Clerk context and loading the router
+        // Merging the TanStack router context with the Clerk context and loading the router
         router.update({
-          context: clerkInitialState,
+          context: { ...clerkInitialState, ...router.options.context },
         });
 
         await router.load();