Skip to content

Commit 3c994c4

Browse files
schiller-manuelschiller-manuel
authored
fix: serial head execution (#6093)
1 parent 7f14405 commit 3c994c4

File tree

16 files changed

+52
-207
lines changed

16 files changed

+52
-207
lines changed

‎e2e/react-start/basic/src/routeTree.gen.ts‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import { Route as SearchParamsDefaultRouteImport } from './routes/search-params/
3333
import { Route as RedirectTargetRouteImport } from './routes/redirect/$target'
3434
import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
3535
import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
36-
import { Route as NotFoundViaHeadRouteImport } from './routes/not-found/via-head'
3736
import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
3837
import { Route as MultiCookieRedirectTargetRouteImport } from './routes/multi-cookie-redirect/target'
3938
import { Route as ApiUsersRouteImport } from './routes/api.users'
@@ -174,11 +173,6 @@ const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({
174173
path: '/via-loader',
175174
getParentRoute: () => NotFoundRouteRoute,
176175
} as any)
177-
const NotFoundViaHeadRoute = NotFoundViaHeadRouteImport.update({
178-
id: '/via-head',
179-
path: '/via-head',
180-
getParentRoute: () => NotFoundRouteRoute,
181-
} as any)
182176
const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
183177
id: '/via-beforeLoad',
184178
path: '/via-beforeLoad',
@@ -285,7 +279,6 @@ export interface FileRoutesByFullPath {
285279
'/api/users': typeof ApiUsersRouteWithChildren
286280
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
287281
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
288-
'/not-found/via-head': typeof NotFoundViaHeadRoute
289282
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
290283
'/posts/$postId': typeof PostsPostIdRoute
291284
'/redirect/$target': typeof RedirectTargetRouteWithChildren
@@ -323,7 +316,6 @@ export interface FileRoutesByTo {
323316
'/api/users': typeof ApiUsersRouteWithChildren
324317
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
325318
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
326-
'/not-found/via-head': typeof NotFoundViaHeadRoute
327319
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
328320
'/posts/$postId': typeof PostsPostIdRoute
329321
'/search-params/default': typeof SearchParamsDefaultRoute
@@ -366,7 +358,6 @@ export interface FileRoutesById {
366358
'/api/users': typeof ApiUsersRouteWithChildren
367359
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
368360
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
369-
'/not-found/via-head': typeof NotFoundViaHeadRoute
370361
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
371362
'/posts/$postId': typeof PostsPostIdRoute
372363
'/redirect/$target': typeof RedirectTargetRouteWithChildren
@@ -410,7 +401,6 @@ export interface FileRouteTypes {
410401
| '/api/users'
411402
| '/multi-cookie-redirect/target'
412403
| '/not-found/via-beforeLoad'
413-
| '/not-found/via-head'
414404
| '/not-found/via-loader'
415405
| '/posts/$postId'
416406
| '/redirect/$target'
@@ -448,7 +438,6 @@ export interface FileRouteTypes {
448438
| '/api/users'
449439
| '/multi-cookie-redirect/target'
450440
| '/not-found/via-beforeLoad'
451-
| '/not-found/via-head'
452441
| '/not-found/via-loader'
453442
| '/posts/$postId'
454443
| '/search-params/default'
@@ -490,7 +479,6 @@ export interface FileRouteTypes {
490479
| '/api/users'
491480
| '/multi-cookie-redirect/target'
492481
| '/not-found/via-beforeLoad'
493-
| '/not-found/via-head'
494482
| '/not-found/via-loader'
495483
| '/posts/$postId'
496484
| '/redirect/$target'
@@ -710,13 +698,6 @@ declare module '@tanstack/react-router' {
710698
preLoaderRoute: typeof NotFoundViaLoaderRouteImport
711699
parentRoute: typeof NotFoundRouteRoute
712700
}
713-
'/not-found/via-head': {
714-
id: '/not-found/via-head'
715-
path: '/via-head'
716-
fullPath: '/not-found/via-head'
717-
preLoaderRoute: typeof NotFoundViaHeadRouteImport
718-
parentRoute: typeof NotFoundRouteRoute
719-
}
720701
'/not-found/via-beforeLoad': {
721702
id: '/not-found/via-beforeLoad'
722703
path: '/via-beforeLoad'
@@ -841,14 +822,12 @@ declare module '@tanstack/react-router' {
841822

842823
interface NotFoundRouteRouteChildren {
843824
NotFoundViaBeforeLoadRoute: typeof NotFoundViaBeforeLoadRoute
844-
NotFoundViaHeadRoute: typeof NotFoundViaHeadRoute
845825
NotFoundViaLoaderRoute: typeof NotFoundViaLoaderRoute
846826
NotFoundIndexRoute: typeof NotFoundIndexRoute
847827
}
848828

849829
const NotFoundRouteRouteChildren: NotFoundRouteRouteChildren = {
850830
NotFoundViaBeforeLoadRoute: NotFoundViaBeforeLoadRoute,
851-
NotFoundViaHeadRoute: NotFoundViaHeadRoute,
852831
NotFoundViaLoaderRoute: NotFoundViaLoaderRoute,
853832
NotFoundIndexRoute: NotFoundIndexRoute,
854833
}

‎e2e/react-start/basic/src/routes/not-found/index.tsx‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ export const Route = createFileRoute('/not-found/')({
2525
via-loader
2626
</Link>
2727
</div>
28-
<div className="mb-2">
29-
<Link
30-
from={Route.fullPath}
31-
to="./via-head"
32-
preload={preload}
33-
data-testid="via-head"
34-
>
35-
via-head
36-
</Link>
37-
</div>
3828
</div>
3929
)
4030
},

‎e2e/react-start/basic/src/routes/not-found/via-head.tsx‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎e2e/react-start/basic/tests/not-found.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test.describe('not-found', () => {
2626
test.describe('throw notFound()', () => {
2727
const navigationTestMatrix = combinate({
2828
// TODO beforeLoad!
29-
thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
29+
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
3030
preload: [false, true] as const,
3131
})
3232

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

61-
thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
61+
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
6262
})
6363

6464
directVisitTestMatrix.forEach(({ thrower }) => {

‎e2e/react-start/basic/vite.config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const prerenderConfiguration = {
2121
'/redirect',
2222
'/i-do-not-exist',
2323
'/not-found/via-beforeLoad',
24-
'/not-found/via-head',
2524
'/not-found/via-loader',
2625
'/users',
2726
].some((p) => page.path.includes(p)),

‎e2e/solid-start/basic/src/routeTree.gen.ts‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import { Route as SearchParamsDefaultRouteImport } from './routes/search-params/
3333
import { Route as RedirectTargetRouteImport } from './routes/redirect/$target'
3434
import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
3535
import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
36-
import { Route as NotFoundViaHeadRouteImport } from './routes/not-found/via-head'
3736
import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
3837
import { Route as MultiCookieRedirectTargetRouteImport } from './routes/multi-cookie-redirect/target'
3938
import { Route as ApiUsersRouteImport } from './routes/api/users'
@@ -174,11 +173,6 @@ const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({
174173
path: '/via-loader',
175174
getParentRoute: () => NotFoundRouteRoute,
176175
} as any)
177-
const NotFoundViaHeadRoute = NotFoundViaHeadRouteImport.update({
178-
id: '/via-head',
179-
path: '/via-head',
180-
getParentRoute: () => NotFoundRouteRoute,
181-
} as any)
182176
const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
183177
id: '/via-beforeLoad',
184178
path: '/via-beforeLoad',
@@ -287,7 +281,6 @@ export interface FileRoutesByFullPath {
287281
'/api/users': typeof ApiUsersRouteWithChildren
288282
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
289283
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
290-
'/not-found/via-head': typeof NotFoundViaHeadRoute
291284
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
292285
'/posts/$postId': typeof PostsPostIdRoute
293286
'/redirect/$target': typeof RedirectTargetRouteWithChildren
@@ -325,7 +318,6 @@ export interface FileRoutesByTo {
325318
'/api/users': typeof ApiUsersRouteWithChildren
326319
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
327320
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
328-
'/not-found/via-head': typeof NotFoundViaHeadRoute
329321
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
330322
'/posts/$postId': typeof PostsPostIdRoute
331323
'/search-params/default': typeof SearchParamsDefaultRoute
@@ -369,7 +361,6 @@ export interface FileRoutesById {
369361
'/api/users': typeof ApiUsersRouteWithChildren
370362
'/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
371363
'/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
372-
'/not-found/via-head': typeof NotFoundViaHeadRoute
373364
'/not-found/via-loader': typeof NotFoundViaLoaderRoute
374365
'/posts/$postId': typeof PostsPostIdRoute
375366
'/redirect/$target': typeof RedirectTargetRouteWithChildren
@@ -413,7 +404,6 @@ export interface FileRouteTypes {
413404
| '/api/users'
414405
| '/multi-cookie-redirect/target'
415406
| '/not-found/via-beforeLoad'
416-
| '/not-found/via-head'
417407
| '/not-found/via-loader'
418408
| '/posts/$postId'
419409
| '/redirect/$target'
@@ -451,7 +441,6 @@ export interface FileRouteTypes {
451441
| '/api/users'
452442
| '/multi-cookie-redirect/target'
453443
| '/not-found/via-beforeLoad'
454-
| '/not-found/via-head'
455444
| '/not-found/via-loader'
456445
| '/posts/$postId'
457446
| '/search-params/default'
@@ -494,7 +483,6 @@ export interface FileRouteTypes {
494483
| '/api/users'
495484
| '/multi-cookie-redirect/target'
496485
| '/not-found/via-beforeLoad'
497-
| '/not-found/via-head'
498486
| '/not-found/via-loader'
499487
| '/posts/$postId'
500488
| '/redirect/$target'
@@ -715,13 +703,6 @@ declare module '@tanstack/solid-router' {
715703
preLoaderRoute: typeof NotFoundViaLoaderRouteImport
716704
parentRoute: typeof NotFoundRouteRoute
717705
}
718-
'/not-found/via-head': {
719-
id: '/not-found/via-head'
720-
path: '/via-head'
721-
fullPath: '/not-found/via-head'
722-
preLoaderRoute: typeof NotFoundViaHeadRouteImport
723-
parentRoute: typeof NotFoundRouteRoute
724-
}
725706
'/not-found/via-beforeLoad': {
726707
id: '/not-found/via-beforeLoad'
727708
path: '/via-beforeLoad'
@@ -846,14 +827,12 @@ declare module '@tanstack/solid-router' {
846827

847828
interface NotFoundRouteRouteChildren {
848829
NotFoundViaBeforeLoadRoute: typeof NotFoundViaBeforeLoadRoute
849-
NotFoundViaHeadRoute: typeof NotFoundViaHeadRoute
850830
NotFoundViaLoaderRoute: typeof NotFoundViaLoaderRoute
851831
NotFoundIndexRoute: typeof NotFoundIndexRoute
852832
}
853833

854834
const NotFoundRouteRouteChildren: NotFoundRouteRouteChildren = {
855835
NotFoundViaBeforeLoadRoute: NotFoundViaBeforeLoadRoute,
856-
NotFoundViaHeadRoute: NotFoundViaHeadRoute,
857836
NotFoundViaLoaderRoute: NotFoundViaLoaderRoute,
858837
NotFoundIndexRoute: NotFoundIndexRoute,
859838
}

‎e2e/solid-start/basic/src/routes/not-found/index.tsx‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ export const Route = createFileRoute('/not-found/')({
2525
via-loader
2626
</Link>
2727
</div>
28-
<div class="mb-2">
29-
<Link
30-
from={Route.fullPath}
31-
to="./via-head"
32-
preload={preload()}
33-
data-testid="via-head"
34-
>
35-
via-head
36-
</Link>
37-
</div>
3828
</div>
3929
)
4030
},

‎e2e/solid-start/basic/src/routes/not-found/via-head.tsx‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎e2e/solid-start/basic/tests/not-found.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test.describe('not-found', () => {
2626
test.describe('throw notFound()', () => {
2727
const navigationTestMatrix = combinate({
2828
// TODO beforeLoad!
29-
thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
29+
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
3030
preload: [false, true] as const,
3131
})
3232

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

60-
thrower: [/* 'beforeLoad',*/ 'head', 'loader'] as const,
60+
thrower: [/* 'beforeLoad',*/ 'loader'] as const,
6161
})
6262

6363
directVisitTestMatrix.forEach(({ thrower }) => {

‎e2e/solid-start/basic/vite.config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const prerenderConfiguration = {
2121
'/redirect',
2222
'/i-do-not-exist',
2323
'/not-found/via-beforeLoad',
24-
'/not-found/via-head',
2524
'/not-found/via-loader',
2625
'/search-params/default',
2726
'/transition',

0 commit comments

Comments
 (0)