Skip to content

fix: serial head execution #6093

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
schiller-manuel merged 6 commits into from
Dec 23, 2025
Merged

fix: serial head execution #6093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8bb4816
fix: serial head execution
schiller-manuel Dec 13, 2025
f320bb0
fix types for TS 5.4
schiller-manuel Dec 17, 2025
921730e
remove testing for not supported throwing of `notFound()` in `head()`
schiller-manuel Dec 17, 2025
b4890a8
remove head thrower
schiller-manuel Dec 23, 2025
87908f3
remove head thrower
schiller-manuel Dec 23, 2025
815e77b
dont iterate twice
schiller-manuel Dec 23, 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
21 changes: 0 additions & 21 deletions e2e/react-start/basic/src/routeTree.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import { Route as SearchParamsDefaultRouteImport } from './routes/search-params/
import { Route as RedirectTargetRouteImport } from './routes/redirect/$target'
import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
import { Route as NotFoundViaHeadRouteImport } from './routes/not-found/via-head'
import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
import { Route as MultiCookieRedirectTargetRouteImport } from './routes/multi-cookie-redirect/target'
import { Route as ApiUsersRouteImport } from './routes/api.users'
Expand Down Expand Up @@ -174,11 +173,6 @@ const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({
path: '/via-loader',
getParentRoute: () => NotFoundRouteRoute,
} as any)
const NotFoundViaHeadRoute = NotFoundViaHeadRouteImport.update({
id: '/via-head',
path: '/via-head',
getParentRoute: () => NotFoundRouteRoute,
} as any)
const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
id: '/via-beforeLoad',
path: '/via-beforeLoad',
Expand Down Expand Up @@ -285,7 +279,6 @@ export interface FileRoutesByFullPath {
'/api/users': typeof ApiUsersRouteWithChildren
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
'/not-found/via-head': typeof NotFoundViaHeadRoute
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
'/posts/$postId': typeof PostsPostIdRoute
'/redirect/$target': typeof RedirectTargetRouteWithChildren
Expand Down Expand Up @@ -323,7 +316,6 @@ export interface FileRoutesByTo {
'/api/users': typeof ApiUsersRouteWithChildren
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
'/not-found/via-head': typeof NotFoundViaHeadRoute
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
'/posts/$postId': typeof PostsPostIdRoute
'/search-params/default': typeof SearchParamsDefaultRoute
Expand Down Expand Up @@ -366,7 +358,6 @@ export interface FileRoutesById {
'/api/users': typeof ApiUsersRouteWithChildren
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
'/not-found/via-head': typeof NotFoundViaHeadRoute
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
'/posts/$postId': typeof PostsPostIdRoute
'/redirect/$target': typeof RedirectTargetRouteWithChildren
Expand Down Expand Up @@ -410,7 +401,6 @@ export interface FileRouteTypes {
| '/api/users'
| '/multi-cookie-redirect/target'
| '/not-found/via-beforeLoad'
| '/not-found/via-head'
| '/not-found/via-loader'
| '/posts/$postId'
| '/redirect/$target'
Expand Down Expand Up @@ -448,7 +438,6 @@ export interface FileRouteTypes {
| '/api/users'
| '/multi-cookie-redirect/target'
| '/not-found/via-beforeLoad'
| '/not-found/via-head'
| '/not-found/via-loader'
| '/posts/$postId'
| '/search-params/default'
Expand Down Expand Up @@ -490,7 +479,6 @@ export interface FileRouteTypes {
| '/api/users'
| '/multi-cookie-redirect/target'
| '/not-found/via-beforeLoad'
| '/not-found/via-head'
| '/not-found/via-loader'
| '/posts/$postId'
| '/redirect/$target'
Expand Down Expand Up @@ -710,13 +698,6 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof NotFoundViaLoaderRouteImport
parentRoute: typeof NotFoundRouteRoute
}
'/not-found/via-head': {
id: '/not-found/via-head'
path: '/via-head'
fullPath: '/not-found/via-head'
preLoaderRoute: typeof NotFoundViaHeadRouteImport
parentRoute: typeof NotFoundRouteRoute
}
'/not-found/via-beforeLoad': {
id: '/not-found/via-beforeLoad'
path: '/via-beforeLoad'
Expand Down Expand Up @@ -841,14 +822,12 @@ declare module '@tanstack/react-router' {

interface NotFoundRouteRouteChildren {
NotFoundViaBeforeLoadRoute: typeof NotFoundViaBeforeLoadRoute
NotFoundViaHeadRoute: typeof NotFoundViaHeadRoute
NotFoundViaLoaderRoute: typeof NotFoundViaLoaderRoute
NotFoundIndexRoute: typeof NotFoundIndexRoute
}

const NotFoundRouteRouteChildren: NotFoundRouteRouteChildren = {
NotFoundViaBeforeLoadRoute: NotFoundViaBeforeLoadRoute,
NotFoundViaHeadRoute: NotFoundViaHeadRoute,
NotFoundViaLoaderRoute: NotFoundViaLoaderRoute,
NotFoundIndexRoute: NotFoundIndexRoute,
}
Expand Down
10 changes: 0 additions & 10 deletions e2e/react-start/basic/src/routes/not-found/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@ export const Route = createFileRoute('/not-found/')({
via-loader
</Link>
</div>
<div className="mb-2">
<Link
from={Route.fullPath}
to="./via-head"
preload={preload}
data-testid="via-head"
>
via-head
</Link>
</div>
</div>
)
},
Expand Down
23 changes: 0 additions & 23 deletions e2e/react-start/basic/src/routes/not-found/via-head.tsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions e2e/react-start/basic/tests/not-found.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test.describe('not-found', () => {
test.describe('throw notFound()', () => {
const navigationTestMatrix = combinate({
// TODO beforeLoad!
thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
preload: [false, true] as const,
})

Expand Down Expand Up @@ -58,7 +58,7 @@ test.describe('not-found', () => {
const directVisitTestMatrix = combinate({
// TODO beforeLoad!

thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
})

directVisitTestMatrix.forEach(({ thrower }) => {
Expand Down
1 change: 0 additions & 1 deletion e2e/react-start/basic/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const prerenderConfiguration = {
'/redirect',
'/i-do-not-exist',
'/not-found/via-beforeLoad',
'/not-found/via-head',
'/not-found/via-loader',
'/users',
].some((p) => page.path.includes(p)),
Expand Down
21 changes: 0 additions & 21 deletions e2e/solid-start/basic/src/routeTree.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import { Route as SearchParamsDefaultRouteImport } from './routes/search-params/
import { Route as RedirectTargetRouteImport } from './routes/redirect/$target'
import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
import { Route as NotFoundViaHeadRouteImport } from './routes/not-found/via-head'
import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
import { Route as MultiCookieRedirectTargetRouteImport } from './routes/multi-cookie-redirect/target'
import { Route as ApiUsersRouteImport } from './routes/api/users'
Expand Down Expand Up @@ -174,11 +173,6 @@ const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({
path: '/via-loader',
getParentRoute: () => NotFoundRouteRoute,
} as any)
const NotFoundViaHeadRoute = NotFoundViaHeadRouteImport.update({
id: '/via-head',
path: '/via-head',
getParentRoute: () => NotFoundRouteRoute,
} as any)
const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
id: '/via-beforeLoad',
path: '/via-beforeLoad',
Expand Down Expand Up @@ -287,7 +281,6 @@ export interface FileRoutesByFullPath {
'/api/users': typeof ApiUsersRouteWithChildren
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
'/not-found/via-head': typeof NotFoundViaHeadRoute
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
'/posts/$postId': typeof PostsPostIdRoute
'/redirect/$target': typeof RedirectTargetRouteWithChildren
Expand Down Expand Up @@ -325,7 +318,6 @@ export interface FileRoutesByTo {
'/api/users': typeof ApiUsersRouteWithChildren
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
'/not-found/via-head': typeof NotFoundViaHeadRoute
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
'/posts/$postId': typeof PostsPostIdRoute
'/search-params/default': typeof SearchParamsDefaultRoute
Expand Down Expand Up @@ -369,7 +361,6 @@ export interface FileRoutesById {
'/api/users': typeof ApiUsersRouteWithChildren
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
'/not-found/via-head': typeof NotFoundViaHeadRoute
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
'/posts/$postId': typeof PostsPostIdRoute
'/redirect/$target': typeof RedirectTargetRouteWithChildren
Expand Down Expand Up @@ -413,7 +404,6 @@ export interface FileRouteTypes {
| '/api/users'
| '/multi-cookie-redirect/target'
| '/not-found/via-beforeLoad'
| '/not-found/via-head'
| '/not-found/via-loader'
| '/posts/$postId'
| '/redirect/$target'
Expand Down Expand Up @@ -451,7 +441,6 @@ export interface FileRouteTypes {
| '/api/users'
| '/multi-cookie-redirect/target'
| '/not-found/via-beforeLoad'
| '/not-found/via-head'
| '/not-found/via-loader'
| '/posts/$postId'
| '/search-params/default'
Expand Down Expand Up @@ -494,7 +483,6 @@ export interface FileRouteTypes {
| '/api/users'
| '/multi-cookie-redirect/target'
| '/not-found/via-beforeLoad'
| '/not-found/via-head'
| '/not-found/via-loader'
| '/posts/$postId'
| '/redirect/$target'
Expand Down Expand Up @@ -715,13 +703,6 @@ declare module '@tanstack/solid-router' {
preLoaderRoute: typeof NotFoundViaLoaderRouteImport
parentRoute: typeof NotFoundRouteRoute
}
'/not-found/via-head': {
id: '/not-found/via-head'
path: '/via-head'
fullPath: '/not-found/via-head'
preLoaderRoute: typeof NotFoundViaHeadRouteImport
parentRoute: typeof NotFoundRouteRoute
}
'/not-found/via-beforeLoad': {
id: '/not-found/via-beforeLoad'
path: '/via-beforeLoad'
Expand Down Expand Up @@ -846,14 +827,12 @@ declare module '@tanstack/solid-router' {

interface NotFoundRouteRouteChildren {
NotFoundViaBeforeLoadRoute: typeof NotFoundViaBeforeLoadRoute
NotFoundViaHeadRoute: typeof NotFoundViaHeadRoute
NotFoundViaLoaderRoute: typeof NotFoundViaLoaderRoute
NotFoundIndexRoute: typeof NotFoundIndexRoute
}

const NotFoundRouteRouteChildren: NotFoundRouteRouteChildren = {
NotFoundViaBeforeLoadRoute: NotFoundViaBeforeLoadRoute,
NotFoundViaHeadRoute: NotFoundViaHeadRoute,
NotFoundViaLoaderRoute: NotFoundViaLoaderRoute,
NotFoundIndexRoute: NotFoundIndexRoute,
}
Expand Down
10 changes: 0 additions & 10 deletions e2e/solid-start/basic/src/routes/not-found/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@ export const Route = createFileRoute('/not-found/')({
via-loader
</Link>
</div>
<div class="mb-2">
<Link
from={Route.fullPath}
to="./via-head"
preload={preload()}
data-testid="via-head"
>
via-head
</Link>
</div>
</div>
)
},
Expand Down
23 changes: 0 additions & 23 deletions e2e/solid-start/basic/src/routes/not-found/via-head.tsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions e2e/solid-start/basic/tests/not-found.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test.describe('not-found', () => {
test.describe('throw notFound()', () => {
const navigationTestMatrix = combinate({
// TODO beforeLoad!
thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
preload: [false, true] as const,
})

Expand Down Expand Up @@ -57,7 +57,7 @@ test.describe('not-found', () => {
const directVisitTestMatrix = combinate({
// TODO beforeLoad!

thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
})

directVisitTestMatrix.forEach(({ thrower }) => {
Expand Down
1 change: 0 additions & 1 deletion e2e/solid-start/basic/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const prerenderConfiguration = {
'/redirect',
'/i-do-not-exist',
'/not-found/via-beforeLoad',
'/not-found/via-head',
'/not-found/via-loader',
'/search-params/default',
'/transition',
Expand Down
Loading
Loading