Skip to content

Commit afaecfc

Browse files
authored
fix(router-generator): remove trailing slash from pathless route group paths (#5491)
1 parent 5c408cc commit afaecfc

File tree

7 files changed

+122
-281
lines changed

7 files changed

+122
-281
lines changed

e2e/react-router/basic-file-based/src/routeTree.gen.ts

Lines changed: 24 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// You should NOT make any changes in this file as it will be overwritten.
99
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
1010

11-
import { createFileRoute } from '@tanstack/react-router'
12-
1311
import { Route as rootRouteImport } from './routes/__root'
1412
import { Route as Char45824Char54620Char48124Char44397RouteImport } from './routes/대한민국'
1513
import { Route as RemountDepsRouteImport } from './routes/remountDeps'
@@ -99,12 +97,6 @@ import { Route as RelativeLinkPathPathIndexRouteImport } from './routes/relative
9997
import { Route as RelativeLinkNestedDeepIndexRouteImport } from './routes/relative/link/nested/deep/index'
10098
import { Route as ParamsPsNamedFooBarBazRouteImport } from './routes/params-ps/named/$foo/$bar.$baz'
10199

102-
const groupRouteImport = createFileRoute('/(group)')()
103-
104-
const groupRoute = groupRouteImport.update({
105-
id: '/(group)',
106-
getParentRoute: () => rootRouteImport,
107-
} as any)
108100
const Char45824Char54620Char48124Char44397Route =
109101
Char45824Char54620Char48124Char44397RouteImport.update({
110102
id: '/대한민국',
@@ -217,19 +209,19 @@ const LayoutLayout2Route = LayoutLayout2RouteImport.update({
217209
} as any)
218210
const groupLazyinsideRoute = groupLazyinsideRouteImport
219211
.update({
220-
id: '/lazyinside',
212+
id: '/(group)/lazyinside',
221213
path: '/lazyinside',
222-
getParentRoute: () => groupRoute,
214+
getParentRoute: () => rootRouteImport,
223215
} as any)
224216
.lazy(() => import('./routes/(group)/lazyinside.lazy').then((d) => d.Route))
225217
const groupInsideRoute = groupInsideRouteImport.update({
226-
id: '/inside',
218+
id: '/(group)/inside',
227219
path: '/inside',
228-
getParentRoute: () => groupRoute,
220+
getParentRoute: () => rootRouteImport,
229221
} as any)
230222
const groupLayoutRoute = groupLayoutRouteImport.update({
231-
id: '/_layout',
232-
getParentRoute: () => groupRoute,
223+
id: '/(group)/_layout',
224+
getParentRoute: () => rootRouteImport,
233225
} as any)
234226
const anotherGroupOnlyrouteinsideRoute =
235227
anotherGroupOnlyrouteinsideRouteImport.update({
@@ -388,9 +380,9 @@ const LayoutLayout2LayoutARoute = LayoutLayout2LayoutARouteImport.update({
388380
getParentRoute: () => LayoutLayout2Route,
389381
} as any)
390382
const groupSubfolderInsideRoute = groupSubfolderInsideRouteImport.update({
391-
id: '/subfolder/inside',
383+
id: '/(group)/subfolder/inside',
392384
path: '/subfolder/inside',
393-
getParentRoute: () => groupRoute,
385+
getParentRoute: () => rootRouteImport,
394386
} as any)
395387
const groupLayoutInsidelayoutRoute = groupLayoutInsidelayoutRouteImport.update({
396388
id: '/insidelayout',
@@ -572,7 +564,7 @@ const ParamsPsNamedFooBarBazRoute = ParamsPsNamedFooBarBazRouteImport.update({
572564
} as any)
573565

574566
export interface FileRoutesByFullPath {
575-
'/': typeof groupLayoutRouteWithChildren
567+
'/': typeof IndexRoute
576568
'/non-nested': typeof NonNestedRouteRouteWithChildren
577569
'/search-params': typeof SearchParamsRouteRouteWithChildren
578570
'/anchor': typeof AnchorRoute
@@ -658,7 +650,7 @@ export interface FileRoutesByFullPath {
658650
'/relative/useNavigate/path/$path': typeof RelativeUseNavigatePathPathIndexRoute
659651
}
660652
export interface FileRoutesByTo {
661-
'/': typeof groupLayoutRouteWithChildren
653+
'/': typeof IndexRoute
662654
'/non-nested': typeof NonNestedRouteRouteWithChildren
663655
'/anchor': typeof AnchorRoute
664656
'/component-types-test': typeof ComponentTypesTestRoute
@@ -758,7 +750,6 @@ export interface FileRoutesById {
758750
'/relative/link': typeof RelativeLinkRouteRouteWithChildren
759751
'/relative/useNavigate': typeof RelativeUseNavigateRouteRouteWithChildren
760752
'/(another-group)/onlyrouteinside': typeof anotherGroupOnlyrouteinsideRoute
761-
'/(group)': typeof groupRouteWithChildren
762753
'/(group)/_layout': typeof groupLayoutRouteWithChildren
763754
'/(group)/inside': typeof groupInsideRoute
764755
'/(group)/lazyinside': typeof groupLazyinsideRoute
@@ -1015,7 +1006,6 @@ export interface FileRouteTypes {
10151006
| '/relative/link'
10161007
| '/relative/useNavigate'
10171008
| '/(another-group)/onlyrouteinside'
1018-
| '/(group)'
10191009
| '/(group)/_layout'
10201010
| '/(group)/inside'
10211011
| '/(group)/lazyinside'
@@ -1102,13 +1092,16 @@ export interface RootRouteChildren {
11021092
RelativeLinkRouteRoute: typeof RelativeLinkRouteRouteWithChildren
11031093
RelativeUseNavigateRouteRoute: typeof RelativeUseNavigateRouteRouteWithChildren
11041094
anotherGroupOnlyrouteinsideRoute: typeof anotherGroupOnlyrouteinsideRoute
1105-
groupRoute: typeof groupRouteWithChildren
1095+
groupLayoutRoute: typeof groupLayoutRouteWithChildren
1096+
groupInsideRoute: typeof groupInsideRoute
1097+
groupLazyinsideRoute: typeof groupLazyinsideRoute
11061098
RedirectTargetRoute: typeof RedirectTargetRouteWithChildren
11071099
StructuralSharingEnabledRoute: typeof StructuralSharingEnabledRoute
11081100
ParamsPsIndexRoute: typeof ParamsPsIndexRoute
11091101
RedirectIndexRoute: typeof RedirectIndexRoute
11101102
RelativeIndexRoute: typeof RelativeIndexRoute
11111103
ParamsPsNamedFooRouteRoute: typeof ParamsPsNamedFooRouteRouteWithChildren
1104+
groupSubfolderInsideRoute: typeof groupSubfolderInsideRoute
11121105
ParamsPsNamedPrefixChar123fooChar125Route: typeof ParamsPsNamedPrefixChar123fooChar125Route
11131106
ParamsPsNamedChar123fooChar125suffixRoute: typeof ParamsPsNamedChar123fooChar125suffixRoute
11141107
ParamsPsWildcardSplatRoute: typeof ParamsPsWildcardSplatRoute
@@ -1125,13 +1118,6 @@ export interface RootRouteChildren {
11251118

11261119
declare module '@tanstack/react-router' {
11271120
interface FileRoutesByPath {
1128-
'/(group)': {
1129-
id: '/(group)'
1130-
path: '/'
1131-
fullPath: '/'
1132-
preLoaderRoute: typeof groupRouteImport
1133-
parentRoute: typeof rootRouteImport
1134-
}
11351121
'/대한민국': {
11361122
id: '/대한민국'
11371123
path: '/대한민국'
@@ -1291,21 +1277,21 @@ declare module '@tanstack/react-router' {
12911277
path: '/lazyinside'
12921278
fullPath: '/lazyinside'
12931279
preLoaderRoute: typeof groupLazyinsideRouteImport
1294-
parentRoute: typeof groupRoute
1280+
parentRoute: typeof rootRouteImport
12951281
}
12961282
'/(group)/inside': {
12971283
id: '/(group)/inside'
12981284
path: '/inside'
12991285
fullPath: '/inside'
13001286
preLoaderRoute: typeof groupInsideRouteImport
1301-
parentRoute: typeof groupRoute
1287+
parentRoute: typeof rootRouteImport
13021288
}
13031289
'/(group)/_layout': {
13041290
id: '/(group)/_layout'
1305-
path: '/'
1306-
fullPath: '/'
1291+
path: ''
1292+
fullPath: ''
13071293
preLoaderRoute: typeof groupLayoutRouteImport
1308-
parentRoute: typeof groupRoute
1294+
parentRoute: typeof rootRouteImport
13091295
}
13101296
'/(another-group)/onlyrouteinside': {
13111297
id: '/(another-group)/onlyrouteinside'
@@ -1515,7 +1501,7 @@ declare module '@tanstack/react-router' {
15151501
path: '/subfolder/inside'
15161502
fullPath: '/subfolder/inside'
15171503
preLoaderRoute: typeof groupSubfolderInsideRouteImport
1518-
parentRoute: typeof groupRoute
1504+
parentRoute: typeof rootRouteImport
15191505
}
15201506
'/(group)/_layout/insidelayout': {
15211507
id: '/(group)/_layout/insidelayout'
@@ -2029,22 +2015,6 @@ const groupLayoutRouteWithChildren = groupLayoutRoute._addFileChildren(
20292015
groupLayoutRouteChildren,
20302016
)
20312017

2032-
interface groupRouteChildren {
2033-
groupLayoutRoute: typeof groupLayoutRouteWithChildren
2034-
groupInsideRoute: typeof groupInsideRoute
2035-
groupLazyinsideRoute: typeof groupLazyinsideRoute
2036-
groupSubfolderInsideRoute: typeof groupSubfolderInsideRoute
2037-
}
2038-
2039-
const groupRouteChildren: groupRouteChildren = {
2040-
groupLayoutRoute: groupLayoutRouteWithChildren,
2041-
groupInsideRoute: groupInsideRoute,
2042-
groupLazyinsideRoute: groupLazyinsideRoute,
2043-
groupSubfolderInsideRoute: groupSubfolderInsideRoute,
2044-
}
2045-
2046-
const groupRouteWithChildren = groupRoute._addFileChildren(groupRouteChildren)
2047-
20482018
interface RedirectTargetRouteChildren {
20492019
RedirectTargetViaBeforeLoadRoute: typeof RedirectTargetViaBeforeLoadRoute
20502020
RedirectTargetViaLoaderRoute: typeof RedirectTargetViaLoaderRoute
@@ -2106,13 +2076,16 @@ const rootRouteChildren: RootRouteChildren = {
21062076
RelativeLinkRouteRoute: RelativeLinkRouteRouteWithChildren,
21072077
RelativeUseNavigateRouteRoute: RelativeUseNavigateRouteRouteWithChildren,
21082078
anotherGroupOnlyrouteinsideRoute: anotherGroupOnlyrouteinsideRoute,
2109-
groupRoute: groupRouteWithChildren,
2079+
groupLayoutRoute: groupLayoutRouteWithChildren,
2080+
groupInsideRoute: groupInsideRoute,
2081+
groupLazyinsideRoute: groupLazyinsideRoute,
21102082
RedirectTargetRoute: RedirectTargetRouteWithChildren,
21112083
StructuralSharingEnabledRoute: StructuralSharingEnabledRoute,
21122084
ParamsPsIndexRoute: ParamsPsIndexRoute,
21132085
RedirectIndexRoute: RedirectIndexRoute,
21142086
RelativeIndexRoute: RelativeIndexRoute,
21152087
ParamsPsNamedFooRouteRoute: ParamsPsNamedFooRouteRouteWithChildren,
2088+
groupSubfolderInsideRoute: groupSubfolderInsideRoute,
21162089
ParamsPsNamedPrefixChar123fooChar125Route:
21172090
ParamsPsNamedPrefixChar123fooChar125Route,
21182091
ParamsPsNamedChar123fooChar125suffixRoute:

0 commit comments

Comments
 (0)