Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Oct 30, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f39421c
fix(tanstack-start): Merge router context instead of updating (#4345)
jeremy-clerk Oct 29, 2024
1093419
wip
octoper Oct 29, 2024
0cdac8a
fix(tanstack-start): Remove router.load
octoper Oct 29, 2024
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
5 changes: 5 additions & 0 deletions .changeset/silly-moose-tease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`
6 changes: 2 additions & 4 deletions packages/tanstack-start/src/server/middlewareHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading