@tanstack/react-router 1.25.1 → 1.26.1

package/src/link.tsx

@@ -76,9 +76,11 @@ export type Last<T extends Array<any>> = T extends [...infer _, infer L]
   ? L
   : never
 
-export type RemoveTrailingSlashes<T> = T extends `${infer R}/`
-  ? RemoveTrailingSlashes<R>
-  : T
+export type RemoveTrailingSlashes<T> = T extends '/'
+  ? T
+  : T extends `${infer R}/`
+    ? RemoveTrailingSlashes<R>
+    : T
 
 export type RemoveLeadingSlashes<T> = T extends `/${infer R}`
   ? RemoveLeadingSlashes<R>
@@ -455,16 +457,16 @@ export function useLinkProps<
       ...rest,
       type,
       href: to,
-      children,
-      target,
-      disabled,
-      style,
-      className,
-      onClick,
-      onFocus,
-      onMouseEnter,
-      onMouseLeave,
-      onTouchStart,
+      ...(children && { children }),
+      ...(target && { target }),
+      ...(disabled && { disabled }),
+      ...(style && { style }),
+      ...(className && { className }),
+      ...(onClick && { onClick }),
+      ...(onFocus && { onFocus }),
+      ...(onMouseEnter && { onMouseEnter }),
+      ...(onMouseLeave && { onMouseLeave }),
+      ...(onTouchStart && { onTouchStart }),
     }
   }
 

package/src/route.ts

@@ -1256,12 +1256,14 @@ export function createRouteMask<
  */
 export type ErrorRouteProps = {
   error: unknown
-  info: { componentStack: string }
+  info?: { componentStack: string }
+  reset: () => void
 }
 
 export type ErrorComponentProps = {
   error: unknown
-  info: { componentStack: string }
+  info?: { componentStack: string }
+  reset: () => void
 }
 export type NotFoundRouteProps = {
   // TODO: Make sure this is `| null | undefined` (this is for global not-founds)

package/src/router.ts

@@ -40,9 +40,9 @@ import type {
   AnyContext,
   AnyRoute,
   AnySearchSchema,
+  ErrorRouteComponent,
   LoaderFnContext,
   NotFoundRouteComponent,
-  Route,
   RouteMask,
 } from './route'
 import type {
@@ -122,7 +122,7 @@ export interface RouterOptions<
   defaultPreload?: false | 'intent'
   defaultPreloadDelay?: number
   defaultComponent?: RouteComponent
-  defaultErrorComponent?: RouteComponent
+  defaultErrorComponent?: ErrorRouteComponent
   defaultPendingComponent?: RouteComponent
   defaultPendingMs?: number
   defaultPendingMinMs?: number
@@ -1545,9 +1545,10 @@ export class Router<
   }
 
   invalidate = () => {
-    const invalidate = (d: any) => ({
+    const invalidate = (d: RouteMatch<TRouteTree>) => ({
       ...d,
       invalid: true,
+      ...(d.status === 'error' ? ({ status: 'pending' } as const) : {}),
     })
 
     this.__store.setState((s) => ({
@@ -1557,7 +1558,7 @@ export class Router<
       pendingMatches: s.pendingMatches?.map(invalidate),
     }))
 
-    this.load()
+    return this.load()
   }
 
   load = async (): Promise<void> => {