@tanstack/react-router 1.97.14 → 1.97.17

package/dist/esm/router.js

@@ -1,15 +1,12 @@
 import { createMemoryHistory, createBrowserHistory, parseHref } from "@tanstack/history";
 import { Store, batch } from "@tanstack/react-store";
 import invariant from "tiny-invariant";
-import warning from "tiny-warning";
-import jsesc from "jsesc";
 import { rootRouteId } from "./root.js";
 import { defaultStringifySearch, defaultParseSearch } from "./searchParams.js";
 import { pick, createControlledPromise, deepEqual, replaceEqualDeep, last, functionalUpdate } from "./utils.js";
 import { trimPath, trimPathLeft, parsePathname, resolvePath, cleanPath, trimPathRight, matchPathname, interpolatePath, joinPaths } from "./path.js";
 import { isResolvedRedirect, isRedirect } from "./redirects.js";
 import { isNotFound } from "./not-found.js";
-import { defaultTransformer } from "./transformer.js";
 const componentTypes = [
   "component",
   "errorComponent",
@@ -374,7 +371,7 @@ class Router {
                   }) ?? {}
                 };
               }
-            } catch (e) {
+            } catch {
             }
           });
           search = validatedSearch;
@@ -423,7 +420,7 @@ class Router {
                       ) ?? {}
                     };
                     return validatedSearch;
-                  } catch (e) {
+                  } catch {
                   }
                 };
                 middlewares.push(validate);
@@ -964,17 +961,7 @@ class Router {
                       cause: preload ? "preload" : cause,
                       matches
                     };
-                    let beforeLoadContext = await ((_c = (_b = route.options).beforeLoad) == null ? void 0 : _c.call(_b, beforeLoadFnContext)) ?? {};
-                    if (this.serializeLoaderData) {
-                      beforeLoadContext = this.serializeLoaderData(
-                        "__beforeLoadContext",
-                        beforeLoadContext,
-                        {
-                          router: this,
-                          match: this.getMatch(matchId)
-                        }
-                      );
-                    }
+                    const beforeLoadContext = await ((_c = (_b = route.options).beforeLoad) == null ? void 0 : _c.call(_b, beforeLoadFnContext)) ?? {};
                     if (isRedirect(beforeLoadContext) || isNotFound(beforeLoadContext)) {
                       handleSerialError(index, beforeLoadContext, "BEFORE_LOAD");
                     }
@@ -1054,7 +1041,7 @@ class Router {
                         preload: !!preload && !this.state.matches.find((d) => d.id === matchId)
                       }));
                       const runLoader = async () => {
-                        var _a2, _b2, _c2, _d, _e, _f, _g, _h;
+                        var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i;
                         try {
                           const potentialPendingMinPromise = async () => {
                             const latestMatch = this.getMatch(matchId);
@@ -1068,17 +1055,7 @@ class Router {
                               ...prev,
                               isFetching: "loader"
                             }));
-                            let loaderData = await ((_b2 = (_a2 = route.options).loader) == null ? void 0 : _b2.call(_a2, getLoaderContext()));
-                            if (this.serializeLoaderData) {
-                              loaderData = this.serializeLoaderData(
-                                "loaderData",
-                                loaderData,
-                                {
-                                  router: this,
-                                  match: this.getMatch(matchId)
-                                }
-                              );
-                            }
+                            const loaderData = await ((_b2 = (_a2 = route.options).loader) == null ? void 0 : _b2.call(_a2, getLoaderContext()));
                             handleRedirectAndNotFound(
                               this.getMatch(matchId),
                               loaderData
@@ -1129,6 +1106,10 @@ class Router {
                               isFetching: false
                             }));
                           }
