@tanstack/react-router 1.86.1 → 1.87.1

package/dist/cjs/router.cjs

@@ -763,16 +763,19 @@ class Router {
       let updated;
       const isPending = (_a = this.state.pendingMatches) == null ? void 0 : _a.find((d) => d.id === id);
       const isMatched = this.state.matches.find((d) => d.id === id);
-      const matchesKey = isPending ? "pendingMatches" : isMatched ? "matches" : "cachedMatches";
-      this.__store.setState((s) => {
-        var _a2;
-        return {
-          ...s,
-          [matchesKey]: (_a2 = s[matchesKey]) == null ? void 0 : _a2.map(
-            (d) => d.id === id ? updated = updater(d) : d
-          )
-        };
-      });
+      const isCached = this.state.cachedMatches.find((d) => d.id === id);
+      const matchesKey = isPending ? "pendingMatches" : isMatched ? "matches" : isCached ? "cachedMatches" : "";
+      if (matchesKey) {
+        this.__store.setState((s) => {
+          var _a2;
+          return {
+            ...s,
+            [matchesKey]: (_a2 = s[matchesKey]) == null ? void 0 : _a2.map(
+              (d) => d.id === id ? updated = updater(d) : d
+            )
+          };
+        });
+      }
       return updated;
     };
     this.getMatch = (matchId) => {
@@ -785,7 +788,7 @@ class Router {
     this.loadMatches = async ({
       location,
       matches,
-      preload,
+      preload: allPreload,
       onReady,
       updateMatch = this.updateMatch
     }) => {
@@ -797,6 +800,9 @@ class Router {
           await (onReady == null ? void 0 : onReady());
         }
       };
+      const resolvePreload = (matchId) => {
+        return !!(allPreload && !this.state.matches.find((d) => d.id === matchId));
+      };
       if (!this.isServer && !this.state.matches.length) {
         triggerOnReady();
       }
@@ -872,7 +878,8 @@ class Router {
                 const parentMatchId = (_a = matches[index - 1]) == null ? void 0 : _a.id;
                 const route = this.looseRoutesById[routeId];
                 const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs;
-                const shouldPending = !!(onReady && !this.isServer && !preload && (route.options.loader || route.options.beforeLoad) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? this.options.defaultPendingComponent));
+                const shouldPending = !!(onReady && !this.isServer && !resolvePreload(matchId) && (route.options.loader || route.options.beforeLoad) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? this.options.defaultPendingComponent));
+                let executeBeforeLoad = true;
                 if (
                   // If we are in the middle of a load, either of these will be present
                   // (not to be confused with `loadPromise`, which is always defined)
@@ -887,7 +894,9 @@ class Router {
                     }, pendingMs);
                   }
                   await existingMatch.beforeLoadPromise;
-                } else {
+                  executeBeforeLoad = this.getMatch(matchId).status !== "success";
+                }
+                if (executeBeforeLoad) {
                   try {
                     updateMatch(matchId, (prev) => ({
                       ...prev,
@@ -928,11 +937,12 @@ class Router {
                       }
                     }));
                     const { search, params, context, cause } = this.getMatch(matchId);
+                    const preload = resolvePreload(matchId);
                     const beforeLoadFnContext = {
                       search,
                       abortController,
                       params,
-                      preload: !!preload,
+                      preload,
                       context,
                       location,
                       navigate: (opts) => this.navigate({ ...opts, _fromLocation: location }),
@@ -1000,20 +1010,22 @@ class Router {
                           context,
                           cause
                         } = this.getMatch(matchId);
+                        const preload2 = resolvePreload(matchId);
                         return {
                           params,
                           deps: loaderDeps,
-                          preload: !!preload,
+                          preload: !!preload2,
                           parentMatchPromise,
                           abortController,
                           context,
                           location,
                           navigate: (opts) => this.navigate({ ...opts, _fromLocation: location }),
-                          cause: preload ? "preload" : cause,
+                          cause: preload2 ? "preload" : cause,
                           route
                         };
                       };
                       const age = Date.now() - this.getMatch(matchId).updatedAt;
+                      const preload = resolvePreload(matchId);
                       const staleAge = preload ? route.options.preloadStaleTime ?? this.options.defaultPreloadStaleTime ?? 3e4 : route.options.staleTime ?? this.options.defaultStaleTime ?? 0;
                       const shouldReloadOption = route.options.shouldReload;
                       const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(getLoaderContext()) : shouldReloadOption;
@@ -1169,7 +1181,7 @@ class Router {
         await triggerOnReady();
       } catch (err) {
         if (redirects.isRedirect(err) || notFound.isNotFound(err)) {
-          if (notFound.isNotFound(err) && !preload) {
+          if (notFound.isNotFound(err) && !allPreload) {
             await triggerOnReady();
           }
           throw err;
@@ -1245,16 +1257,18 @@ class Router {
         preload: true,
         dest: opts
       });
-      const loadedMatchIds = Object.fromEntries(
-        [
-          ...this.state.matches,
-          ...this.state.pendingMatches ?? [],
-          ...this.state.cachedMatches
-        ].map((d) => [d.id, true])
+      const activeMatchIds = new Set(
+        [...this.state.matches, ...this.state.pendingMatches ?? []].map(
+          (d) => d.id
+        )
       );
+      const loadedMatchIds = /* @__PURE__ */ new Set([
+        ...activeMatchIds,
+        ...this.state.cachedMatches.map((d) => d.id)
+      ]);
       this.__store.batch(() => {
         matches.forEach((match) => {
-          if (!loadedMatchIds[match.id]) {
+          if (!loadedMatchIds.has(match.id)) {
             this.__store.setState((s) => ({
               ...s,
               cachedMatches: [...s.cachedMatches, match]
@@ -1262,11 +1276,6 @@ class Router {
           }
         });
       });
-      const activeMatchIds = new Set(
-        [...this.state.matches, ...this.state.pendingMatches ?? []].map(
-          (d) => d.id
-        )
-      );
       try {
         matches = await this.loadMatches({
           matches,