Skip to content

fix(router-core): Non nested paths - only strip trailing underscore on route segments #5182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 22, 2025
Merged

fix(router-core): Non nested paths - only strip trailing underscore on route segments #5182

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf5a6ab
ensure only route segments are checked for trailing underscore
nlynzaad Sep 21, 2025
c551bf3
update and restructure tests
nlynzaad Sep 21, 2025
91705d6
update tests for solid
nlynzaad Sep 22, 2025
5aa2f1d
minor cleanups
nlynzaad Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
570 changes: 504 additions & 66 deletions e2e/react-router/basic-file-based/src/routeTree.gen.ts
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions e2e/react-router/basic-file-based/src/routes/non-nested/baz.$bazid.tsx
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions e2e/react-router/basic-file-based/src/routes/non-nested/baz.tsx
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions e2e/react-router/basic-file-based/src/routes/non-nested/baz_.$bazid.edit.tsx
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/named/$baz.foo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/named/$baz/foo')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()

return (
<div>
<div data-testid="non-nested-named-baz-foo-heading">
Hello nested named baz foo page
</div>
<div data-testid="non-nested-named-baz-foo-param">
{JSON.stringify(params)}
</div>
</div>
)
}
19 changes: 19 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/named/$baz.index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/named/$baz/')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()
return (
<div>
<div data-testid="non-nested-named-baz-index-heading">
Hello nested named baz index
</div>
<div data-testid="non-nested-named-baz-index-param">
{JSON.stringify(params)}
</div>
</div>
)
}
16 changes: 16 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/named/$baz.route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Outlet, createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/named/$baz')({
component: RouteComponent,
})

function RouteComponent() {
return (
<div>
<div data-testid="non-nested-named-baz-route-heading">
Hello non-nested named baz route layout
</div>
<Outlet />
</div>
)
}
19 changes: 19 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/named/$baz_.bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/named/$baz_/bar')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()
return (
<div>
<div data-testid="non-nested-named-baz-bar-heading">
Hello non-nested named bar
</div>
<div data-testid="non-nested-named-baz-bar-param">
{JSON.stringify(params)}
</div>
</div>
)
}
58 changes: 58 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/named/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import { Link, Outlet, createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/named')({
component: RouteComponent,
})

function RouteComponent() {
return (
<div>
<div data-testid="non-nested-named-root-route-heading">
Hello non-nested named layout
</div>
<div>
<Link
from={Route.fullPath}
to="./$baz"
params={{ baz: 'baz' }}
data-testid="to-named-index"
>
To named index
</Link>
<Link
from={Route.fullPath}
to="./$baz/foo"
params={{ baz: 'baz' }}
data-testid="to-named-foo"
>
To named foo
</Link>
<Link
from={Route.fullPath}
to="./$baz/foo"
params={{ baz: 'baz_' }}
data-testid="to-named-foo-2"
>
To named foo 2
</Link>
<Link
from={Route.fullPath}
to="./$baz/bar"
params={{ baz: 'baz' }}
data-testid="to-named-bar"
>
To named bar
</Link>
<Link
from={Route.fullPath}
to="./$baz/bar"
params={{ baz: 'baz_' }}
data-testid="to-named-bar-2"
>
To named bar 2
</Link>
</div>
<Outlet />
</div>
)
}
20 changes: 20 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/path/baz.foo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/path/baz/foo')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()

return (
<div>
<div data-testid="non-nested-path-baz-foo-heading">
Hello nested path baz foo page
</div>
<div data-testid="non-nested-path-baz-foo-param">
{JSON.stringify(params)}
</div>
</div>
)
}
19 changes: 19 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/path/baz.index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/path/baz/')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()
return (
<div>
<div data-testid="non-nested-path-baz-index-heading">
Hello nested path baz index
</div>
<div data-testid="non-nested-path-baz-index-param">
{JSON.stringify(params)}
</div>
</div>
)
}
16 changes: 16 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/path/baz.route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Outlet, createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/path/baz')({
component: RouteComponent,
})

function RouteComponent() {
return (
<div>
<div data-testid="non-nested-path-baz-route-heading">
Hello non-nested path baz route layout
</div>
<Outlet />
</div>
)
}
19 changes: 19 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/path/baz_.bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/path/baz_/bar')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()
return (
<div>
<div data-testid="non-nested-path-baz-bar-heading">
Hello non-nested path bar
</div>
<div data-testid="non-nested-path-baz-bar-param">
{JSON.stringify(params)}
</div>
</div>
)
}
33 changes: 33 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/path/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { Link, Outlet, createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/path')({
component: RouteComponent,
})

function RouteComponent() {
return (
<div>
<div data-testid="non-nested-path-root-route-heading">
Hello non-nested path layout
</div>
<div>
<Link from={Route.fullPath} to="./baz" data-testid="to-path-index">
To path index
</Link>
<Link from={Route.fullPath} to="./baz/foo" data-testid="to-path-foo">
To path foo
</Link>
<Link from={Route.fullPath} to="./baz/foo" data-testid="to-path-foo-2">
To path foo 2
</Link>
<Link from={Route.fullPath} to="./baz/bar" data-testid="to-path-bar">
To path bar
</Link>
<Link from={Route.fullPath} to="./baz/bar" data-testid="to-path-bar-2">
To path bar 2
</Link>
</div>
<Outlet />
</div>
)
}
20 changes: 20 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/prefix/prefix{$baz}.foo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/prefix/prefix{$baz}/foo')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()

return (
<div>
<div data-testid="non-nested-prefix-baz-foo-heading">
Hello nested prefix foo page
</div>
<div data-testid="non-nested-prefix-baz-foo-param">
{JSON.stringify(params)}
</div>
</div>
)
}
19 changes: 19 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/prefix/prefix{$baz}.index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/prefix/prefix{$baz}/')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()
return (
<div>
<div data-testid="non-nested-prefix-baz-index-heading">
Hello nested prefix index
</div>
<div data-testid="non-nested-prefix-baz-index-param">
{JSON.stringify(params)}
</div>
</div>
)
}
16 changes: 16 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/prefix/prefix{$baz}.route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Outlet, createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/prefix/prefix{$baz}')({
component: RouteComponent,
})

function RouteComponent() {
return (
<div>
<div data-testid="non-nested-prefix-baz-route-heading">
Hello non-nested prefix route layout
</div>
<Outlet />
</div>
)
}
19 changes: 19 additions & 0 deletions e2e/react-router/basic-file-based/src/routes/non-nested/prefix/prefix{$baz}_.bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createFileRoute } from '@tanstack/react-router'

export const Route = createFileRoute('/non-nested/prefix/prefix{$baz}_/bar')({
component: RouteComponent,
})

function RouteComponent() {
const params = Route.useParams()
return (
<div>
<div data-testid="non-nested-prefix-baz-bar-heading">
Hello non-nested wildcard bar
</div>
<div data-testid="non-nested-prefix-baz-bar-param">
{JSON.stringify(params)}
</div>
</div>
)
}
Loading
Loading