@tanstack/react-router 0.0.1-beta.225 → 0.0.1-beta.226

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.225",
+  "version": "0.0.1-beta.226",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -42,7 +42,7 @@
     "@babel/runtime": "^7.16.7",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "0.0.1-beta.225"
+    "@tanstack/history": "0.0.1-beta.226"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/RouterProvider.tsx

@@ -102,12 +102,6 @@ export type MatchRouteFn<TRouteTree extends AnyRoute> = <
   opts?: MatchRouteOptions,
 ) => false | RouteById<TRouteTree, TResolved>['types']['allParams']
 
-export type LoadFn = (opts?: {
-  next?: ParsedLocation
-  throwOnError?: boolean
-  __dehydratedMatches?: DehydratedRouteMatch[]
-}) => Promise<void>
-
 export type BuildLocationFn<TRouteTree extends AnyRoute> = (
   opts: BuildNextOptions,
 ) => ParsedLocation
@@ -170,11 +164,15 @@ export function RouterProvider<
   router.updateOptions({
     ...router.options,
     ...rest,
+
     context: {
       ...router.options.context,
       ...rest?.context,
     },
-  } as PickAsRequired<RouterOptions<TRouteTree, TDehydrated>, 'stringifySearch' | 'parseSearch' | 'context'>)
+  } as PickAsRequired<
+    RouterOptions<TRouteTree, TDehydrated>,
+    'stringifySearch' | 'parseSearch' | 'context'
+  >)
 
   const [preState, setState] = React.useState(() => router.state)
   const [isTransitioning, startReactTransition] = React.useTransition()
@@ -222,7 +220,7 @@ export function RouterProvider<
     return () => {
       unsub()
     }
