From 7bd67670681d646d69e69f9b491a60e1505176a2 Mon Sep 17 00:00:00 2001 From: Abdullah Date: Thu, 13 Feb 2025 17:20:19 -0500 Subject: [PATCH 1/2] Fix: Handler loader errors before navigating --- packages/react-router/lib/router/router.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 5c7fcb6a1a..fa90091a99 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -1091,7 +1091,7 @@ export function createRouter(init: RouterInit): Router { // in the normal navigation flow. For SSR it's expected that lazy modules are // resolved prior to router creation since we can't go into a fallback // UI for SSR'd apps - if (!state.initialized) { + if (!state.initialized && state.errors === null) { startNavigation(NavigationType.Pop, state.location, { initialHydration: true, }); From 42601c834c80b957cc537f225db7a7e858c671bb Mon Sep 17 00:00:00 2001 From: Abdullah Date: Thu, 13 Feb 2025 17:35:23 -0500 Subject: [PATCH 2/2] add to contributors --- contributors.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.yml b/contributors.yml index cc8df0b332..207c7d958b 100644 --- a/contributors.yml +++ b/contributors.yml @@ -23,6 +23,7 @@ - amitdahan - AmRo045 - amsal +- amubushar - andreasottosson-polestar - andreiduca - antonmontrezor