fix(react): revert matchRoutes API changes

Author: luke-layerhealth

packages/react/src/tanstackrouter.ts

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

packages/react/src/vendor/tanstackrouter-types.ts

@@ -34,8 +34,13 @@ export interface VendoredTanstackRouter {
     parseSearch: (search: string) => Record<string, any>;
   };
   matchRoutes: (
-    location: VendoredTanstackRouterLocation,
-    opts?: { preload?: boolean; throwOnError?: boolean },
+    pathname: string,
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    locationSearch: {},
+    opts?: {
+      preload?: boolean;
+      throwOnError?: boolean;
+    },
   ) => Array<VendoredTanstackRouterRouteMatch>;
   subscribe(
     eventType: 'onResolved' | 'onBeforeNavigate',
@@ -46,7 +51,7 @@ export interface VendoredTanstackRouter {
   ): () => void;
 }
 
-export interface VendoredTanstackRouterLocation {
+interface VendoredTanstackRouterLocation {
   pathname: string;
   // eslint-disable-next-line @typescript-eslint/ban-types
   search: {};