@tanstack/react-router 0.0.1-beta.151 → 0.0.1-beta.153

package/build/stats-react.json

@@ -7,7 +7,7 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "526a-167",
+            "uid": "92ad-167",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,19 +15,19 @@
             "children": [
               {
                 "name": "store/build/esm/index.js",
-                "uid": "526a-169"
+                "uid": "92ad-169"
               },
               {
                 "name": "react-store/build/esm/index.js",
-                "uid": "526a-171"
+                "uid": "92ad-171"
               },
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "526a-177"
+                "uid": "92ad-177"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "526a-179"
+                "uid": "92ad-179"
               }
             ]
           },
@@ -36,11 +36,11 @@
             "children": [
               {
                 "name": "tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
-                "uid": "526a-173"
+                "uid": "92ad-173"
               },
               {
                 "name": "tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
-                "uid": "526a-175"
+                "uid": "92ad-175"
               }
             ]
           }
@@ -50,194 +50,194 @@
     "isRoot": true
   },
   "nodeParts": {
-    "526a-167": {
+    "92ad-167": {
       "renderedLength": 429,
       "gzipLength": 238,
       "brotliLength": 0,
-      "mainUid": "526a-166"
+      "mainUid": "92ad-166"
     },
-    "526a-169": {
+    "92ad-169": {
       "renderedLength": 1843,
       "gzipLength": 644,
       "brotliLength": 0,
-      "mainUid": "526a-168"
+      "mainUid": "92ad-168"
     },
-    "526a-171": {
+    "92ad-171": {
       "renderedLength": 1006,
       "gzipLength": 479,
       "brotliLength": 0,
-      "mainUid": "526a-170"
+      "mainUid": "92ad-170"
     },
-    "526a-173": {
+    "92ad-173": {
       "renderedLength": 181,
       "gzipLength": 129,
       "brotliLength": 0,
-      "mainUid": "526a-172"
+      "mainUid": "92ad-172"
     },
-    "526a-175": {
+    "92ad-175": {
       "renderedLength": 44,
       "gzipLength": 62,
       "brotliLength": 0,
-      "mainUid": "526a-174"
+      "mainUid": "92ad-174"
     },
-    "526a-177": {
-      "renderedLength": 56013,
-      "gzipLength": 13281,
+    "92ad-177": {
+      "renderedLength": 56084,
+      "gzipLength": 13303,
       "brotliLength": 0,
-      "mainUid": "526a-176"
+      "mainUid": "92ad-176"
     },
-    "526a-179": {
+    "92ad-179": {
       "renderedLength": 17095,
       "gzipLength": 3814,
       "brotliLength": 0,
-      "mainUid": "526a-178"
+      "mainUid": "92ad-178"
     }
   },
   "nodeMetas": {
-    "526a-166": {
+    "92ad-166": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "526a-167"
+        "index.production.js": "92ad-167"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "526a-178"
+          "uid": "92ad-178"
         }
       ]
     },
-    "526a-168": {
+    "92ad-168": {
       "id": "/packages/store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "526a-169"
+        "index.production.js": "92ad-169"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "526a-170"
+          "uid": "92ad-170"
         }
       ]
     },
-    "526a-170": {
+    "92ad-170": {
       "id": "/packages/react-store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "526a-171"
+        "index.production.js": "92ad-171"
       },
       "imported": [
         {
-          "uid": "526a-181"
+          "uid": "92ad-181"
         },
         {
-          "uid": "526a-168"
+          "uid": "92ad-168"
         }
       ],
       "importedBy": [
         {
-          "uid": "526a-178"
+          "uid": "92ad-178"
         },
         {
-          "uid": "526a-176"
+          "uid": "92ad-176"
         }
       ]
     },
-    "526a-172": {
+    "92ad-172": {
       "id": "/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
       "moduleParts": {
-        "index.production.js": "526a-173"
+        "index.production.js": "92ad-173"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "526a-178"
+          "uid": "92ad-178"
         },
         {
-          "uid": "526a-176"
+          "uid": "92ad-176"
         }
       ]
     },
-    "526a-174": {
+    "92ad-174": {
       "id": "/node_modules/.pnpm/tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
       "moduleParts": {
-        "index.production.js": "526a-175"
+        "index.production.js": "92ad-175"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "526a-178"
+          "uid": "92ad-178"
         },
         {
-          "uid": "526a-176"
+          "uid": "92ad-176"
         }
       ]
     },
-    "526a-176": {
+    "92ad-176": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "526a-177"
+        "index.production.js": "92ad-177"
       },
       "imported": [
         {
-          "uid": "526a-172"
+          "uid": "92ad-172"
         },
         {
-          "uid": "526a-174"
+          "uid": "92ad-174"
         },
         {
-          "uid": "526a-170"
+          "uid": "92ad-170"
         }
       ],
       "importedBy": [
         {
-          "uid": "526a-178"
+          "uid": "92ad-178"
         }
       ]
     },
-    "526a-178": {
+    "92ad-178": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "526a-179"
+        "index.production.js": "92ad-179"
       },
       "imported": [
         {
-          "uid": "526a-166"
+          "uid": "92ad-166"
         },
         {
-          "uid": "526a-180"
+          "uid": "92ad-180"
         },
         {
-          "uid": "526a-170"
+          "uid": "92ad-170"
         },
         {
-          "uid": "526a-172"
+          "uid": "92ad-172"
         },
         {
-          "uid": "526a-174"
+          "uid": "92ad-174"
         },
         {
-          "uid": "526a-176"
+          "uid": "92ad-176"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "526a-180": {
+    "92ad-180": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "526a-178"
+          "uid": "92ad-178"
         }
       ],
       "isExternal": true
     },
-    "526a-181": {
+    "92ad-181": {
       "id": "use-sync-external-store/shim/with-selector",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "526a-170"
+          "uid": "92ad-170"
         }
       ],
       "isExternal": true

package/build/types/index.d.ts

@@ -8,12 +8,11 @@
  *
  * @license MIT
  */
-import * as _tanstack_router_core from '@tanstack/router-core';
-import { AnyRoute, ResolveFullPath, ResolveId, AnySearchSchema, ResolveFullSearchSchema, ParsePathParams, MergeParamsFromParent, RouteContext, AnyContext, DefaultRoutesInfo, UseLoaderResult, AnyRouteProps, RegisteredRoutesInfo, LinkOptions, ToOptions, MatchRouteOptions, RouteByPath, ResolveRelativePath, NavigateOptions, Router, AnyRoutesInfo, RouterOptions, RegisteredRouter, RouteMatch } from '@tanstack/router-core';
-export * from '@tanstack/router-core';
 import * as React from 'react';
 import { NoInfer } from '@tanstack/react-store';
 export { useStore } from '@tanstack/react-store';
+import { RouteConstraints, AnyRoute, ResolveFullPath, ResolveId, ResolveFullSearchSchema, ParsePathParams, MergeParamsFromParent, RouteContext, AnyContext, UseLoaderResult, AnyRouteProps, RoutePaths, RegisteredRouter, LinkOptions, ToOptions, MatchRouteOptions, RouteByPath, ResolveRelativePath, NavigateOptions, Router, RouterOptions, RouteMatch, RouteIds, RouteById, ParseRoute, RoutesById, AllParams } from '@tanstack/router-core';
+export * from '@tanstack/router-core';
 
 declare module '@tanstack/router-core' {
     interface RegisterRouteComponent<TProps extends Record<string, any>> {
@@ -22,7 +21,7 @@ declare module '@tanstack/router-core' {
     interface RegisterRouteErrorComponent<TProps extends Record<string, any>> {
         RouteErrorComponent: RouteComponent<TProps>;
     }
-    interface Route<TParentRoute extends AnyRoute = AnyRoute, TPath extends string = '/', TFullPath extends ResolveFullPath<TParentRoute, TPath> = ResolveFullPath<TParentRoute, TPath>, TCustomId extends string = string, TId extends ResolveId<TParentRoute, TCustomId, TPath> = ResolveId<TParentRoute, TCustomId, TPath>, TLoader = unknown, TSearchSchema extends AnySearchSchema = {}, TFullSearchSchema extends AnySearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>, TParams extends Record<ParsePathParams<TPath>, any> = Record<ParsePathParams<TPath>, string>, TAllParams extends MergeParamsFromParent<TParentRoute['__types']['allParams'], TParams> = MergeParamsFromParent<TParentRoute['__types']['allParams'], TParams>, TParentContext extends TParentRoute['__types']['routeContext'] = TParentRoute['__types']['routeContext'], TAllParentContext extends TParentRoute['__types']['context'] = TParentRoute['__types']['context'], TRouteContext extends RouteContext = RouteContext, TContext extends MergeParamsFromParent<TParentRoute['__types']['context'], TRouteContext> = MergeParamsFromParent<TParentRoute['__types']['context'], TRouteContext>, TRouterContext extends AnyContext = AnyContext, TChildren extends unknown = unknown, TRoutesInfo extends DefaultRoutesInfo = DefaultRoutesInfo> {
+    interface Route<TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute, TPath extends RouteConstraints['TPath'] = '/', TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<TParentRoute, TPath>, TCustomId extends RouteConstraints['TCustomId'] = string, TId extends RouteConstraints['TId'] = ResolveId<TParentRoute, TCustomId, TPath>, TLoader = unknown, TSearchSchema extends RouteConstraints['TSearchSchema'] = {}, TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<TParentRoute, TSearchSchema>, TParams extends RouteConstraints['TParams'] = Record<ParsePathParams<TPath>, string>, TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<TParentRoute['__types']['allParams'], TParams>, TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['__types']['routeContext'], TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['__types']['context'], TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext, TContext extends RouteConstraints['TContext'] = MergeParamsFromParent<TParentRoute['__types']['context'], TRouteContext>, TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext, TChildren extends RouteConstraints['TChildren'] = unknown, TRouteTree extends RouteConstraints['TRouteTree'] = AnyRoute> {
         useMatch: <TStrict extends boolean = true, TSelected = TContext>(opts?: {
             strict?: TStrict;
             select?: (search: TContext) => TSelected;
@@ -64,17 +63,17 @@ type RouteErrorComponentProps = {
 type AnyRouteComponent = RouteComponent<AnyRouteProps>;
 type RouteComponent<TProps> = AsyncRouteComponent<TProps>;
 declare function lazyRouteComponent<T extends Record<string, any>, TKey extends keyof T = 'default'>(importer: () => Promise<T>, exportName?: TKey): T[TKey] extends (props: infer TProps) => any ? AsyncRouteComponent<TProps> : never;
-type LinkPropsOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = ''> = LinkOptions<RegisteredRoutesInfo, TFrom, TTo> & {
+type LinkPropsOptions<TFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/', TTo extends string = ''> = LinkOptions<RegisteredRouter['routeTree'], TFrom, TTo> & {
     activeProps?: React.AnchorHTMLAttributes<HTMLAnchorElement> | (() => React.AnchorHTMLAttributes<HTMLAnchorElement>);
     inactiveProps?: React.AnchorHTMLAttributes<HTMLAnchorElement> | (() => React.AnchorHTMLAttributes<HTMLAnchorElement>);
     startTransition?: boolean;
 };
-type MakeUseMatchRouteOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = ''> = ToOptions<RegisteredRoutesInfo, TFrom, TTo> & MatchRouteOptions;
-type MakeMatchRouteOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = ''> = ToOptions<RegisteredRoutesInfo, TFrom, TTo> & MatchRouteOptions & {
-    children?: ((params?: RouteByPath<RegisteredRoutesInfo, ResolveRelativePath<TFrom, NoInfer<TTo>>>['__types']['allParams']) => ReactNode) | React.ReactNode;
+type MakeUseMatchRouteOptions<TFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/', TTo extends string = ''> = ToOptions<RegisteredRouter['routeTree'], TFrom, TTo> & MatchRouteOptions;
+type MakeMatchRouteOptions<TFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/', TTo extends string = ''> = ToOptions<RegisteredRouter['routeTree'], TFrom, TTo> & MatchRouteOptions & {
+    children?: ((params?: RouteByPath<RegisteredRouter['routeTree'], ResolveRelativePath<TFrom, NoInfer<TTo>>>['__types']['allParams']) => ReactNode) | React.ReactNode;
 };
 type MakeLinkPropsOptions<TFrom extends string = '/', TTo extends string = ''> = LinkPropsOptions<TFrom, TTo> & React.AnchorHTMLAttributes<HTMLAnchorElement>;
-type MakeLinkOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = ''> = LinkPropsOptions<TFrom, TTo> & Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {
+type MakeLinkOptions<TFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/', TTo extends string = ''> = LinkPropsOptions<TFrom, TTo> & Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {
     children?: React.ReactNode | ((state: {
         isActive: boolean;
     }) => React.ReactNode);
@@ -86,57 +85,57 @@ type PromptProps = {
 };
 declare function useLinkProps<TFrom extends string = '/', TTo extends string = ''>(options: MakeLinkPropsOptions<TFrom, TTo>): React.AnchorHTMLAttributes<HTMLAnchorElement>;
 interface LinkComponent<TProps extends Record<string, any> = {}> {
-    <TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = ''>(props: MakeLinkOptions<TFrom, TTo> & TProps & React.RefAttributes<HTMLAnchorElement>): ReactNode;
+    <TFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/', TTo extends string = ''>(props: MakeLinkOptions<TFrom, TTo> & TProps & React.RefAttributes<HTMLAnchorElement>): ReactNode;
 }
 declare const Link: LinkComponent;
-declare function Navigate<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = ''>(props: NavigateOptions<RegisteredRoutesInfo, TFrom, TTo>): null;
+declare function Navigate<TFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/', TTo extends string = ''>(props: NavigateOptions<RegisteredRouter['routeTree'], TFrom, TTo>): null;
 declare const matchIdsContext: React.Context<string[]>;
-declare const routerContext: React.Context<Router<AnyRoute, _tanstack_router_core.RoutesInfo<AnyRoute>, Record<string, any>>>;
-type RouterProps<TRouteConfig extends AnyRoute = AnyRoute, TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo, TDehydrated extends Record<string, any> = Record<string, any>> = Omit<RouterOptions<TRouteConfig, TDehydrated>, 'context'> & {
-    router: Router<TRouteConfig, TRoutesInfo>;
-    context?: Partial<RouterOptions<TRouteConfig, TDehydrated>['context']>;
+declare const routerContext: React.Context<Router<AnyRoute, Record<string, any>>>;
+type RouterProps<TRouteTree extends AnyRoute = AnyRoute, TDehydrated extends Record<string, any> = Record<string, any>> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> & {
+    router: Router<TRouteTree>;
+    context?: Partial<RouterOptions<TRouteTree, TDehydrated>['context']>;
 };
 declare function useRouterState<TSelected = RegisteredRouter['state']>(opts?: {
     select: (state: RegisteredRouter['state']) => TSelected;
 }): TSelected;
-declare function RouterProvider<TRouteConfig extends AnyRoute = AnyRoute, TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo, TDehydrated extends Record<string, any> = Record<string, any>>({ router, ...rest }: RouterProps<TRouteConfig, TRoutesInfo, TDehydrated>): JSX.Element;
+declare function RouterProvider<TRouteTree extends AnyRoute = AnyRoute, TDehydrated extends Record<string, any> = Record<string, any>>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>): JSX.Element;
 declare function useRouter(): RegisteredRouter;
 declare function useMatches<T = RouteMatch[]>(opts?: {
     select?: (matches: RouteMatch[]) => T;
 }): T;
-declare function useMatch<TFrom extends keyof RegisteredRoutesInfo['routesById'], TStrict extends boolean = true, TRouteMatchState = RouteMatch<RegisteredRoutesInfo, RegisteredRoutesInfo['routesById'][TFrom]>, TSelected = TRouteMatchState>(opts?: {
+declare function useMatch<TFrom extends RouteIds<RegisteredRouter['routeTree']>, TStrict extends boolean = true, TRouteMatchState = RouteMatch<RegisteredRouter['routeTree'], RouteById<RegisteredRouter['routeTree'], TFrom>>, TSelected = TRouteMatchState>(opts?: {
     from: TFrom;
     strict?: TStrict;
     select?: (match: TRouteMatchState) => TSelected;
 }): TStrict extends true ? TRouteMatchState : TRouteMatchState | undefined;
-type RouteFromIdOrRoute<T> = T extends RegisteredRoutesInfo['routeUnion'] ? T : T extends keyof RegisteredRoutesInfo['routesById'] ? RegisteredRoutesInfo['routesById'][T] : T extends string ? keyof RegisteredRoutesInfo['routesById'] : never;
-declare function useLoader<TFrom extends keyof RegisteredRoutesInfo['routesById'], TStrict extends boolean = true, TLoader = RegisteredRoutesInfo['routesById'][TFrom]['__types']['loader'], TSelected = TLoader>(opts?: {
+type RouteFromIdOrRoute<T> = T extends ParseRoute<RegisteredRouter['routeTree']> ? T : T extends RouteIds<RegisteredRouter['routeTree']> ? RoutesById<RegisteredRouter['routeTree']>[T] : T extends string ? RouteIds<RegisteredRouter['routeTree']> : never;
+declare function useLoader<TFrom extends RouteIds<RegisteredRouter['routeTree']>, TStrict extends boolean = true, TLoader = RouteById<RegisteredRouter['routeTree'], TFrom>['__types']['loader'], TSelected = TLoader>(opts?: {
     from: TFrom;
     strict?: TStrict;
     select?: (search: TLoader) => TSelected;
 }): TStrict extends true ? TSelected : TSelected | undefined;
-declare function useRouterContext<TFrom extends keyof RegisteredRoutesInfo['routesById'], TStrict extends boolean = true, TContext = RegisteredRoutesInfo['routesById'][TFrom]['__types']['context'], TSelected = TContext>(opts?: {
+declare function useRouterContext<TFrom extends RouteIds<RegisteredRouter['routeTree']>, TStrict extends boolean = true, TContext = RouteById<RegisteredRouter['routeTree'], TFrom>['__types']['context'], TSelected = TContext>(opts?: {
     from: TFrom;
     strict?: TStrict;
     select?: (search: TContext) => TSelected;
 }): TStrict extends true ? TSelected : TSelected | undefined;
-declare function useRouteContext<TFrom extends keyof RegisteredRoutesInfo['routesById'], TStrict extends boolean = true, TRouteContext = RegisteredRoutesInfo['routesById'][TFrom]['__types']['routeContext'], TSelected = TRouteContext>(opts?: {
+declare function useRouteContext<TFrom extends RouteIds<RegisteredRouter['routeTree']>, TStrict extends boolean = true, TRouteContext = RouteById<RegisteredRouter['routeTree'], TFrom>['__types']['routeContext'], TSelected = TRouteContext>(opts?: {
     from: TFrom;
     strict?: TStrict;
     select?: (search: TRouteContext) => TSelected;
 }): TStrict extends true ? TSelected : TSelected | undefined;
-declare function useSearch<TFrom extends keyof RegisteredRoutesInfo['routesById'], TStrict extends boolean = true, TSearch = RegisteredRoutesInfo['routesById'][TFrom]['__types']['fullSearchSchema'], TSelected = TSearch>(opts?: {
+declare function useSearch<TFrom extends RouteIds<RegisteredRouter['routeTree']>, TStrict extends boolean = true, TSearch = RouteById<RegisteredRouter['routeTree'], TFrom>['__types']['fullSearchSchema'], TSelected = TSearch>(opts?: {
     from: TFrom;
     strict?: TStrict;
     select?: (search: TSearch) => TSelected;
 }): TStrict extends true ? TSelected : TSelected | undefined;
-declare function useParams<TFrom extends keyof RegisteredRoutesInfo['routesById'] = '/', TDefaultSelected = RegisteredRoutesInfo['allParams'] & RegisteredRoutesInfo['routesById'][TFrom]['__types']['allParams'], TSelected = TDefaultSelected>(opts?: {
+declare function useParams<TFrom extends RouteIds<RegisteredRouter['routeTree']> = '/', TDefaultSelected = AllParams<RegisteredRouter['routeTree']> & RouteById<RegisteredRouter['routeTree'], TFrom>['__types']['allParams'], TSelected = TDefaultSelected>(opts?: {
     from: TFrom;
     select?: (search: TDefaultSelected) => TSelected;
 }): TSelected;
-declare function useNavigate<TDefaultFrom extends RegisteredRoutesInfo['routePaths'] = '/'>(defaultOpts?: {
+declare function useNavigate<TDefaultFrom extends RoutePaths<RegisteredRouter['routeTree']> = '/'>(defaultOpts?: {
     from?: TDefaultFrom;
-}): <TFrom extends unknown = TDefaultFrom, TTo extends string = "">(opts?: NavigateOptions<AnyRoutesInfo, TFrom, TTo> | undefined) => Promise<void>;
+}): <TFrom extends unknown = TDefaultFrom, TTo extends string = "">(opts?: NavigateOptions<AnyRoute, TFrom, TTo> | undefined) => Promise<void>;
 declare function useMatchRoute(): <TFrom extends string = "/", TTo extends string = "">(opts: MakeUseMatchRouteOptions<TFrom, TTo>) => any;
 declare function MatchRoute<TFrom extends string = '/', TTo extends string = ''>(props: MakeMatchRouteOptions<TFrom, TTo>): any;
 declare function Outlet(): JSX.Element | null;

package/build/umd/index.development.js

@@ -1118,6 +1118,7 @@
       });
       let routeCursor = foundRoute || this.routesById['__root__'];
       let matchedRoutes = [routeCursor];
+      // let includingLayouts = true
       while (routeCursor?.parentRoute) {
         routeCursor = routeCursor.parentRoute;
         if (routeCursor) matchedRoutes.unshift(routeCursor);
@@ -1604,11 +1605,12 @@
       const ctx = _ctx;
       this.dehydratedData = ctx.payload;
       this.options.hydrate?.(ctx.payload);
+      const routerState = ctx.router.state;
       this.__store.setState(s => {
         return {
           ...s,
-          ...ctx.router.state,
-          resolvedLocation: ctx.router.state.location
+          ...routerState,
+          resolvedLocation: routerState.location
         };
       });
       await this.load();