@tanstack/react-router 0.0.1-beta.194 → 0.0.1-beta.196

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.194",
+  "version": "0.0.1-beta.196",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "tiny-warning": "^1.0.3",
     "@tanstack/react-store": "^0.0.1",
     "@gisatcz/cross-package-react-context": "^0.2.0",
-    "@tanstack/router-core": "0.0.1-beta.194"
+    "@tanstack/router-core": "0.0.1-beta.196"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/react.tsx

@@ -22,7 +22,6 @@ import {
   ResolveId,
   AnySearchSchema,
   ParsePathParams,
-  MergeFromFromParent,
   RouteContext,
   AnyContext,
   UseLoaderResult,
@@ -43,6 +42,9 @@ import {
   IsAny,
 } from '@tanstack/router-core'
 
+const useLayoutEffect =
+  typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect
+
 declare module '@tanstack/router-core' {
   interface RouterOptions<
     TRouteTree extends AnyRoute,
@@ -58,44 +60,30 @@ declare module '@tanstack/router-core' {
     TLoader = unknown,
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     RouteComponent: RouteComponent<
-      RouteProps<
-        TLoader,
-        TFullSearchSchema,
-        TAllParams,
-        TRouteContext,
-        TAllContext
-      >
+      RouteProps<TLoader, TFullSearchSchema, TAllParams, TAllContext>
     >
   }
 
   interface RegisterErrorRouteComponent<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     ErrorRouteComponent: RouteComponent<
-      ErrorRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TAllContext>
+      ErrorRouteProps<TFullSearchSchema, TAllParams, TAllContext>
     >
   }
 
   interface RegisterPendingRouteComponent<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     PendingRouteComponent: RouteComponent<
-      PendingRouteProps<
-        TFullSearchSchema,
-        TAllParams,
-        TRouteContext,
-        TAllContext
-      >
+      PendingRouteProps<TFullSearchSchema, TAllParams, TAllContext>
     >
   }
 
@@ -161,28 +149,19 @@ declare module '@tanstack/router-core' {
     TLoader = unknown,
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
-    RouteProps: RouteProps<
-      TLoader,
-      TFullSearchSchema,
-      TAllParams,
-      TRouteContext,
-      TAllContext
-    >
+    RouteProps: RouteProps<TLoader, TFullSearchSchema, TAllParams, TAllContext>
   }
 
   interface RegisterPendingRouteProps<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     PendingRouteProps: PendingRouteProps<
       TFullSearchSchema,
       TAllParams,
-      TRouteContext,
       TAllContext
     >
   }
@@ -190,7 +169,6 @@ declare module '@tanstack/router-core' {
   interface RegisterErrorRouteProps<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     ErrorRouteProps: ErrorRouteProps
@@ -201,7 +179,6 @@ export type RouteProps<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = {
   useLoader: <TSelected = TLoader>(opts?: {
@@ -224,35 +201,21 @@ export type RouteProps<
 export type ErrorRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = {
   error: unknown
   info: { componentStack: string }
 } & Omit<
-  RouteProps<
-    unknown,
-    TFullSearchSchema,
-    TAllParams,
-    TRouteContext,
-    TAllContext
-  >,
+  RouteProps<unknown, TFullSearchSchema, TAllParams, TAllContext>,
   'useLoader'
 >
 
 export type PendingRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = Omit<
-  RouteProps<
-    unknown,
-    TFullSearchSchema,
-    TAllParams,
-    TRouteContext,
-    TAllContext
-  >,
+  RouteProps<unknown, TFullSearchSchema, TAllParams, TAllContext>,
   'useLoader'
 >
 
@@ -360,8 +323,7 @@ export type MakeUseMatchRouteOptions<
   TTo extends string = '',
   TMaskFrom extends RoutePaths<TRouteTree> = '/',
   TMaskTo extends string = '',
-> = ToOptions<RegisteredRouter['routeTree'], TFrom, TTo, TMaskFrom, TMaskTo> &
-  MatchRouteOptions
+> = ToOptions<AnyRoute, TFrom, TTo, TMaskFrom, TMaskTo> & MatchRouteOptions
 
 export type MakeMatchRouteOptions<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
@@ -578,7 +540,7 @@ export function Navigate<
 >(props: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>): null {
   const router = useRouter()
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     router.navigate(props as any)
   }, [])