@tanstack/react-router 1.92.11 → 1.93.0

package/dist/cjs/router.cjs

@@ -617,7 +617,7 @@ class Router {
         to
       });
     };
-    this.load = async () => {
+    this.load = async (opts) => {
       this.latestLocation = this.parseLocation(this.latestLocation);
       let redirect;
       let notFound$1;
@@ -663,6 +663,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
@@ -794,7 +795,8 @@ class Router {
       matches,
       preload: allPreload,
       onReady,
-      updateMatch = this.updateMatch
+      updateMatch = this.updateMatch,
+      sync
     }) => {
       let firstBadMatchIndex;
       let rendered = false;
@@ -940,8 +942,7 @@ class Router {
                       pendingTimeout,
                       context: {
                         ...getParentMatchContext(),
-                        ...prev.__routeContext,
-                        ...prev.__beforeLoadContext
+                        ...prev.__routeContext
                       }
                     }));
                     const { search, params, context, cause } = this.getMatch(matchId);
@@ -1004,7 +1005,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 {
@@ -1128,30 +1130,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 (redirects.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);
@@ -1197,7 +1208,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;