@tanstack/react-router 1.5.8 → 1.5.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/build/cjs/fileRoute.js.map +1 -1
  2. package/build/cjs/route.js.map +1 -1
  3. package/build/cjs/router.js +5 -1
  4. package/build/cjs/router.js.map +1 -1
  5. package/build/esm/index.js +5 -1
  6. package/build/esm/index.js.map +1 -1
  7. package/build/stats-html.html +1 -1
  8. package/build/stats-react.json +397 -397
  9. package/build/types/fileRoute.d.ts +1 -1
  10. package/build/umd/index.development.js +5 -1
  11. package/build/umd/index.development.js.map +1 -1
  12. package/build/umd/index.production.js +1 -1
  13. package/build/umd/index.production.js.map +1 -1
  14. package/package.json +2 -2
  15. package/src/fileRoute.ts +6 -5
  16. package/src/route.ts +6 -5
  17. package/src/router.ts +9 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@tanstack/react-router",
3
3
  "author": "Tanner Linsley",
4
- "version": "1.5.8",
4
+ "version": "1.5.10",
5
5
  "license": "MIT",
6
6
  "repository": "tanstack/router",
7
7
  "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
44
44
  "@tanstack/store": "^0.1.3",
45
45
  "tiny-invariant": "^1.3.1",
46
46
  "tiny-warning": "^1.0.3",
47
- "@tanstack/history": "1.5.8"
47
+ "@tanstack/history": "1.5.10"
48
48
  },
49
49
  "scripts": {
50
50
  "build": "rollup --config rollup.config.js"
package/src/fileRoute.ts CHANGED
@@ -77,11 +77,12 @@ export type ResolveFilePath<
77
77
  export type FileRoutePath<
78
78
  TParentRoute extends AnyRoute,
79
79
  TFilePath extends string,
80
- > = ResolveFilePath<TParentRoute, TFilePath> extends `_${infer _}`
81
- ? string
82
- : ResolveFilePath<TParentRoute, TFilePath> extends `/_${infer _}`
83
- ? string
84
- : ResolveFilePath<TParentRoute, TFilePath>
80
+ > =
81
+ ResolveFilePath<TParentRoute, TFilePath> extends `_${infer _}`
82
+ ? ''
83
+ : ResolveFilePath<TParentRoute, TFilePath> extends `/_${infer _}`
84
+ ? ''
85
+ : ResolveFilePath<TParentRoute, TFilePath>
85
86
 
86
87
  export class FileRoute<
87
88
  TFilePath extends keyof FileRoutesByPath,
package/src/route.ts CHANGED
@@ -342,11 +342,12 @@ export type MergeFromFromParent<T, U> = IsAny<T, U, T & U>
342
342
  export type ResolveAllParams<
343
343
  TParentRoute extends AnyRoute,
344
344
  TParams extends AnyPathParams,
345
- > = Record<never, string> extends TParentRoute['types']['allParams']
346
- ? TParams
347
- : Expand<
348
- UnionToIntersection<TParentRoute['types']['allParams'] & TParams> & {}
349
- >
345
+ > =
346
+ Record<never, string> extends TParentRoute['types']['allParams']
347
+ ? TParams
348
+ : Expand<
349
+ UnionToIntersection<TParentRoute['types']['allParams'] & TParams> & {}
350
+ >
350
351
 
351
352
  export type RouteConstraints = {
352
353
  TParentRoute: AnyRoute
package/src/router.ts CHANGED
@@ -274,7 +274,15 @@ export class Router<
274
274
  !this.basepath ||
275
275
  (newOptions.basepath && newOptions.basepath !== previousOptions.basepath)
276
276
  ) {
277
- this.basepath = `/${trimPath(newOptions.basepath ?? '') ?? ''}`
277
+ if (
278
+ newOptions.basepath === undefined ||
279
+ newOptions.basepath === '' ||
280
+ newOptions.basepath === '/'
281
+ ) {
282
+ this.basepath = '/'
283
+ } else {
284
+ this.basepath = `/${trimPath(newOptions.basepath)}`
285
+ }
278
286
  }
279
287
 
280
288
  if (