From 82b07bbc805b4d98d95afd3cf6273c9fd36b287e Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Tue, 14 May 2024 10:49:42 +0000 Subject: [PATCH] fix(react): Set dependency-injected functions as early as possible --- packages/react/src/reactrouterv6.tsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/react/src/reactrouterv6.tsx b/packages/react/src/reactrouterv6.tsx index fb3f15aae3bf..000de2207b13 100644 --- a/packages/react/src/reactrouterv6.tsx +++ b/packages/react/src/reactrouterv6.tsx @@ -84,6 +84,14 @@ export function reactRouterV6BrowserTracingIntegration( return { ...integration, + setup() { + _useEffect = useEffect; + _useLocation = useLocation; + _useNavigationType = useNavigationType; + _matchRoutes = matchRoutes; + _createRoutesFromChildren = createRoutesFromChildren; + _stripBasename = stripBasename || false; + }, afterAllSetup(client) { integration.afterAllSetup(client); @@ -99,13 +107,6 @@ export function reactRouterV6BrowserTracingIntegration( }); } - _useEffect = useEffect; - _useLocation = useLocation; - _useNavigationType = useNavigationType; - _matchRoutes = matchRoutes; - _createRoutesFromChildren = createRoutesFromChildren; - _stripBasename = stripBasename || false; - if (instrumentNavigation) { CLIENTS_WITH_INSTRUMENT_NAVIGATION.push(client); }