@tanstack/router-core 1.123.0 → 1.123.2

package/dist/cjs/router.cjs

@@ -505,11 +505,9 @@ class RouterCore {
         location: this.latestLocation,
         pendingMatches,
         // If a cached moved to pendingMatches, remove it from cachedMatches
-        cachedMatches: s.cachedMatches.filter((cachedMatch) => {
-          const pendingMatch = pendingMatches.find((e) => e.id === cachedMatch.id);
-          if (!pendingMatch) return true;
-          return cachedMatch.status === "success" && (cachedMatch.isFetching || cachedMatch.loaderData !== void 0);
-        })
+        cachedMatches: s.cachedMatches.filter(
+          (d) => !pendingMatches.find((e) => e.id === d.id)
+        )
       }));
     };
     this.load = async (opts) => {
@@ -800,7 +798,12 @@ class RouterCore {
                     }, pendingMs);
                   }
                   await existingMatch.beforeLoadPromise;
-                  executeBeforeLoad = this.getMatch(matchId).status === "error";
+                  const match = this.getMatch(matchId);
+                  if (match.status === "error") {
+                    executeBeforeLoad = true;
+                  } else if (match.preload && (match.status === "redirected" || match.status === "notFound")) {
+                    handleRedirectAndNotFound(match, match.error);
+                  }
                 }
                 if (executeBeforeLoad) {
                   try {
@@ -892,11 +895,14 @@ class RouterCore {
               validResolvedMatches.forEach(({ id: matchId, routeId }, index) => {
                 matchPromises.push(
                   (async () => {
-                    const { loaderPromise: prevLoaderPromise } = this.getMatch(matchId);
                     let loaderShouldRunAsync = false;
                     let loaderIsRunningAsync = false;
-                    if (prevLoaderPromise) {
-                      await prevLoaderPromise;
+                    const prevMatch = this.getMatch(matchId);
+                    if (prevMatch.loaderPromise) {
+                      if (prevMatch.status === "success" && !sync && !prevMatch.preload) {
+                        return this.getMatch(matchId);
+                      }
+                      await prevMatch.loaderPromise;
                       const match = this.getMatch(matchId);
                       if (match.error) {
                         handleRedirectAndNotFound(match, match.error);