Clean up more

Author: onurtemizkan

packages/react/src/reactrouter-compat-utils/index.ts

@@ -17,8 +17,6 @@ export {
 // Utility exports
 export {
   initializeRouterUtils,
-  getGlobalLocation,
-  getGlobalPathname,
   prefixWithSlash,
   rebuildRoutePathFromAllRoutes,
   locationIsInsideDescendantRoute,

packages/react/src/reactrouter-compat-utils/instrumentation.tsx

@@ -6,6 +6,7 @@ import {
   browserTracingIntegration,
   startBrowserTracingNavigationSpan,
   startBrowserTracingPageLoadSpan,
+  WINDOW,
 } from '@sentry/browser';
 import type { Client, Integration, Span, TransactionSource } from '@sentry/core';
 import {
@@ -41,8 +42,6 @@ import type {
 } from '../types';
 import { checkRouteForAsyncHandler } from './lazy-routes';
 import {
-  getGlobalLocation,
-  getGlobalPathname,
   getNormalizedName,
   initializeRouterUtils,
   locationIsInsideDescendantRoute,
@@ -138,7 +137,12 @@ export function processResolvedRoutes(
     // Try to use the provided location first, then fall back to global window location if needed
     let location = currentLocation;
     if (!location) {
-      location = getGlobalLocation();
+      if (typeof WINDOW !== 'undefined') {
+        const globalLocation = WINDOW.location;
+        if (globalLocation) {
+          location = { pathname: globalLocation.pathname };
+        }
+      }
     }
 
     if (location) {
@@ -417,7 +421,7 @@ export function createReactRouterV6CompatibleTracingIntegration(
     afterAllSetup(client) {
       integration.afterAllSetup(client);
 
-      const initPathName = getGlobalPathname();
+      const initPathName = WINDOW.location?.pathname;
       if (instrumentPageLoad && initPathName) {
         startBrowserTracingPageLoadSpan(client, {
           name: initPathName,
@@ -550,7 +554,7 @@ function wrapPatchRoutesOnNavigation(
       if (activeRootSpan && (spanToJSON(activeRootSpan) as { op?: string }).op === 'navigation') {
         // For memory routers, we don't have a reliable way to get the current pathname
         // without accessing window.location, so we'll use targetPath for both cases
-        const pathname = targetPath || (isMemoryRouter ? getGlobalPathname() : undefined);
+        const pathname = targetPath || (isMemoryRouter ? WINDOW.location?.pathname : undefined);
         if (pathname) {
           updateNavigationSpan(
             activeRootSpan,

packages/react/src/reactrouter-compat-utils/utils.ts

@@ -1,4 +1,3 @@
-import { WINDOW } from '@sentry/browser';
 import type { TransactionSource } from '@sentry/core';
 import type { Location, MatchRoutes, RouteMatch, RouteObject } from '../types';
 
@@ -15,31 +14,6 @@ export function initializeRouterUtils(matchRoutes: MatchRoutes, stripBasename: b
   _stripBasename = stripBasename;
 }
 
-/**
- * Gets the current location from the window object in browser environments.
- * Returns undefined if window is not available.
- */
-export function getGlobalLocation(): Location | undefined {
-  if (typeof WINDOW !== 'undefined') {
-    const globalLocation = WINDOW.location;
-    if (globalLocation) {
-      return { pathname: globalLocation.pathname };
-    }
-  }
-  return undefined;
-}
-
-/**
- * Gets the pathname from the window object in browser environments.
- * Returns undefined if window is not available.
- */
-export function getGlobalPathname(): string | undefined {
-  if (typeof WINDOW !== 'undefined') {
-    return WINDOW.location?.pathname;
-  }
-  return undefined;
-}
-
 // Helper functions
 function pickPath(match: RouteMatch): string {
   return trimWildcard(match.route.path || '');

packages/react/test/reactrouter-compat-utils/utils.test.ts

@@ -1,7 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import {
-  getGlobalLocation,
-  getGlobalPathname,
   getNormalizedName,
   getNumberOfUrlSegments,
   initializeRouterUtils,
@@ -59,20 +57,6 @@ describe('reactrouter-compat-utils/utils', () => {
     });
   });
 
-  describe('getGlobalLocation', () => {
-    it('should return location with pathname when WINDOW is available', () => {
-      const result = getGlobalLocation();
-      expect(result).toEqual({ pathname: '/test/path' });
-    });
-  });
-
-  describe('getGlobalPathname', () => {
-    it('should return pathname when WINDOW is available', () => {
-      const result = getGlobalPathname();
-      expect(result).toBe('/test/path');
-    });
-  });
-
   describe('prefixWithSlash', () => {
     it('should add slash to string without leading slash', () => {
       expect(prefixWithSlash('path')).toBe('/path');