@tanstack/react-router 1.2.3 → 1.2.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.2.3"
+    "@tanstack/history": "1.2.5"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/route.ts

@@ -33,8 +33,6 @@ export type AnyContext = {}
 
 export interface RouteContext {}
 
-export interface RouteMeta {}
-
 export type PreloadableObj = { preload?: () => Promise<void> }
 
 export type RoutePathOptions<TCustomId, TPath> =
@@ -48,14 +46,6 @@ export type RoutePathOptions<TCustomId, TPath> =
 export type RoutePathOptionsIntersection<TCustomId, TPath> =
   UnionToIntersection<RoutePathOptions<TCustomId, TPath>>
 
-export type MetaOptions = keyof PickRequired<RouteMeta> extends never
-  ? {
-      meta?: RouteMeta
-    }
-  : {
-      meta: RouteMeta
-    }
-
 export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
@@ -188,7 +178,7 @@ type BeforeLoadFn<
 
 export type UpdatableRouteOptions<
   TFullSearchSchema extends Record<string, any>,
-> = MetaOptions & {
+> = {
   // test?: (args: TAllContext) => void
   // If true, this route will be matched as case-sensitive
   caseSensitive?: boolean

package/src/router.ts

@@ -259,12 +259,18 @@ export class Router<
   startReactTransition: (fn: () => void) => void = (fn) => fn()
 
   update = (newOptions: RouterConstructorOptions<TRouteTree, TDehydrated>) => {
+    const previousOptions = this.options
     this.options = {
       ...this.options,
       ...newOptions,
     }
 
-    this.basepath = `/${trimPath(newOptions.basepath ?? '') ?? ''}`
+    if (
+      !this.basepath ||
+      (newOptions.basepath && newOptions.basepath !== previousOptions.basepath)
+    ) {
+      this.basepath = `/${trimPath(newOptions.basepath ?? '') ?? ''}`
+    }
 
     if (
       !this.history ||
@@ -274,7 +280,9 @@ export class Router<
         this.options.history ??
         (typeof document !== 'undefined'
           ? createBrowserHistory()
-          : createMemoryHistory())
+          : createMemoryHistory({
+              initialEntries: [this.options.basepath || '/'],
+            }))
       this.latestLocation = this.parseLocation()
     }