@tanstack/router-core 0.0.1-beta.166 → 0.0.1-beta.167

package/build/types/index.d.ts

@@ -188,9 +188,9 @@ interface RouterOptions<TRouteTree extends AnyRoute, TDehydrated extends Record<
     parseSearch?: SearchParser;
     defaultPreload?: false | 'intent';
     defaultPreloadDelay?: number;
-    defaultComponent?: RegisteredRouteComponent<RouteProps<unknown, AnySearchSchema, AnyPathParams, AnyContext, AnyContext>>;
-    defaultErrorComponent?: RegisteredRouteErrorComponent<ErrorRouteProps<AnySearchSchema, AnyPathParams, AnyContext, AnyContext>>;
-    defaultPendingComponent?: RegisteredRouteComponent<RouteProps<unknown, AnySearchSchema, AnyPathParams, AnyContext, AnyContext>>;
+    defaultComponent?: RegisteredRouteComponent<RegisteredRouteProps<unknown, AnySearchSchema, AnyPathParams, AnyContext, AnyContext>>;
+    defaultErrorComponent?: RegisteredRouteErrorComponent<RegisteredErrorRouteProps<AnySearchSchema, AnyPathParams, AnyContext, AnyContext>>;
+    defaultPendingComponent?: RegisteredRouteComponent<RegisteredRouteProps<unknown, AnySearchSchema, AnyPathParams, AnyContext, AnyContext>>;
     defaultMaxAge?: number;
     defaultGcMaxAge?: number;
     defaultPreloadMaxAge?: number;
@@ -246,8 +246,10 @@ interface MatchRouteOptions {
     includeSearch?: boolean;
     fuzzy?: boolean;
 }
