fix(react): Tanstack Router integration matchRoutes signature changed

getsentry · Nov 16, 2024 · 67bb292 · 67bb292
1 parent 72751da
commit 67bb292
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/packages/react/src/tanstackrouter.ts b/packages/react/src/tanstackrouter.ts
@@ -7,7 +7,11 @@ import {
 
 import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/browser';
 import type { Integration } from '@sentry/types';
-import type { VendoredTanstackRouter, VendoredTanstackRouterRouteMatch } from './vendor/tanstackrouter-types';
+import type {
+  VendoredTanstackRouter,
+  VendoredTanstackRouterLocation,
+  VendoredTanstackRouterRouteMatch,
+} from './vendor/tanstackrouter-types';
 
 /**
  * A custom browser tracing integration for TanStack Router.
@@ -40,8 +44,10 @@ export function tanstackRouterBrowserTracingIntegration(
       const initialWindowLocation = WINDOW.location;
       if (instrumentPageLoad && initialWindowLocation) {
         const matchedRoutes = castRouterInstance.matchRoutes(
-          initialWindowLocation.pathname,
-          initialWindowLocation.search,
+          {
+            pathname: initialWindowLocation.pathname,
+            search: castRouterInstance.options.parseSearch(initialWindowLocation.search),
+          } as VendoredTanstackRouterLocation,
           { preload: false, throwOnError: false },
         );
 
@@ -66,11 +72,10 @@ export function tanstackRouterBrowserTracingIntegration(
             return;
           }
 
-          const onResolvedMatchedRoutes = castRouterInstance.matchRoutes(
-            onBeforeNavigateArgs.toLocation.pathname,
-            onBeforeNavigateArgs.toLocation.search,
-            { preload: false, throwOnError: false },
-          );
+          const onResolvedMatchedRoutes = castRouterInstance.matchRoutes(onBeforeNavigateArgs.toLocation, {
+            preload: false,
+            throwOnError: false,
+          });
 
           const onBeforeNavigateLastMatch = onResolvedMatchedRoutes[onResolvedMatchedRoutes.length - 1];
 
@@ -88,11 +93,10 @@ export function tanstackRouterBrowserTracingIntegration(
           const unsubscribeOnResolved = castRouterInstance.subscribe('onResolved', onResolvedArgs => {
             unsubscribeOnResolved();
             if (navigationSpan) {
-              const onResolvedMatchedRoutes = castRouterInstance.matchRoutes(
-                onResolvedArgs.toLocation.pathname,
-                onResolvedArgs.toLocation.search,
-                { preload: false, throwOnError: false },
-              );
+              const onResolvedMatchedRoutes = castRouterInstance.matchRoutes(onResolvedArgs.toLocation, {
+                preload: false,
+                throwOnError: false,
+              });
 
               const onResolvedLastMatch = onResolvedMatchedRoutes[onResolvedMatchedRoutes.length - 1];
 

diff --git a/packages/react/src/vendor/tanstackrouter-types.ts b/packages/react/src/vendor/tanstackrouter-types.ts
@@ -29,14 +29,13 @@ 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
-    locationSearch: {},
-    opts?: {
-      preload?: boolean;
-      throwOnError?: boolean;
-    },
+    location: VendoredTanstackRouterLocation,
+    opts?: { preload?: boolean; throwOnError?: boolean },
   ) => Array<VendoredTanstackRouterRouteMatch>;
   subscribe(
     eventType: 'onResolved' | 'onBeforeNavigate',
@@ -47,7 +46,7 @@ export interface VendoredTanstackRouter {
   ): () => void;
 }
 
-interface VendoredTanstackRouterLocation {
+export interface VendoredTanstackRouterLocation {
   pathname: string;
   // eslint-disable-next-line @typescript-eslint/ban-types
   search: {};