-  }, [history])
+  }, [router.history])
 
   React.useLayoutEffect(() => {
     if (!isTransitioning && state.resolvedLocation !== state.location) {

package/src/route.ts

@@ -76,13 +76,11 @@ export type RouteOptions<
   TAllContext,
   TLoaderData
 > &
-  NoInfer<
-    UpdatableRouteOptions<
-      TFullSearchSchema,
-      TAllParams,
-      TAllContext,
-      TLoaderData
-    >
+  UpdatableRouteOptions<
+    NoInfer<TFullSearchSchema>,
+    NoInfer<TAllParams>,
+    NoInfer<TAllContext>,
+    NoInfer<TLoaderData>
   >
 
 export type ParamsFallback<
@@ -389,7 +387,8 @@ export class Route<
     TPath
   >,
   TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
-  TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
+  TFullSearchSchema extends
+    RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
     TParentRoute,
     TSearchSchema
   >,
@@ -714,14 +713,14 @@ type RoutePrefix<
 > = string extends TPath
   ? RootRouteId
   : TPath extends string
-  ? TPrefix extends RootRouteId
-    ? TPath extends '/'
-      ? '/'
-      : `/${TrimPath<TPath>}`
-    : `${TPrefix}/${TPath}` extends '/'
-    ? '/'
-    : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TPath>}`>}`
-  : never
+    ? TPrefix extends RootRouteId
+      ? TPath extends '/'
+        ? '/'
+        : `/${TrimPath<TPath>}`
+      : `${TPrefix}/${TPath}` extends '/'
+        ? '/'
+        : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TPath>}`>}`
+    : never
 
 export type TrimPath<T extends string> = '' extends T
   ? ''
@@ -731,13 +730,13 @@ export type TrimPathLeft<T extends string> =
   T extends `${RootRouteId}/${infer U}`
     ? TrimPathLeft<U>
     : T extends `/${infer U}`
-    ? TrimPathLeft<U>
-    : T
+      ? TrimPathLeft<U>
+      : T
 export type TrimPathRight<T extends string> = T extends '/'
   ? '/'
   : T extends `${infer U}/`
-  ? TrimPathRight<U>
-  : T
+    ? TrimPathRight<U>
+    : T
 
 export type RouteMask<TRouteTree extends AnyRoute> = {
   routeTree: TRouteTree
@@ -842,20 +841,20 @@ export type ComponentPropsFromRoute<TRoute> =
   TRoute extends (() => infer T extends AnyRoute)
     ? ComponentPropsFromRoute<T>
     : TRoute extends Route<
-        infer TParentRoute,
-        infer TPath,
-        infer TFullPath,
-        infer TCustomId,
-        infer TId,
-        infer TSearchSchema,
-        infer TFullSearchSchema,
-        infer TParams,
-        infer TAllParams,
-        infer TRouteContext,
-        infer TAllContext,
-        infer TRouterContext,
-        infer TLoaderData,
-        infer TChildren
-      >
-    ? RouteProps<TFullSearchSchema, TAllParams, TAllContext, TLoaderData>
-    : {}
+          infer TParentRoute,
+          infer TPath,
+          infer TFullPath,
+          infer TCustomId,
+          infer TId,
+          infer TSearchSchema,
+          infer TFullSearchSchema,
+          infer TParams,
+          infer TAllParams,
+          infer TRouteContext,
+          infer TAllContext,
+          infer TRouterContext,
+          infer TLoaderData,
+          infer TChildren
+        >
+      ? RouteProps<TFullSearchSchema, TAllParams, TAllContext, TLoaderData>
+      : {}

package/src/router.ts

@@ -43,7 +43,6 @@ import {
   BuildLocationFn,
   CommitLocationOptions,
   InjectedHtmlEntry,
-  LoadFn,
   MatchRouteFn,
   NavigateFn,
   PathParamError,
@@ -679,8 +678,8 @@ export class Router<
       let pathname = this.resolvePathWithBase(fromPathname, `${dest.to ?? ''}`)
 
       const fromMatches = this.matchRoutes(fromPathname, from.search)
-      const stayingMatches = matches?.filter((d) =>
-        fromMatches?.find((e) => e.routeId === d.routeId),
+      const stayingMatches = matches?.filter(
+        (d) => fromMatches?.find((e) => e.routeId === d.routeId),
       )
 
       const prevParams = { ...last(fromMatches)?.params }
@@ -734,10 +733,10 @@ export class Router<
         dest.search === true
           ? preFilteredSearch // Preserve resolvedFrom true
           : dest.search
-          ? functionalUpdate(dest.search, preFilteredSearch) ?? {} // Updater
-          : preSearchFilters?.length
-          ? preFilteredSearch // Preserve resolvedFrom filters
-          : {}
+            ? functionalUpdate(dest.search, preFilteredSearch) ?? {} // Updater
+            : preSearchFilters?.length
+              ? preFilteredSearch // Preserve resolvedFrom filters
+              : {}
 
       // Then post filters
       const postFilteredSearch = postSearchFilters?.length
@@ -752,8 +751,8 @@ export class Router<
         dest.hash === true
           ? from.hash
           : dest.hash
-          ? functionalUpdate(dest.hash!, from.hash)
-          : from.hash
+            ? functionalUpdate(dest.hash!, from.hash)
+            : from.hash
 
       const hashStr = hash ? `#${hash}` : ''
 
@@ -761,8 +760,8 @@ export class Router<
         dest.state === true
           ? from.state
           : dest.state
-          ? functionalUpdate(dest.state, from.state)
-          : from.state
+            ? functionalUpdate(dest.state, from.state)
+            : from.state
 
       nextState = replaceEqualDeep(from.state, nextState)
 
@@ -945,10 +944,12 @@ export class Router<
     checkLatest,
     matches,
     preload,
+    invalidate,
   }: {
     checkLatest: () => Promise<void> | undefined
     matches: AnyRouteMatch[]
     preload?: boolean
+    invalidate?: boolean
   }): Promise<RouteMatch[]> => {
     let latestPromise
     let firstBadMatchIndex: number | undefined
@@ -1086,7 +1087,7 @@ export class Router<
                 ? route.options.shouldReload?.(loaderContext)
                 : !!(route.options.shouldReload ?? true)
 
-            if (match.cause === 'enter') {
+            if (match.cause === 'enter' || invalidate) {
               match.shouldReloadDeps = shouldReloadDeps
             } else if (match.cause === 'stay') {
               if (typeof shouldReloadDeps === 'object') {
@@ -1192,7 +1193,12 @@ export class Router<
     return matches
   }
 
-  load: LoadFn = async () => {
+  invalidate = () =>
+    this.load({
+      invalidate: true,
+    })
+
+  load = async (opts?: { invalidate?: boolean }): Promise<void> => {
     const promise = new Promise<void>(async (resolve, reject) => {
       const next = this.latestLocation
       const prevLocation = this.state.resolvedLocation
@@ -1236,6 +1242,7 @@ export class Router<
           await this.loadMatches({
             matches,
             checkLatest: () => this.checkLatest(promise),
+            invalidate: opts?.invalidate,
           })
         } catch (err) {
           // swallow this error, since we'll display the