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(react): Match routes with parseSearch option in TanStack Router instrumentation #14328

Merged
merged 2 commits into from
Dec 3, 2024
Merged

fix(react): Match routes with parseSearch option in TanStack Router instrumentation #14328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67bb292
fix(react): Tanstack Router integration matchRoutes signature changed
lsmurray Nov 16, 2024
6d8a543
fix(react): revert matchRoutes API changes
lsmurray Nov 21, 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
2 changes: 1 addition & 1 deletion packages/react/src/tanstackrouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function tanstackRouterBrowserTracingIntegration(
if (instrumentPageLoad && initialWindowLocation) {
const matchedRoutes = castRouterInstance.matchRoutes(
initialWindowLocation.pathname,
initialWindowLocation.search,
castRouterInstance.options.parseSearch(initialWindowLocation.search),
{ preload: false, throwOnError: false },
);

Expand Down
4 changes: 4 additions & 0 deletions packages/react/src/vendor/tanstackrouter-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ SOFTWARE.
export interface VendoredTanstackRouter {
history: VendoredTanstackRouterHistory;
state: VendoredTanstackRouterState;
options: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
parseSearch: (search: string) => Record<string, any>;
};
matchRoutes: (
pathname: string,
// eslint-disable-next-line @typescript-eslint/ban-types
Expand Down
Loading