@tanstack/react-router 1.92.11 → 1.93.0

package/dist/cjs/router.d.cts

@@ -554,20 +554,24 @@ export declare class Router<in out TRouteTree extends AnyRoute, in out TTrailing
     buildAndCommitLocation: ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, href, ...rest }?: BuildNextOptions & CommitLocationOptions) => Promise<void>;
     navigate: NavigateFn;
     latestLoadPromise: undefined | Promise<void>;
-    load: () => Promise<void>;
+    load: (opts?: {
+        sync?: boolean;
+    }) => Promise<void>;
     startViewTransition: (fn: () => Promise<void>) => void;
     updateMatch: (id: string, updater: (match: AnyRouteMatch) => AnyRouteMatch) => AnyRouteMatch;
     getMatch: (matchId: string) => import('./Matches.cjs').RouteMatch<any, any, any, any, any, any, any> | undefined;
-    loadMatches: ({ location, matches, preload: allPreload, onReady, updateMatch, }: {
+    loadMatches: ({ location, matches, preload: allPreload, onReady, updateMatch, sync, }: {
         location: ParsedLocation;
         matches: Array<AnyRouteMatch>;
         preload?: boolean;
         onReady?: () => Promise<void>;
         updateMatch?: (id: string, updater: (match: AnyRouteMatch) => AnyRouteMatch) => void;
         getMatch?: (matchId: string) => AnyRouteMatch | undefined;
+        sync?: boolean;
     }) => Promise<Array<MakeRouteMatch>>;
     invalidate: <TRouter extends AnyRouter = this>(opts?: {
         filter?: (d: MakeRouteMatchUnion<TRouter>) => boolean;
+        sync?: boolean;
     }) => Promise<void>;
     resolveRedirect: (err: AnyRedirect) => ResolvedRedirect;
     clearCache: <TRouter extends AnyRouter = this>(opts?: {

package/dist/esm/router.d.ts

@@ -554,20 +554,24 @@ export declare class Router<in out TRouteTree extends AnyRoute, in out TTrailing
     buildAndCommitLocation: ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, href, ...rest }?: BuildNextOptions & CommitLocationOptions) => Promise<void>;
     navigate: NavigateFn;
     latestLoadPromise: undefined | Promise<void>;
-    load: () => Promise<void>;
+    load: (opts?: {
+        sync?: boolean;
+    }) => Promise<void>;
     startViewTransition: (fn: () => Promise<void>) => void;
     updateMatch: (id: string, updater: (match: AnyRouteMatch) => AnyRouteMatch) => AnyRouteMatch;
     getMatch: (matchId: string) => import('./Matches.js').RouteMatch<any, any, any, any, any, any, any> | undefined;
-    loadMatches: ({ location, matches, preload: allPreload, onReady, updateMatch, }: {
+    loadMatches: ({ location, matches, preload: allPreload, onReady, updateMatch, sync, }: {
         location: ParsedLocation;
         matches: Array<AnyRouteMatch>;
         preload?: boolean;
         onReady?: () => Promise<void>;
         updateMatch?: (id: string, updater: (match: AnyRouteMatch) => AnyRouteMatch) => void;
         getMatch?: (matchId: string) => AnyRouteMatch | undefined;
+        sync?: boolean;
     }) => Promise<Array<MakeRouteMatch>>;
     invalidate: <TRouter extends AnyRouter = this>(opts?: {
         filter?: (d: MakeRouteMatchUnion<TRouter>) => boolean;
+        sync?: boolean;
     }) => Promise<void>;
     resolveRedirect: (err: AnyRedirect) => ResolvedRedirect;
     clearCache: <TRouter extends AnyRouter = this>(opts?: {

package/dist/esm/router.js

@@ -615,7 +615,7 @@ class Router {
         to
       });
     };
-    this.load = async () => {
+    this.load = async (opts) => {
       this.latestLocation = this.parseLocation(this.latestLocation);
       let redirect;
       let notFound;
@@ -661,6 +661,7 @@ class Router {
               hrefChanged
             });
             await this.loadMatches({
+              sync: opts == null ? void 0 : opts.sync,
               matches: pendingMatches,
               location: next,
               // eslint-disable-next-line @typescript-eslint/require-await
@@ -792,7 +793,8 @@ class Router {
       matches,
       preload: allPreload,
       onReady,
-      updateMatch = this.updateMatch
+      updateMatch = this.updateMatch,
+      sync
     }) => {
       let firstBadMatchIndex;
       let rendered = false;
@@ -938,8 +940,7 @@ class Router {
                       pendingTimeout,
                       context: {
                         ...getParentMatchContext(),
-                        ...prev.__routeContext,
-                        ...prev.__beforeLoadContext
+                        ...prev.__routeContext
                       }
                     }));
                     const { search, params, context, cause } = this.getMatch(matchId);
@@ -1002,7 +1003,8 @@ class Router {
                 matchPromises.push(
                   (async () => {
                     const { loaderPromise: prevLoaderPromise } = this.getMatch(matchId);
-                    let loaderRunningAsync = false;
+                    let loaderShouldRunAsync = false;
+                    let loaderIsRunningAsync = false;
                     if (prevLoaderPromise) {
                       await prevLoaderPromise;
                     } else {
@@ -1126,30 +1128,39 @@ class Router {
                         }
                       };
                       const { status, invalid } = this.getMatch(matchId);
-                      loaderRunningAsync = status === "success" && (invalid || (shouldReload ?? age > staleAge));
+                      loaderShouldRunAsync = status === "success" && (invalid || (shouldReload ?? age > staleAge));
                       if (preload && route.options.preload === false) {
-                      } else if (loaderRunningAsync) {
-                        ;
+                      } else if (loaderShouldRunAsync && !sync) {
+                        loaderIsRunningAsync = true;
                         (async () => {
                           try {
                             await runLoader();
+                            const { loaderPromise, loadPromise } = this.getMatch(matchId);
+                            loaderPromise == null ? void 0 : loaderPromise.resolve();
+                            loadPromise == null ? void 0 : loadPromise.resolve();
+                            updateMatch(matchId, (prev) => ({
+                              ...prev,
+                              loaderPromise: void 0
+                            }));
                           } catch (err) {
                             if (isResolvedRedirect(err)) {
                               await this.navigate(err);
                             }
                           }
                         })();
-                      } else if (status !== "success") {
+                      } else if (status !== "success" || loaderShouldRunAsync && sync) {
                         await runLoader();
                       }
+                    }
+                    if (!loaderIsRunningAsync) {
                       const { loaderPromise, loadPromise } = this.getMatch(matchId);
                       loaderPromise == null ? void 0 : loaderPromise.resolve();
                       loadPromise == null ? void 0 : loadPromise.resolve();
                     }
                     updateMatch(matchId, (prev) => ({
                       ...prev,
-                      isFetching: loaderRunningAsync ? prev.isFetching : false,
-                      loaderPromise: void 0,
+                      isFetching: loaderIsRunningAsync ? prev.isFetching : false,
+                      loaderPromise: loaderIsRunningAsync ? prev.loaderPromise : void 0,
                       invalid: false
                     }));
                     return this.getMatch(matchId);
@@ -1195,7 +1206,7 @@ class Router {
           pendingMatches: (_a = s.pendingMatches) == null ? void 0 : _a.map(invalidate)
         };
       });
-      return this.load();
+      return this.load({ sync: opts == null ? void 0 : opts.sync });
     };
     this.resolveRedirect = (err) => {
       const redirect = err;