@tanstack/router-core 1.131.17 → 1.131.18

package/dist/esm/router.js

@@ -1113,10 +1113,12 @@ class RouterCore {
               this.getMatch(matchId),
               loaderData
             );
-            innerLoadContext.updateMatch(matchId, (prev) => ({
-              ...prev,
-              loaderData
-            }));
+            if (loaderData !== void 0) {
+              innerLoadContext.updateMatch(matchId, (prev) => ({
+                ...prev,
+                loaderData
+              }));
+            }
           }
           if (route._lazyPromise) await route._lazyPromise;
           const headResult = this.executeHead(innerLoadContext, matchId, route);
@@ -1201,9 +1203,9 @@ class RouterCore {
           return this.getMatch(matchId);
         }
         await prevMatch._nonReactive.loaderPromise;
-        const match = this.getMatch(matchId);
-        if (match.error) {
-          this.handleRedirectAndNotFound(innerLoadContext, match, match.error);
+        const match2 = this.getMatch(matchId);
+        if (match2.error) {
+          this.handleRedirectAndNotFound(innerLoadContext, match2, match2.error);
         }
       } else {
         const age = Date.now() - this.getMatch(matchId).updatedAt;
@@ -1213,13 +1215,15 @@ class RouterCore {
         const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(
           this.getLoaderContext(innerLoadContext, matchId, index, route)
         ) : shouldReloadOption;
-        innerLoadContext.updateMatch(matchId, (prev) => {
-          prev._nonReactive.loaderPromise = createControlledPromise();
-          return {
+        const nextPreload = !!preload && !this.state.matches.some((d) => d.id === matchId);
+        const match2 = this.getMatch(matchId);
+        match2._nonReactive.loaderPromise = createControlledPromise();
+        if (nextPreload !== match2.preload) {
+          innerLoadContext.updateMatch(matchId, (prev) => ({
             ...prev,
-            preload: !!preload && !this.state.matches.some((d) => d.id === matchId)
-          };
-        });
+            preload: nextPreload
+          }));
+        }
         const { status, invalid } = this.getMatch(matchId);
         loaderShouldRunAsync = status === "success" && (invalid || (shouldReload ?? age > staleAge));
         if (preload && route.options.preload === false) ;
@@ -1229,10 +1233,10 @@ class RouterCore {
             var _a2, _b2;
             try {
               await this.runLoader(innerLoadContext, matchId, index, route);
-              const match = this.getMatch(matchId);
-              (_a2 = match._nonReactive.loaderPromise) == null ? void 0 : _a2.resolve();
-              (_b2 = match._nonReactive.loadPromise) == null ? void 0 : _b2.resolve();
-              match._nonReactive.loaderPromise = void 0;
+              const match3 = this.getMatch(matchId);
+              (_a2 = match3._nonReactive.loaderPromise) == null ? void 0 : _a2.resolve();
+              (_b2 = match3._nonReactive.loadPromise) == null ? void 0 : _b2.resolve();
+              match3._nonReactive.loaderPromise = void 0;
             } catch (err) {
               if (isRedirect(err)) {
                 await this.navigate(err.options);
@@ -1252,22 +1256,23 @@ class RouterCore {
           }
         }
       }
+      const match = this.getMatch(matchId);
       if (!loaderIsRunningAsync) {
-        const match = this.getMatch(matchId);
         (_a = match._nonReactive.loaderPromise) == null ? void 0 : _a.resolve();
         (_b = match._nonReactive.loadPromise) == null ? void 0 : _b.resolve();
       }
-      innerLoadContext.updateMatch(matchId, (prev) => {
-        clearTimeout(prev._nonReactive.pendingTimeout);
-        prev._nonReactive.pendingTimeout = void 0;
-        if (!loaderIsRunningAsync) prev._nonReactive.loaderPromise = void 0;
-        prev._nonReactive.dehydrated = void 0;
-        return {
+      clearTimeout(match._nonReactive.pendingTimeout);
+      match._nonReactive.pendingTimeout = void 0;
+      if (!loaderIsRunningAsync) match._nonReactive.loaderPromise = void 0;
+      match._nonReactive.dehydrated = void 0;
+      const nextIsFetching = loaderIsRunningAsync ? match.isFetching : false;
+      if (nextIsFetching !== match.isFetching || match.invalid !== false) {
+        innerLoadContext.updateMatch(matchId, (prev) => ({
           ...prev,
-          isFetching: loaderIsRunningAsync ? prev.isFetching : false,
+          isFetching: nextIsFetching,
           invalid: false
-        };
-      });
+        }));
+      }
       return this.getMatch(matchId);
     };
     this.loadMatches = async (baseContext) => {