@tanstack/react-router 1.39.8 → 1.41.0

package/dist/esm/router.js

@@ -50,7 +50,7 @@ class Router {
         }
       }
       if (
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        // eslint-disable-next-line ts/no-unnecessary-condition
         !this.history || this.options.history && this.options.history !== this.history
       ) {
         this.history = this.options.history ?? (typeof document !== "undefined" ? createBrowserHistory() : createMemoryHistory({
@@ -340,6 +340,7 @@ class Router {
           }
           match = {
             id: matchId,
+            index,
             routeId: route.id,
             params: routeParams,
             pathname: joinPaths([this.basepath, interpolatedPath]),
@@ -509,6 +510,7 @@ class Router {
     this.commitLocation = async ({
       startTransition,
       viewTransition,
+      ignoreBlocker,
       ...next
     }) => {
       const isSameState = () => {
@@ -547,7 +549,8 @@ class Router {
         this.shouldViewTransition = viewTransition;
         this.history[next.replace ? "replace" : "push"](
           nextHistory.href,
-          nextHistory.state
+          nextHistory.state,
+          { ignoreBlocker }
         );
       }
       this.resetNextScroll = next.resetScroll ?? true;
@@ -558,6 +561,7 @@ class Router {
       resetScroll,
       startTransition,
       viewTransition,
+      ignoreBlocker,
       ...rest
     } = {}) => {
       const location = this.buildLocation(rest);
@@ -566,7 +570,8 @@ class Router {
         startTransition,
         viewTransition,
         replace,
-        resetScroll
+        resetScroll,
+        ignoreBlocker
       });
     };
     this.navigate = ({ from, to, __isRedirect, ...rest }) => {
@@ -741,8 +746,7 @@ class Router {
         return updated;
       };
       const handleRedirectAndNotFound = (match, err) => {
-        if (isResolvedRedirect(err))
-          throw err;
+        if (isResolvedRedirect(err)) throw err;
         if (isRedirect(err) || isNotFound(err)) {
           updateMatch(match.id, (prev) => ({
             ...prev,
@@ -941,7 +945,13 @@ class Router {
                           })
                         );
                       }
-                      const loaderData = await loaderPromise;
+                      let loaderData = await loaderPromise;
+                      if (this.serializeLoaderData) {
+                        loaderData = this.serializeLoaderData(loaderData, {
+                          router: this,
+                          match
+                        });
+                      }
                       checkLatest();
                       handleRedirectAndNotFound(match, loaderData);
                       await potentialPendingMinPromise();
@@ -1156,29 +1166,26 @@ class Router {
       }
       return match;
     };
-    this.registeredDeferredsIds = /* @__PURE__ */ new Map();
-    this.registeredDeferreds = /* @__PURE__ */ new WeakMap();
-    this.getDeferred = (uid) => {
-      const token = this.registeredDeferredsIds.get(uid);
-      if (!token) {
-        return void 0;
-      }
-      return this.registeredDeferreds.get(token);
-    };
     this.dehydrate = () => {
       var _a;
       const pickError = ((_a = this.options.errorSerializer) == null ? void 0 : _a.serialize) ?? defaultSerializeError;
       return {
         state: {
-          dehydratedMatches: this.state.matches.map((d) => ({
-            ...pick(d, ["id", "status", "updatedAt", "loaderData"]),
-            // If an error occurs server-side during SSRing,
-            // send a small subset of the error to the client
-            error: d.error ? {
-              data: pickError(d.error),
-              __isServerError: true
-            } : void 0
-          }))
+          dehydratedMatches: this.state.matches.map((d) => {
+            return {
+              ...pick(d, ["id", "status", "updatedAt"]),
+              // If an error occurs server-side during SSRing,
+              // send a small subset of the error to the client
+              error: d.error ? {
+                data: pickError(d.error),
+                __isServerError: true
+              } : void 0
+              // NOTE: We don't send the loader data here, because
+              // there is a potential that it needs to be streamed.
+              // Instead, we render it next to the route match in the HTML
+              // which gives us the potential to stream it via suspense.
+            };
+          })
         },
         manifest: this.manifest
       };
@@ -1187,11 +1194,11 @@ class Router {
       var _a, _b, _c;
       let _ctx = __do_not_use_server_ctx;
       if (typeof document !== "undefined") {
-        _ctx = (_a = window.__TSR_DEHYDRATED__) == null ? void 0 : _a.data;
+        _ctx = (_a = window.__TSR__) == null ? void 0 : _a.dehydrated;
       }
       invariant(
         _ctx,
-        "Expected to find a __TSR_DEHYDRATED__ property on window... but we did not. Please file an issue!"
+        "Expected to find a dehydrated data on window.__TSR__.dehydrated... but we did not. Please file an issue!"
       );
       const ctx = this.options.transformer.parse(_ctx);
       this.dehydratedData = ctx.payload;