fix: resolve promises before setting them to undefined (#4434)

Author: schiller-manuel

e2e/solid-router/basic-file-based/tests/redirect.spec.ts

@@ -126,7 +126,7 @@ test.describe('redirects', () => {
     })
   })
 
-  test.skip('regression test for #3097', async ({ page }) => {
+  test('regression test for #3097', async ({ page }) => {
     await page.goto(`/redirect/preload/first`)
     const link = page.getByTestId(`link`)
     await link.focus()

packages/router-core/src/router.ts

@@ -2055,6 +2055,9 @@ export class RouterCore<
           }
         }
 
+        match.beforeLoadPromise?.resolve()
+        match.loaderPromise?.resolve()
+
         updateMatch(match.id, (prev) => ({
           ...prev,
           status: isRedirect(err)
@@ -2072,8 +2075,6 @@ export class RouterCore<
           ;(err as any).routeId = match.routeId
         }
 
-        match.beforeLoadPromise?.resolve()
-        match.loaderPromise?.resolve()
         match.loadPromise?.resolve()
 
         if (isRedirect(err)) {
@@ -2180,6 +2181,9 @@ export class RouterCore<
                   }, pendingMs)
                 }
 
+                console.log(`Match ${matchId} is already loading`, {
+                  match: this.getMatch(matchId),
+                })
                 // Wait for the beforeLoad to resolve before we continue
                 await existingMatch.beforeLoadPromise
                 executeBeforeLoad = this.getMatch(matchId)!.status === 'error'