fix(react-router): incorrectly returning undefined as `parentMatchP…

…romise` in the loader in the child route (#1546)
TanStack · May 3, 2024 · ded977f · ded977f
1 parent e659c25
commit ded977f
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts
@@ -1603,8 +1603,8 @@ export class Router<
             const validResolvedMatches = matches.slice(0, firstBadMatchIndex)
             const matchPromises: Array<Promise<any>> = []
 
-            await Promise.all(
-              validResolvedMatches.map(async (match, index) => {
+            validResolvedMatches.forEach((match, index) => {
+              const createValidateResolvedMatchPromise = async () => {
                 const parentMatchPromise = matchPromises[index - 1]
                 const route = this.looseRoutesById[match.routeId]!
 
@@ -1815,8 +1815,14 @@ export class Router<
                 if (match.status !== 'success') {
                   await fetchWithRedirectAndNotFound()
                 }
-              }),
-            )
+
+                return
+              }
+
+              matchPromises.push(createValidateResolvedMatchPromise())
+            })
+
+            await Promise.all(matchPromises)
 
             checkLatest()