+                          (_i = this.serverSsr) == null ? void 0 : _i.onMatchSettled({
+                            router: this,
+                            match: this.getMatch(matchId)
+                          });
                           await route._componentsPromise;
                         } catch (err) {
                           updateMatch(matchId, (prev) => ({
@@ -1369,104 +1350,6 @@ class Router {
       }
       return match;
     };
-    this.dehydrate = () => {
-      var _a;
-      const pickError = ((_a = this.options.errorSerializer) == null ? void 0 : _a.serialize) ?? defaultSerializeError;
-      return {
-        state: {
-          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
-      };
-    };
-    this.hydrate = () => {
-      var _a, _b, _c;
-      let ctx;
-      if (typeof document !== "undefined") {
-        ctx = this.options.transformer.parse((_a = window.__TSR__) == null ? void 0 : _a.dehydrated);
-      }
-      invariant(
-        ctx,
-        "Expected to find a dehydrated data on window.__TSR__.dehydrated... but we did not. Please file an issue!"
-      );
-      this.dehydratedData = ctx.payload;
-      (_c = (_b = this.options).hydrate) == null ? void 0 : _c.call(_b, ctx.payload);
-      const dehydratedState = ctx.router.state;
-      const matches = this.matchRoutes(this.state.location).map((match) => {
-        const dehydratedMatch = dehydratedState.dehydratedMatches.find(
-          (d) => d.id === match.id
-        );
-        invariant(
-          dehydratedMatch,
-          `Could not find a client-side match for dehydrated match with id: ${match.id}!`
-        );
-        return {
-          ...match,
-          ...dehydratedMatch
-        };
-      });
-      this.__store.setState((s) => {
-        return {
-          ...s,
-          matches
-        };
-      });
-      this.manifest = ctx.router.manifest;
-    };
-    this.injectedHtml = [];
-    this.injectHtml = (html) => {
-      const cb = () => {
-        this.injectedHtml = this.injectedHtml.filter((d) => d !== cb);
-        return html;
-      };
-      this.injectedHtml.push(cb);
-    };
-    this.injectScript = (script, opts) => {
-      this.injectHtml(
-        `<script class='tsr-once'>${script}${process.env.NODE_ENV === "development" && ((opts == null ? void 0 : opts.logScript) ?? true) ? `; console.info(\`Injected From Server:
-${jsesc(script, { quotes: "backtick" })}\`)` : ""}; if (typeof __TSR__ !== 'undefined') __TSR__.cleanScripts()<\/script>`
-      );
-    };
-    this.streamedKeys = /* @__PURE__ */ new Set();
-    this.getStreamedValue = (key) => {
-      var _a;
-      if (this.isServer) {
-        return void 0;
-      }
-      const streamedValue = (_a = window.__TSR__) == null ? void 0 : _a.streamedValues[key];
-      if (!streamedValue) {
-        return;
-      }
-      if (!streamedValue.parsed) {
-        streamedValue.parsed = this.options.transformer.parse(streamedValue.value);
-      }
-      return streamedValue.parsed;
-    };
-    this.streamValue = (key, value) => {
-      var _a;
-      warning(
-        !this.streamedKeys.has(key),
-        "Key has already been streamed: " + key
-      );
-      this.streamedKeys.add(key);
-      this.injectScript(
-        `__TSR__.streamedValues['${key}'] = { value: ${(_a = this.serializer) == null ? void 0 : _a.call(this, this.options.transformer.stringify(value))}}`
-      );
-    };
     this._handleNotFound = (matches, err, {
       updateMatch = this.updateMatch
     } = {}) => {
@@ -1510,11 +1393,10 @@ ${jsesc(script, { quotes: "backtick" })}\`)` : ""}; if (typeof __TSR__ !== 'unde
       caseSensitive: options.caseSensitive ?? false,
       notFoundMode: options.notFoundMode ?? "fuzzy",
       stringifySearch: options.stringifySearch ?? defaultStringifySearch,
-      parseSearch: options.parseSearch ?? defaultParseSearch,
-      transformer: options.transformer ?? defaultTransformer
+      parseSearch: options.parseSearch ?? defaultParseSearch
     });
     if (typeof document !== "undefined") {
-      window.__TSR__ROUTER__ = this;
+      window.__TSR_ROUTER__ = this;
     }
   }
   get state() {