@sentry/react 10.37.0 → 10.39.0-alpha.0

package/build/cjs/hoist-non-react-statics.js

@@ -130,12 +130,12 @@ function hoistNonReactStatics
     const sourceStatics = getStatics(sourceComponent);
 
     for (const key of keys) {
-      const keyStr = String(key);
+      // Use key directly - String(key) throws for Symbols if minified to '' + key (#18966)
       if (
-        !KNOWN_STATICS[keyStr ] &&
+        !KNOWN_STATICS[key ] &&
         true &&
-        !sourceStatics?.[keyStr] &&
-        !targetStatics?.[keyStr] &&
+        !sourceStatics?.[key ] &&
+        !targetStatics?.[key ] &&
         !getOwnPropertyDescriptor(targetComponent, key) // Don't overwrite existing properties
       ) {
         const descriptor = getOwnPropertyDescriptor(sourceComponent, key);

package/build/cjs/hoist-non-react-statics.js.map

@@ -1 +1 @@
-{"version":3,"file":"hoist-non-react-statics.js","sources":["../../src/hoist-non-react-statics.ts"],"sourcesContent":["/**\n * Inlined implementation of hoist-non-react-statics\n * Original library: https://github.com/mridgway/hoist-non-react-statics\n * License: BSD-3-Clause\n * Copyright 2015, Yahoo! Inc.\n *\n * This is an inlined version to avoid ESM compatibility issues with the original package.\n */\n\nimport type * as React from 'react';\n\n/**\n * React statics that should not be hoisted\n */\nconst REACT_STATICS = {\n  childContextTypes: true,\n  contextType: true,\n  contextTypes: true,\n  defaultProps: true,\n  displayName: true,\n  getDefaultProps: true,\n  getDerivedStateFromError: true,\n  getDerivedStateFromProps: true,\n  mixins: true,\n  propTypes: true,\n  type: true,\n} as const;\n\n/**\n * Known JavaScript function statics that should not be hoisted\n */\nconst KNOWN_STATICS = {\n  name: true,\n  length: true,\n  prototype: true,\n  caller: true,\n  callee: true,\n  arguments: true,\n  arity: true,\n} as const;\n\n/**\n * Statics specific to ForwardRef components\n */\nconst FORWARD_REF_STATICS = {\n  $$typeof: true,\n  render: true,\n  defaultProps: true,\n  displayName: true,\n  propTypes: true,\n} as const;\n\n/**\n * Statics specific to Memo components\n */\nconst MEMO_STATICS = {\n  $$typeof: true,\n  compare: true,\n  defaultProps: true,\n  displayName: true,\n  propTypes: true,\n  type: true,\n} as const;\n\n/**\n * Inlined react-is utilities\n * We only need to detect ForwardRef and Memo types\n */\nconst ForwardRefType = Symbol.for('react.forward_ref');\nconst MemoType = Symbol.for('react.memo');\n\n/**\n * Check if a component is a Memo component\n */\nfunction isMemo(component: unknown): boolean {\n  return (\n    typeof component === 'object' && component !== null && (component as { $$typeof?: symbol }).$$typeof === MemoType\n  );\n}\n\n/**\n * Map of React component types to their specific statics\n */\nconst TYPE_STATICS: Record<symbol, Record<string, boolean>> = {};\nTYPE_STATICS[ForwardRefType] = FORWARD_REF_STATICS;\nTYPE_STATICS[MemoType] = MEMO_STATICS;\n\n/**\n * Get the appropriate statics object for a given component\n */\nfunction getStatics(component: React.ComponentType<unknown>): Record<string, boolean> {\n  // React v16.11 and below\n  if (isMemo(component)) {\n    return MEMO_STATICS;\n  }\n\n  // React v16.12 and above\n  const componentType = (component as { $$typeof?: symbol }).$$typeof;\n  return (componentType && TYPE_STATICS[componentType]) || REACT_STATICS;\n}\n\nconst defineProperty = Object.defineProperty.bind(Object);\nconst getOwnPropertyNames = Object.getOwnPropertyNames.bind(Object);\nconst getOwnPropertySymbols = Object.getOwnPropertySymbols?.bind(Object);\nconst getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor.bind(Object);\nconst getPrototypeOf = Object.getPrototypeOf.bind(Object);\nconst objectPrototype = Object.prototype;\n\n/**\n * Copies non-react specific statics from a child component to a parent component.\n * Similar to Object.assign, but copies all static properties from source to target,\n * excluding React-specific statics and known JavaScript statics.\n *\n * @param targetComponent - The component to copy statics to\n * @param sourceComponent - The component to copy statics from\n * @param excludelist - An optional object of keys to exclude from hoisting\n * @returns The target component with hoisted statics\n */\nexport function hoistNonReactStatics<\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  T extends React.ComponentType<any>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  S extends React.ComponentType<any>,\n  C extends Record<string, boolean> = Record<string, never>,\n>(targetComponent: T, sourceComponent: S, excludelist?: C): T {\n  if (typeof sourceComponent !== 'string') {\n    // Don't hoist over string (html) components\n    if (objectPrototype) {\n      const inheritedComponent = getPrototypeOf(sourceComponent);\n\n      if (inheritedComponent && inheritedComponent !== objectPrototype) {\n        hoistNonReactStatics(targetComponent, inheritedComponent, excludelist);\n      }\n    }\n\n    let keys: (string | symbol)[] = getOwnPropertyNames(sourceComponent);\n\n    if (getOwnPropertySymbols) {\n      keys = keys.concat(getOwnPropertySymbols(sourceComponent));\n    }\n\n    const targetStatics = getStatics(targetComponent);\n    const sourceStatics = getStatics(sourceComponent);\n\n    for (const key of keys) {\n      const keyStr = String(key);\n      if (\n        !KNOWN_STATICS[keyStr as keyof typeof KNOWN_STATICS] &&\n        !excludelist?.[keyStr] &&\n        !sourceStatics?.[keyStr] &&\n        !targetStatics?.[keyStr] &&\n        !getOwnPropertyDescriptor(targetComponent, key) // Don't overwrite existing properties\n      ) {\n        const descriptor = getOwnPropertyDescriptor(sourceComponent, key);\n\n        if (descriptor) {\n          try {\n            // Avoid failures from read-only properties\n            defineProperty(targetComponent, key, descriptor);\n          } catch (e) {\n            // Silently ignore errors\n          }\n        }\n      }\n    }\n  }\n\n  return targetComponent;\n}\n"],"names":[],"mappings":";;AAWA;AACA;AACA;AACA,MAAM,gBAAgB;AACtB,EAAE,iBAAiB,EAAE,IAAI;AACzB,EAAE,WAAW,EAAE,IAAI;AACnB,EAAE,YAAY,EAAE,IAAI;AACpB,EAAE,YAAY,EAAE,IAAI;AACpB,EAAE,WAAW,EAAE,IAAI;AACnB,EAAE,eAAe,EAAE,IAAI;AACvB,EAAE,wBAAwB,EAAE,IAAI;AAChC,EAAE,wBAAwB,EAAE,IAAI;AAChC,EAAE,MAAM,EAAE,IAAI;AACd,EAAE,SAAS,EAAE,IAAI;AACjB,EAAE,IAAI,EAAE,IAAI;AACZ,CAAA;;AAEA;AACA;AACA;AACA,MAAM,gBAAgB;AACtB,EAAE,IAAI,EAAE,IAAI;AACZ,EAAE,MAAM,EAAE,IAAI;AACd,EAAE,SAAS,EAAE,IAAI;AACjB,EAAE,MAAM,EAAE,IAAI;AACd,EAAE,MAAM,EAAE,IAAI;AACd,EAAE,SAAS,EAAE,IAAI;AACjB,EAAE,KAAK,EAAE,IAAI;AACb,CAAA;;AAEA;AACA;AACA;AACA,MAAM,sBAAsB;AAC5B,EAAE,QAAQ,EAAE,IAAI;AAChB,EAAE,MAAM,EAAE,IAAI;AACd,EAAE,YAAY,EAAE,IAAI;AACpB,EAAE,WAAW,EAAE,IAAI;AACnB,EAAE,SAAS,EAAE,IAAI;AACjB,CAAA;;AAEA;AACA;AACA;AACA,MAAM,eAAe;AACrB,EAAE,QAAQ,EAAE,IAAI;AAChB,EAAE,OAAO,EAAE,IAAI;AACf,EAAE,YAAY,EAAE,IAAI;AACpB,EAAE,WAAW,EAAE,IAAI;AACnB,EAAE,SAAS,EAAE,IAAI;AACjB,EAAE,IAAI,EAAE,IAAI;AACZ,CAAA;;AAEA;AACA;AACA;AACA;AACA,MAAM,iBAAiB,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC;AACtD,MAAM,WAAW,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;;AAEzC;AACA;AACA;AACA,SAAS,MAAM,CAAC,SAAS,EAAoB;AAC7C,EAAE;AACF,IAAI,OAAO,SAAA,KAAc,QAAA,IAAY,SAAA,KAAc,IAAA,IAAQ,CAAC,SAAA,GAAoC,aAAa;AAC7G;AACA;;AAEA;AACA;AACA;AACA,MAAM,YAAY,GAA4C,EAAE;AAChE,YAAY,CAAC,cAAc,CAAA,GAAI,mBAAmB;AAClD,YAAY,CAAC,QAAQ,CAAA,GAAI,YAAY;;AAErC;AACA;AACA;AACA,SAAS,UAAU,CAAC,SAAS,EAAyD;AACtF;AACA,EAAE,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;AACzB,IAAI,OAAO,YAAY;AACvB,EAAE;;AAEF;AACA,EAAE,MAAM,aAAA,GAAgB,CAAC,SAAA,GAAoC,QAAQ;AACrE,EAAE,OAAO,CAAC,aAAA,IAAiB,YAAY,CAAC,aAAa,CAAC,KAAK,aAAa;AACxE;;AAEA,MAAM,cAAA,GAAiB,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;AACzD,MAAM,mBAAA,GAAsB,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC;AACnE,MAAM,qBAAA,GAAwB,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC;AACxE,MAAM,wBAAA,GAA2B,MAAM,CAAC,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC;AAC7E,MAAM,cAAA,GAAiB,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;AACzD,MAAM,eAAA,GAAkB,MAAM,CAAC,SAAS;;AAExC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS;;AAMhB,CAAE,eAAe,EAAK,eAAe,EAAK,WAAW,EAAS;AAC9D,EAAE,IAAI,OAAO,eAAA,KAAoB,QAAQ,EAAE;AAC3C;AACA,IAAI,IAAI,eAAe,EAAE;AACzB,MAAM,MAAM,kBAAA,GAAqB,cAAc,CAAC,eAAe,CAAC;;AAEhE,MAAM,IAAI,kBAAA,IAAsB,kBAAA,KAAuB,eAAe,EAAE;AACxE,QAAQ,oBAAoB,CAAC,eAAe,EAAE,kBAA+B,CAAC;AAC9E,MAAM;AACN,IAAI;;AAEJ,IAAI,IAAI,IAAI,GAAwB,mBAAmB,CAAC,eAAe,CAAC;;AAExE,IAAI,IAAI,qBAAqB,EAAE;AAC/B,MAAM,IAAA,GAAO,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;AAChE,IAAI;;AAEJ,IAAI,MAAM,aAAA,GAAgB,UAAU,CAAC,eAAe,CAAC;AACrD,IAAI,MAAM,aAAA,GAAgB,UAAU,CAAC,eAAe,CAAC;;AAErD,IAAI,KAAK,MAAM,GAAA,IAAO,IAAI,EAAE;AAC5B,MAAM,MAAM,MAAA,GAAS,MAAM,CAAC,GAAG,CAAC;AAChC,MAAM;AACN,QAAQ,CAAC,aAAa,CAAC,MAAA,EAAO;AAC9B,QAAQ,IAAqB;AAC7B,QAAQ,CAAC,aAAa,GAAG,MAAM,CAAA;AAC/B,QAAQ,CAAC,aAAa,GAAG,MAAM,CAAA;AAC/B,QAAQ,CAAC,wBAAwB,CAAC,eAAe,EAAE,GAAG,CAAA;AACtD,QAAQ;AACR,QAAQ,MAAM,aAAa,wBAAwB,CAAC,eAAe,EAAE,GAAG,CAAC;;AAEzE,QAAQ,IAAI,UAAU,EAAE;AACxB,UAAU,IAAI;AACd;AACA,YAAY,cAAc,CAAC,eAAe,EAAE,GAAG,EAAE,UAAU,CAAC;AAC5D,UAAU,CAAA,CAAE,OAAO,CAAC,EAAE;AACtB;AACA,UAAU;AACV,QAAQ;AACR,MAAM;AACN,IAAI;AACJ,EAAE;;AAEF,EAAE,OAAO,eAAe;AACxB;;;;"}
+{"version":3,"file":"hoist-non-react-statics.js","sources":["../../src/hoist-non-react-statics.ts"],"sourcesContent":["/**\n * Inlined implementation of hoist-non-react-statics\n * Original library: https://github.com/mridgway/hoist-non-react-statics\n * License: BSD-3-Clause\n * Copyright 2015, Yahoo! Inc.\n *\n * This is an inlined version to avoid ESM compatibility issues with the original package.\n */\n\nimport type * as React from 'react';\n\n/**\n * React statics that should not be hoisted\n */\nconst REACT_STATICS = {\n  childContextTypes: true,\n  contextType: true,\n  contextTypes: true,\n  defaultProps: true,\n  displayName: true,\n  getDefaultProps: true,\n  getDerivedStateFromError: true,\n  getDerivedStateFromProps: true,\n  mixins: true,\n  propTypes: true,\n  type: true,\n} as const;\n\n/**\n * Known JavaScript function statics that should not be hoisted\n */\nconst KNOWN_STATICS = {\n  name: true,\n  length: true,\n  prototype: true,\n  caller: true,\n  callee: true,\n  arguments: true,\n  arity: true,\n} as const;\n\n/**\n * Statics specific to ForwardRef components\n */\nconst FORWARD_REF_STATICS = {\n  $$typeof: true,\n  render: true,\n  defaultProps: true,\n  displayName: true,\n  propTypes: true,\n} as const;\n\n/**\n * Statics specific to Memo components\n */\nconst MEMO_STATICS = {\n  $$typeof: true,\n  compare: true,\n  defaultProps: true,\n  displayName: true,\n  propTypes: true,\n  type: true,\n} as const;\n\n/**\n * Inlined react-is utilities\n * We only need to detect ForwardRef and Memo types\n */\nconst ForwardRefType = Symbol.for('react.forward_ref');\nconst MemoType = Symbol.for('react.memo');\n\n/**\n * Check if a component is a Memo component\n */\nfunction isMemo(component: unknown): boolean {\n  return (\n    typeof component === 'object' && component !== null && (component as { $$typeof?: symbol }).$$typeof === MemoType\n  );\n}\n\n/**\n * Map of React component types to their specific statics\n */\nconst TYPE_STATICS: Record<symbol, Record<string, boolean>> = {};\nTYPE_STATICS[ForwardRefType] = FORWARD_REF_STATICS;\nTYPE_STATICS[MemoType] = MEMO_STATICS;\n\n/**\n * Get the appropriate statics object for a given component\n */\nfunction getStatics(component: React.ComponentType<unknown>): Record<string, boolean> {\n  // React v16.11 and below\n  if (isMemo(component)) {\n    return MEMO_STATICS;\n  }\n\n  // React v16.12 and above\n  const componentType = (component as { $$typeof?: symbol }).$$typeof;\n  return (componentType && TYPE_STATICS[componentType]) || REACT_STATICS;\n}\n\nconst defineProperty = Object.defineProperty.bind(Object);\nconst getOwnPropertyNames = Object.getOwnPropertyNames.bind(Object);\nconst getOwnPropertySymbols = Object.getOwnPropertySymbols?.bind(Object);\nconst getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor.bind(Object);\nconst getPrototypeOf = Object.getPrototypeOf.bind(Object);\nconst objectPrototype = Object.prototype;\n\n/**\n * Copies non-react specific statics from a child component to a parent component.\n * Similar to Object.assign, but copies all static properties from source to target,\n * excluding React-specific statics and known JavaScript statics.\n *\n * @param targetComponent - The component to copy statics to\n * @param sourceComponent - The component to copy statics from\n * @param excludelist - An optional object of keys to exclude from hoisting\n * @returns The target component with hoisted statics\n */\nexport function hoistNonReactStatics<\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  T extends React.ComponentType<any>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  S extends React.ComponentType<any>,\n  C extends Record<string, boolean> = Record<string, never>,\n>(targetComponent: T, sourceComponent: S, excludelist?: C): T {\n  if (typeof sourceComponent !== 'string') {\n    // Don't hoist over string (html) components\n    if (objectPrototype) {\n      const inheritedComponent = getPrototypeOf(sourceComponent);\n\n      if (inheritedComponent && inheritedComponent !== objectPrototype) {\n        hoistNonReactStatics(targetComponent, inheritedComponent, excludelist);\n      }\n    }\n\n    let keys: (string | symbol)[] = getOwnPropertyNames(sourceComponent);\n\n    if (getOwnPropertySymbols) {\n      keys = keys.concat(getOwnPropertySymbols(sourceComponent));\n    }\n\n    const targetStatics = getStatics(targetComponent);\n    const sourceStatics = getStatics(sourceComponent);\n\n    for (const key of keys) {\n      // Use key directly - String(key) throws for Symbols if minified to '' + key (#18966)\n      if (\n        !KNOWN_STATICS[key as keyof typeof KNOWN_STATICS] &&\n        !(excludelist && excludelist[key as keyof C]) &&\n        !sourceStatics?.[key as string] &&\n        !targetStatics?.[key as string] &&\n        !getOwnPropertyDescriptor(targetComponent, key) // Don't overwrite existing properties\n      ) {\n        const descriptor = getOwnPropertyDescriptor(sourceComponent, key);\n\n        if (descriptor) {\n          try {\n            // Avoid failures from read-only properties\n            defineProperty(targetComponent, key, descriptor);\n          } catch (e) {\n            // Silently ignore errors\n          }\n        }\n      }\n    }\n  }\n\n  return targetComponent;\n}\n"],"names":[],"mappings":"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"}

package/build/cjs/reactrouter-compat-utils/instrumentation.js

@@ -21,6 +21,8 @@ let _matchRoutes;
 
 let _enableAsyncRouteHandlers = false;
 let _lazyRouteTimeout = 3000;
+let _lazyRouteManifest;
+let _basename = '';
 
 const CLIENTS_WITH_INSTRUMENT_NAVIGATION = new WeakSet();
 
@@ -282,7 +284,9 @@ function updateNavigationSpan(
       allRoutes,
       allRoutes,
       (currentBranches ) || [],
-      '',
+      _basename,
+      _lazyRouteManifest,
+      _enableAsyncRouteHandlers,
     );
 
     const currentSource = spanJson.data?.[core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
@@ -446,6 +450,9 @@ function createV6CompatibleWrapCreateBrowserRouter
       });
     }
 