-interface DehydratedRouterState extends Pick<RouterState, 'status' | 'location' | 'lastUpdated'> {
+interface DehydratedRouterState {
+    dehydratedMatches: DehydratedRouteMatch[];
 }
+type DehydratedRouteMatch = Pick<RouteMatch, 'fetchedAt' | 'invalid' | 'invalidAt' | 'id' | 'loaderData' | 'status' | 'updatedAt'>;
 interface DehydratedRouter {
     state: DehydratedRouterState;
 }
@@ -306,6 +308,7 @@ declare class Router<TRouteTree extends AnyRoute = AnyRoute, TDehydrated extends
     load: (opts?: {
         next?: ParsedLocation;
         throwOnError?: boolean;
+        __dehydratedMatches?: DehydratedRouteMatch[];
     }) => Promise<void>;
     getRoute: (id: string) => Route;
     preloadRoute: (navigateOpts?: BuildNextOptions & {
@@ -371,12 +374,27 @@ interface RegisterRouteComponent<TProps> {
 }
 interface RegisterRouteErrorComponent<TProps> {
 }
+interface RegisterRouteProps<TLoader = unknown, TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> {
+}
+interface RegisterErrorRouteProps<TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> {
+}
+interface RegisterPendingRouteProps<TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> {
+}
 type RegisteredRouteComponent<TProps> = RegisterRouteComponent<TProps> extends {
     RouteComponent: infer T;
 } ? T : (props: TProps) => unknown;
 type RegisteredRouteErrorComponent<TProps> = RegisterRouteErrorComponent<TProps> extends {
     RouteErrorComponent: infer T;
 } ? T : (props: TProps) => unknown;
+type RegisteredRouteProps<TLoader = unknown, TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> = RegisterRouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TAllContext> extends {
+    RouteProps: infer T;
+} ? T : (props: {}) => unknown;
+type RegisteredErrorRouteProps<TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> = RegisterRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TAllContext> extends {
+    ErrorRouteProps: infer T;
+} ? T : (props: {}) => unknown;
+type RegisteredPendingRouteProps<TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> = RegisterRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TAllContext> extends {
+    PendingRouteProps: infer T;
+} ? T : (props: {}) => unknown;
 type PreloadableObj = {
     preload?: () => Promise<void>;
 };
@@ -391,31 +409,10 @@ type MetaOptions = keyof PickRequired<RouteMeta> extends never ? {
 } : {
     meta: RouteMeta;
 };
-type AnyRouteProps = RouteProps<any, any, any, any, any>;
-type ComponentPropsFromRoute<TRoute> = TRoute extends Route<infer TParentRoute, infer TPath, infer TFullPath, infer TCustomId, infer TId, infer TLoader, infer TSearchSchema, infer TFullSearchSchema, infer TParams, infer TAllParams, infer TParentContext, infer TAllParentContext, infer TRouteContext, infer TContext, infer TRouterContext, infer TChildren, infer TRouteTree> ? RouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext> : never;
+type AnyRouteProps = RegisteredRouteProps<any, any, any, any, any>;
+type ComponentPropsFromRoute<TRoute> = TRoute extends Route<infer TParentRoute, infer TPath, infer TFullPath, infer TCustomId, infer TId, infer TLoader, infer TSearchSchema, infer TFullSearchSchema, infer TParams, infer TAllParams, infer TParentContext, infer TAllParentContext, infer TRouteContext, infer TContext, infer TRouterContext, infer TChildren, infer TRouteTree> ? RegisteredRouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext> : never;
 type ComponentFromRoute<TRoute> = RegisteredRouteComponent<ComponentPropsFromRoute<TRoute>>;
 type RouteLoaderFromRoute<TRoute extends AnyRoute> = LoaderFn<TRoute['types']['loader'], TRoute['types']['searchSchema'], TRoute['types']['fullSearchSchema'], TRoute['types']['allParams'], TRoute['types']['routeContext'], TRoute['types']['context']>;
-type RouteProps<TLoader extends any = unknown, TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TContext extends AnyContext = AnyContext> = {
-    useMatch: () => RouteMatch<any, any>;
-    useLoader: () => UseLoaderResult<TLoader>;
-    useSearch: <TStrict extends boolean = true, TSearch = TFullSearchSchema, TSelected = TSearch>(opts?: {
-        strict?: TStrict;
-        select?: (search: TSearch) => TSelected;
-    }) => TStrict extends true ? TSelected : TSelected | undefined;
-    useParams: <TDefaultSelected = TAllParams, TSelected = TDefaultSelected>(opts?: {
-        select?: (params: TDefaultSelected) => TSelected;
-    }) => TSelected;
-    useContext: <TDefaultSelected = TContext, TSelected = TDefaultSelected>(opts?: {
-        select?: (context: TDefaultSelected) => TSelected;
-    }) => TSelected;
-    useRouteContext: <TDefaultSelected = TRouteContext, TSelected = TDefaultSelected>(opts?: {
-        select?: (context: TDefaultSelected) => TSelected;
-    }) => TSelected;
-};
-type PendingRouteProps<TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TContext extends AnyContext = AnyContext> = Omit<RouteProps<any, TFullSearchSchema, TAllParams, TRouteContext, TContext>, 'useLoader'>;
-type ErrorRouteProps<TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TContext extends AnyContext = AnyContext> = PendingRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TContext> & {
-    error: unknown;
-};
 type RouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TLoader = unknown, TParentSearchSchema extends AnySearchSchema = {}, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = TSearchSchema, TParams extends AnyPathParams = AnyPathParams, TAllParams extends AnyPathParams = TParams, TParentContext extends AnyContext = AnyContext, TAllParentContext extends AnyContext = AnyContext, TRouteContext extends RouteContext = RouteContext, TAllContext extends AnyContext = AnyContext> = BaseRouteOptions<TParentRoute, TCustomId, TPath, TLoader, TParentSearchSchema, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TParentContext, TAllParentContext, TRouteContext, TAllContext> & UpdatableRouteOptions<TLoader, TSearchSchema, TFullSearchSchema, TAllParams, TRouteContext, TAllContext>;
 type ParamsFallback<TPath extends string, TParams> = unknown extends TParams ? Record<ParsePathParams<TPath>, string> : TParams;
 type BaseRouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TLoader = unknown, TParentSearchSchema extends AnySearchSchema = {}, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = TSearchSchema, TParams extends AnyPathParams = {}, TAllParams = ParamsFallback<TPath, TParams>, TParentContext extends AnyContext = AnyContext, TAllParentContext extends AnyContext = AnyContext, TRouteContext extends RouteContext = RouteContext, TAllContext extends AnyContext = AnyContext> = RoutePathOptions<TCustomId, TPath> & {
@@ -446,19 +443,19 @@ type GetContextFn<TParentRoute, TAllParams, TFullSearchSchema, TParentContext, T
     context: TAllParentContext;
     parentContext: TParentContext;
 })) => TRouteContext;
-type UpdatableRouteOptions<TLoader, TSearchSchema extends AnySearchSchema, TFullSearchSchema extends AnySearchSchema, TAllParams extends AnyPathParams, TRouteContext extends AnyContext, TContext extends AnyContext> = MetaOptions & {
+type UpdatableRouteOptions<TLoader, TSearchSchema extends AnySearchSchema, TFullSearchSchema extends AnySearchSchema, TAllParams extends AnyPathParams, TRouteContext extends AnyContext, TAllContext extends AnyContext> = MetaOptions & {
     key?: null | false | GetKeyFn<TFullSearchSchema, TAllParams>;
     caseSensitive?: boolean;
     wrapInSuspense?: boolean;
-    component?: RegisteredRouteComponent<RouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext>>;
-    errorComponent?: RegisteredRouteErrorComponent<ErrorRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TContext>>;
-    pendingComponent?: RegisteredRouteComponent<PendingRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TContext>>;
+    component?: RegisteredRouteComponent<RegisteredRouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TAllContext>>;
+    errorComponent?: RegisteredRouteErrorComponent<RegisteredErrorRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TAllContext>>;
+    pendingComponent?: RegisteredRouteComponent<RegisteredPendingRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TAllContext>>;
     preSearchFilters?: SearchFilter<TFullSearchSchema>[];
     postSearchFilters?: SearchFilter<TFullSearchSchema>[];
     preloadMaxAge?: number;
     maxAge?: number;
     gcMaxAge?: number;
-    beforeLoad?: (opts: LoaderContext<TSearchSchema, TFullSearchSchema, TAllParams, NoInfer<TRouteContext>, TContext>) => Promise<void> | void;
+    beforeLoad?: (opts: LoaderContext<TSearchSchema, TFullSearchSchema, TAllParams, NoInfer<TRouteContext>, TAllContext>) => Promise<void> | void;
     onError?: (err: any) => void;
     onLoaded?: (matchContext: {
         params: TAllParams;
@@ -521,10 +518,7 @@ type ResolveFullSearchSchema<TParentRoute, TSearchSchema> = InferFullSearchSchem
 interface AnyRoute extends Route<any, any, any, any, any, any, any, any, any, any, any, any, any, any, any, any, any> {
 }
 type MergeParamsFromParent<T, U> = IsAny<T, U, T & U>;
-type UseLoaderResult<T> = T extends Record<PropertyKey, infer U> ? {
-    [K in keyof T]: UseLoaderResultPromise<T[K]>;
-} : UseLoaderResultPromise<T>;
-type UseLoaderResultPromise<T> = T extends Promise<infer U> ? StreamedPromise<U> : T;
+type UseLoaderResult<T> = T;
 type StreamedPromise<T> = {
     promise: Promise<T>;
     status: 'resolved' | 'pending';
@@ -622,9 +616,9 @@ declare class FileRoute<TFilePath extends keyof FileRoutesByPath, TParentRoute e
         key?: false | GetKeyFn<TFullSearchSchema, TAllParams> | null | undefined;
         caseSensitive?: boolean | undefined;
         wrapInSuspense?: boolean | undefined;
-        component?: ((props: RouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext>) => unknown) | undefined;
-        errorComponent?: ((props: ErrorRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TContext>) => unknown) | undefined;
-        pendingComponent?: ((props: PendingRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TContext>) => unknown) | undefined;
+        component?: ((props: (props: {}) => unknown) => unknown) | undefined;
+        errorComponent?: ((props: (props: {}) => unknown) => unknown) | undefined;
+        pendingComponent?: ((props: (props: {}) => unknown) => unknown) | undefined;
         preSearchFilters?: SearchFilter<TFullSearchSchema, TFullSearchSchema>[] | undefined;
         postSearchFilters?: SearchFilter<TFullSearchSchema, TFullSearchSchema>[] | undefined;
         preloadMaxAge?: number | undefined;
@@ -761,4 +755,24 @@ type ScrollRestorationOptions = {
 declare function watchScrollPositions(router: AnyRouter, opts?: ScrollRestorationOptions): () => void;
 declare function restoreScrollPositions(router: AnyRouter, opts?: ScrollRestorationOptions): void;
 
-export { ActiveOptions, AllParams, AnyContext, AnyPathParams, AnyRedirect, AnyRootRoute, AnyRoute, AnyRouteMatch, AnyRouteProps, AnyRouter, AnySearchSchema, BaseRouteOptions, BuildNextOptions, CheckId, CheckIdError, CheckPath, CheckPathError, CheckRelativePath, CleanPath, ComponentFromRoute, ComponentPropsFromRoute, DeepAwaited, DefinedPathParamWarning, DehydratedRouter, DehydratedRouterState, ErrorRouteProps, Expand, FileRoute, FileRoutePath, FileRoutesByPath, FromLocation, FullSearchSchema, GetKeyFn, HydrationCtx, InferFullSearchSchema, IsAny, IsAnyBoolean, IsKnown, Join, Last, LinkInfo, LinkOptions, ListenerFn, LoaderContext, LoaderFn, LocationState, MatchLocation, MatchRouteOptions, MergeParamsFromParent, MergeUnion, MetaOptions, NavigateOptions, NoInfer, ParamsFallback, ParentParams, ParseParamsFn, ParseParamsObj, ParseParamsOption, ParsePathParams, ParseRoute, ParseRouteChildren, ParsedLocation, ParsedPath, PathParamError, PathParamMask, PathParamOptions, PendingRouteProps, PickAsPartial, PickAsRequired, PickExclude, PickExtra, PickExtract, PickRequired, PickUnsafe, PreloadableObj, Redirect, Register, RegisterRouteComponent, RegisterRouteErrorComponent, RegisteredRouteComponent, RegisteredRouteErrorComponent, RegisteredRouter, RelativeToPathAutoComplete, RemoveUnderScores, ResolveFilePath, ResolveFullPath, ResolveFullSearchSchema, ResolveId, ResolveRelativePath, RootRoute, RootRouteId, Route, RouteById, RouteByPath, RouteConstraints, RouteContext, RouteIds, RouteLoaderFromRoute, RouteMatch, RouteMeta, RouteOptions, RoutePathOptions, RoutePathOptionsIntersection, RoutePaths, RouteProps, Router, RouterConstructorOptions, RouterContext, RouterContextOptions, RouterEvent, RouterEvents, RouterHistory, RouterListener, RouterLocation, RouterOptions, RouterState, RoutesById, RoutesByPath, ScrollRestorationOptions, SearchFilter, SearchParamError, SearchParamOptions, SearchParser, SearchSchemaValidator, SearchSchemaValidatorFn, SearchSchemaValidatorObj, SearchSerializer, Segment, Split, StreamedPromise, Timeout, ToIdOption, ToOptions, ToPathOption, Trim, TrimLeft, TrimPath, TrimPathLeft, TrimPathRight, TrimRight, UnionToIntersection, UnloaderFn, UpdatableRouteOptions, Updater, UseLoaderResult, UseLoaderResultPromise, ValueKeys, Values, cleanPath, componentTypes, createBrowserHistory, createHashHistory, createMemoryHistory, decode, defaultParseSearch, defaultStringifySearch, encode, functionalUpdate, interpolatePath, isPlainObject, isRedirect, joinPaths, last, lazyFn, matchByPath, matchPathname, parsePathname, parseSearchWith, partialDeepEqual, pick, redirect, replaceEqualDeep, resolvePath, restoreScrollPositions, rootRouteId, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, watchScrollPositions };
+type DeferredPromiseState<T> = {
+    uid: string;
+} & ({
+    status: 'pending';
+    data?: T;
+    error?: unknown;
+} | {
+    status: 'success';
+    data: T;
+} | {
+    status: 'error';
+    data?: T;
+    error: unknown;
+});
+type DeferredPromise<T> = Promise<T> & {
+    __deferredState: DeferredPromiseState<T>;
+};
+declare function defer<T>(_promise: Promise<T>): DeferredPromise<T>;
+declare function isDehydratedDeferred(obj: any): boolean;
+
+export { ActiveOptions, AllParams, AnyContext, AnyPathParams, AnyRedirect, AnyRootRoute, AnyRoute, AnyRouteMatch, AnyRouteProps, AnyRouter, AnySearchSchema, BaseRouteOptions, BuildNextOptions, CheckId, CheckIdError, CheckPath, CheckPathError, CheckRelativePath, CleanPath, ComponentFromRoute, ComponentPropsFromRoute, DeepAwaited, DeferredPromise, DeferredPromiseState, DefinedPathParamWarning, DehydratedRouteMatch, DehydratedRouter, DehydratedRouterState, Expand, FileRoute, FileRoutePath, FileRoutesByPath, FromLocation, FullSearchSchema, GetKeyFn, HydrationCtx, InferFullSearchSchema, IsAny, IsAnyBoolean, IsKnown, Join, Last, LinkInfo, LinkOptions, ListenerFn, LoaderContext, LoaderFn, LocationState, MatchLocation, MatchRouteOptions, MergeParamsFromParent, MergeUnion, MetaOptions, NavigateOptions, NoInfer, ParamsFallback, ParentParams, ParseParamsFn, ParseParamsObj, ParseParamsOption, ParsePathParams, ParseRoute, ParseRouteChildren, ParsedLocation, ParsedPath, PathParamError, PathParamMask, PathParamOptions, PickAsPartial, PickAsRequired, PickExclude, PickExtra, PickExtract, PickRequired, PickUnsafe, PreloadableObj, Redirect, Register, RegisterErrorRouteProps, RegisterPendingRouteProps, RegisterRouteComponent, RegisterRouteErrorComponent, RegisterRouteProps, RegisteredErrorRouteProps, RegisteredPendingRouteProps, RegisteredRouteComponent, RegisteredRouteErrorComponent, RegisteredRouteProps, RegisteredRouter, RelativeToPathAutoComplete, RemoveUnderScores, ResolveFilePath, ResolveFullPath, ResolveFullSearchSchema, ResolveId, ResolveRelativePath, RootRoute, RootRouteId, Route, RouteById, RouteByPath, RouteConstraints, RouteContext, RouteIds, RouteLoaderFromRoute, RouteMatch, RouteMeta, RouteOptions, RoutePathOptions, RoutePathOptionsIntersection, RoutePaths, Router, RouterConstructorOptions, RouterContext, RouterContextOptions, RouterEvent, RouterEvents, RouterHistory, RouterListener, RouterLocation, RouterOptions, RouterState, RoutesById, RoutesByPath, ScrollRestorationOptions, SearchFilter, SearchParamError, SearchParamOptions, SearchParser, SearchSchemaValidator, SearchSchemaValidatorFn, SearchSchemaValidatorObj, SearchSerializer, Segment, Split, StreamedPromise, Timeout, ToIdOption, ToOptions, ToPathOption, Trim, TrimLeft, TrimPath, TrimPathLeft, TrimPathRight, TrimRight, UnionToIntersection, UnloaderFn, UpdatableRouteOptions, Updater, UseLoaderResult, ValueKeys, Values, cleanPath, componentTypes, createBrowserHistory, createHashHistory, createMemoryHistory, decode, defaultParseSearch, defaultStringifySearch, defer, encode, functionalUpdate, interpolatePath, isDehydratedDeferred, isPlainObject, isRedirect, joinPaths, last, lazyFn, matchByPath, matchPathname, parsePathname, parseSearchWith, partialDeepEqual, pick, redirect, replaceEqualDeep, resolvePath, restoreScrollPositions, rootRouteId, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, watchScrollPositions };

package/build/umd/index.development.js

@@ -580,6 +580,15 @@
 
     // The parse type here allows a zod schema to be passed directly to the validator
 
+    // T extends Record<PropertyKey, infer U>
+    //   ? {
+    //       [K in keyof T]: UseLoaderResultPromise<T[K]>
+    //     }
+    //   : UseLoaderResultPromise<T>
+
+    // export type UseLoaderResultPromise<T> = T extends Promise<infer U>
+    //   ? StreamedPromise<U>
+    //   : T
     class Route {
       // Set up in this.init()
 
@@ -908,7 +917,7 @@
         } = this.options;
         this.basepath = `/${trimPath(basepath ?? '') ?? ''}`;
         if (routeTree && routeTree !== this.routeTree) {
-          this.#buildRouteTree(routeTree);
+          this.#processRoutes(routeTree);
         }
         return this;
       };
@@ -1144,8 +1153,8 @@
             params: routeParams,
             pathname: joinPaths([this.basepath, interpolatedPath]),
             updatedAt: Date.now(),
-            invalidAt: Infinity,
-            preloadInvalidAt: Infinity,
+            invalidAt: 9999999999999,
+            preloadInvalidAt: 9999999999999,
             routeSearch: {},
             search: {},
             status: hasLoaders ? 'pending' : 'success',
@@ -1559,7 +1568,9 @@
       };
       dehydrate = () => {
         return {
-          state: pick(this.state, ['location', 'status', 'lastUpdated'])
+          state: {
+            dehydratedMatches: this.state.matches.map(d => pick(d, ['fetchedAt', 'invalid', 'invalidAt', 'id', 'loaderData', 'status', 'updatedAt']))
+          }
         };
       };
       hydrate = async __do_not_use_server_ctx => {
@@ -1572,16 +1583,27 @@
         const ctx = _ctx;
         this.dehydratedData = ctx.payload;
         this.options.hydrate?.(ctx.payload);
-        const routerState = ctx.router.state;
+        const {
+          dehydratedMatches
+        } = ctx.router.state;
+        let matches = this.matchRoutes(this.state.location.pathname, this.state.location.search).map(match => {
+          const dehydratedMatch = dehydratedMatches.find(d => d.id === match.id);
+          invariant(dehydratedMatch, `Could not find a client-side match for dehydrated match with id: ${match.id}!`);
+          if (dehydratedMatch) {
+            return {
+              ...match,
+              ...dehydratedMatch
+            };
+          }
+          return match;
+        });
         this.__store.setState(s => {
           return {
             ...s,
-            ...routerState,
-            resolvedLocation: routerState.location
+            matches,
+            matchesById: this.#mergeMatches(s.matchesById, matches)
           };
         });
-        await this.load();
-        return;
       };
       injectedHtml = [];
       injectHtml = async html => {
@@ -1594,10 +1616,10 @@
             const id = `__TSR_DEHYDRATED__${strKey}`;
             const data = typeof getData === 'function' ? await getData() : getData;
             return `<script id='${id}' suppressHydrationWarning>window["__TSR_DEHYDRATED__${escapeJSON(strKey)}"] = ${JSON.stringify(data)}
-        ;(() => {
-          var el = document.getElementById('${id}')
-          el.parentElement.removeChild(el)
-        })()
+        // ;(() => {
+        //   var el = document.getElementById('${id}')
+        //   el.parentElement.removeChild(el)
+        // })()
         </script>`;
           });
           return () => this.hydrateData(key);
@@ -1618,7 +1640,7 @@
       //     ?.__promisesByKey[key]?.resolve(value)
       // }
 
-      #buildRouteTree = routeTree => {
+      #processRoutes = routeTree => {
         this.routeTree = routeTree;
         this.routesById = {};
         this.routesByPath = {};
@@ -1810,7 +1832,7 @@
         const route = this.getRoute(match.routeId);
         const updatedAt = opts?.updatedAt ?? Date.now();
         const preloadInvalidAt = updatedAt + (opts?.maxAge ?? route.options.preloadMaxAge ?? this.options.defaultPreloadMaxAge ?? 5000);
-        const invalidAt = updatedAt + (opts?.maxAge ?? route.options.maxAge ?? this.options.defaultMaxAge ?? Infinity);
+        const invalidAt = updatedAt + (opts?.maxAge ?? route.options.maxAge ?? this.options.defaultMaxAge ?? 9999999999999);
         this.setRouteMatch(id, s => ({
           ...s,
           error: undefined,
@@ -2030,6 +2052,28 @@
       }
     }
 
+    function defer(_promise) {
+      const promise = _promise;
+      if (!promise.__deferredState) {
+        promise.__deferredState = {
+          uid: Math.random().toString(36).slice(2),
+          status: 'pending'
+        };
+        const state = promise.__deferredState;
+        promise.then(data => {
+          state.status = 'success';
+          state.data = data;
+        }).catch(error => {
+          state.status = 'error';
+          state.error = error;
+        });
+      }
+      return promise;
+    }
+    function isDehydratedDeferred(obj) {
+      return typeof obj === 'object' && obj !== null && !(obj instanceof Promise) && !obj.then && '__deferredState' in obj;
+    }
+
     exports.FileRoute = FileRoute;
     exports.PathParamError = PathParamError;
     exports.RootRoute = RootRoute;
@@ -2045,10 +2089,12 @@
     exports.decode = decode;
     exports.defaultParseSearch = defaultParseSearch;
     exports.defaultStringifySearch = defaultStringifySearch;
+    exports.defer = defer;
     exports.encode = encode;
     exports.functionalUpdate = functionalUpdate;
     exports.interpolatePath = interpolatePath;
     exports.invariant = invariant;
+    exports.isDehydratedDeferred = isDehydratedDeferred;
     exports.isPlainObject = isPlainObject;
     exports.isRedirect = isRedirect;
     exports.joinPaths = joinPaths;