fix(tanstack-start): Merge router context instead of updating (#4425)

Co-authored-by: Jeremy Wright <[email protected]>
clerk · Oct 30, 2024 · 915b257 · 915b257
1 parent a06f1f3
commit 915b257
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.changeset/silly-moose-tease.md b/.changeset/silly-moose-tease.md
@@ -0,0 +1,5 @@
+---
+"@clerk/tanstack-start": patch
+---
+
+- Fixes a bug where the initial router context is getting overwritten when updating the router inside `createClerkHandler`
diff --git a/packages/tanstack-start/src/server/middlewareHandler.ts b/packages/tanstack-start/src/server/middlewareHandler.ts
@@ -26,12 +26,10 @@ 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: { ...router.options.context, ...clerkInitialState },
         });
-
-        await router.load();
       } catch (error) {
         if (error instanceof Response) {
           // returning the response