+    // Store basename for use in updateNavigationSpan
+    _basename = basename || '';
+
     setupRouterSubscription(router, routes, version, basename, activeRootSpan);
 
     return router;
@@ -537,6 +544,9 @@ function createV6CompatibleWrapCreateMemoryRouter
       });
     }
 
+    // Store basename for use in updateNavigationSpan
+    _basename = basename || '';
+
     setupRouterSubscription(router, routes, version, basename, memoryActiveRootSpan);
 
     return router;
@@ -563,6 +573,7 @@ function createReactRouterV6CompatibleTracingIntegration(
     instrumentPageLoad = true,
     instrumentNavigation = true,
     lazyRouteTimeout,
+    lazyRouteManifest,
   } = options;
 
   return {
@@ -606,6 +617,7 @@ function createReactRouterV6CompatibleTracingIntegration(
       _matchRoutes = matchRoutes;
       _createRoutesFromChildren = createRoutesFromChildren;
       _enableAsyncRouteHandlers = enableAsyncRouteHandlers;
+      _lazyRouteManifest = lazyRouteManifest;
 
       // Initialize the router utils with the required dependencies
       utils.initializeRouterUtils(matchRoutes, stripBasename || false);
@@ -693,33 +705,6 @@ function createV6CompatibleWrapUseRoutes(origUseRoutes, version) {
     return React.createElement(SentryRoutes, { routes: routes, locationArg: locationArg,} );
   };
 }
-
-/**
- * Helper to update the current span (navigation or pageload) with lazy-loaded route information.
- * Reduces code duplication in patchRoutesOnNavigation wrapper.
- */
-function updateSpanWithLazyRoutes(pathname, forceUpdate) {
-  const currentActiveRootSpan = utils.getActiveRootSpan();
-  if (!currentActiveRootSpan) {
-    return;
-  }
-
-  const spanOp = (core.spanToJSON(currentActiveRootSpan) ).op;
-  const location = { pathname, search: '', hash: '', state: null, key: 'default' };
-  const routesArray = Array.from(allRoutes);
-
-  if (spanOp === 'navigation') {
-    updateNavigationSpan(currentActiveRootSpan, location, routesArray, forceUpdate, _matchRoutes);
-  } else if (spanOp === 'pageload') {
-    updatePageloadTransaction({
-      activeRootSpan: currentActiveRootSpan,
-      location,
-      routes: routesArray,
-      allRoutes: routesArray,
-    });
-  }
-}
-
 function wrapPatchRoutesOnNavigation(
   opts,
   isMemoryRouter = false,
@@ -774,9 +759,25 @@ function wrapPatchRoutesOnNavigation(
               }
             }
 
-            // Only update if we have a valid targetPath (patchRoutesOnNavigation can be called without path)
-            if (targetPath) {
-              updateSpanWithLazyRoutes(targetPath, true);
+            // Use the captured activeRootSpan instead of getActiveRootSpan() to avoid race conditions
+            // where user navigates away during lazy route loading and we'd update the wrong span
+            const spanJson = activeRootSpan ? core.spanToJSON(activeRootSpan) : undefined;
+            // Only update if we have a valid targetPath (patchRoutesOnNavigation can be called without path),
+            // the captured span exists, hasn't ended, and is a navigation span
+            if (
+              targetPath &&
+              activeRootSpan &&
+              spanJson &&
+              !spanJson.timestamp && // Span hasn't ended yet
+              spanJson.op === 'navigation'
+            ) {
+              updateNavigationSpan(
+                activeRootSpan,
+                { pathname: targetPath, search: '', hash: '', state: null, key: 'default' },
+                Array.from(allRoutes),
+                true,
+                _matchRoutes,
+              );
             }
             return originalPatch(routeId, children);
           };
@@ -798,9 +799,28 @@ function wrapPatchRoutesOnNavigation(
           }
         }
 
