Revert "fix(tanstack-start): Merge router context instead of updating (…

…#4425)" This reverts commit 915b257.
clerk · Oct 30, 2024 · dac21ed · dac21ed
1 parent 915b257
commit dac21ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.changeset/silly-moose-tease.md b/.changeset/silly-moose-tease.md
diff --git a/packages/tanstack-start/src/server/middlewareHandler.ts b/packages/tanstack-start/src/server/middlewareHandler.ts
@@ -26,10 +26,12 @@ export function createClerkHandler<TRouter extends AnyRouter>(
 
         const clerkInitialState = getResponseClerkState(requestState, loadedOptions);
 
-        // Merging the TanStack router context with the Clerk context and loading the router
+        // Updating the TanStack router context with the Clerk context and loading the router
         router.update({
-          context: { ...router.options.context, ...clerkInitialState },
+          context: clerkInitialState,
         });
+
+        await router.load();
       } catch (error) {
         if (error instanceof Response) {
           // returning the response