@tanstack/react-router 1.15.23 → 1.16.2

package/src/path.ts

@@ -173,7 +173,7 @@ export function matchPathname(
 }
 
 export function removeBasepath(basepath: string, pathname: string) {
-  return basepath != '/' ? pathname.substring(basepath.length) : pathname
+  return basepath != '/' ? pathname.replace(basepath, '') : pathname
 }
 
 export function matchByPath(
@@ -184,7 +184,8 @@ export function matchByPath(
   // Remove the base path from the pathname
   from = removeBasepath(basepath, from)
   // Default to to $ (wildcard)
-  const to = `${matchLocation.to ?? '$'}`
+  const to = removeBasepath(basepath, `${matchLocation.to ?? '$'}`)
+
   // Parse the from and to
   const baseSegments = parsePathname(from)
   const routeSegments = parsePathname(to)

package/src/router.ts

@@ -841,7 +841,7 @@ export class Router<
       let nextParams =
         (dest.params ?? true) === true
           ? prevParams
-          : {...prevParams, ...functionalUpdate(dest.params!, prevParams)}
+          : { ...prevParams, ...functionalUpdate(dest.params!, prevParams) }
 
       if (nextParams) {
         matches

package/src/utils.ts

@@ -34,13 +34,16 @@ export type DeepPartial<T> = T extends object
     }
   : T
 
-export type MakeDifferenceOptional<T, U> = Omit<U, keyof T> & Partial<Pick<U, keyof T & keyof U>> & PickRequired<Omit<U, keyof PickRequired<T>>>
+export type MakeDifferenceOptional<T, U> = Omit<U, keyof T> &
+  Partial<Pick<U, keyof T & keyof U>> &
+  PickRequired<Omit<U, keyof PickRequired<T>>>
 
 // from https://stackoverflow.com/a/53955431
-export type IsUnion<T, U extends T = T> =
-(T extends any ?
-(U extends T ? false : true)
-    : never) extends false ? false : true
+export type IsUnion<T, U extends T = T> = (
+  T extends any ? (U extends T ? false : true) : never
+) extends false
+  ? false
+  : true
 
 // type Compute<T> = { [K in keyof T]: T[K] } | never