-        const pathname = isMemoryRouter ? targetPath : targetPath || browser.WINDOW.location?.pathname;
-        if (pathname) {
-          updateSpanWithLazyRoutes(pathname, false);
+        // Use the captured activeRootSpan instead of getActiveRootSpan() to avoid race conditions
+        // where user navigates away during lazy route loading and we'd update the wrong span
+        const spanJson = activeRootSpan ? core.spanToJSON(activeRootSpan) : undefined;
+        if (
+          activeRootSpan &&
+          spanJson &&
+          !spanJson.timestamp && // Span hasn't ended yet
+          spanJson.op === 'navigation'
+        ) {
+          // Use targetPath consistently - don't fall back to WINDOW.location which may have changed
+          // if the user navigated away during async loading
+          const pathname = targetPath;
+
+          if (pathname) {
+            updateNavigationSpan(
+              activeRootSpan,
+              { pathname, search: '', hash: '', state: null, key: 'default' },
+              Array.from(allRoutes),
+              false,
+              _matchRoutes,
+            );
+          }
         }
 
         return result;
@@ -839,6 +859,8 @@ function handleNavigation(opts
       allRoutes || routes,
       branches ,
       basename,
+      _lazyRouteManifest,
+      _enableAsyncRouteHandlers,
     );
 
     const locationKey = computeLocationKey(location);
@@ -973,6 +995,8 @@ function updatePageloadTransaction({
       allRoutes || routes,
       branches,
       basename,
+      _lazyRouteManifest,
+      _enableAsyncRouteHandlers,
     );
 
     core.getCurrentScope().setTransactionName(name || '/');
@@ -1060,7 +1084,15 @@ function tryUpdateSpanNameBeforeEnd(
       return;
     }
 
-    const [name, source] = utils.resolveRouteNameAndSource(location, routesToUse, routesToUse, branches, basename);
+    const [name, source] = utils.resolveRouteNameAndSource(
+      location,
+      routesToUse,
+      routesToUse,
+      branches,
+      basename,
+      _lazyRouteManifest,
+      _enableAsyncRouteHandlers,
+    );
 
     const isImprovement = shouldUpdateWildcardSpanName(currentName, currentSource, name, source, true);
     const spanNotEnded = spanType === 'pageload' || !spanJson.timestamp;