Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/spotty-moons-repeat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@solidjs/start": patch
---

Restore the optional `routerLoad` third argument to `createHandler`, which primes custom routers (e.g. TanStack Router) on the server before SSR rendering. It was accidentally dropped in the v2 rewrite.
6 changes: 5 additions & 1 deletion packages/start/src/server/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export function createBaseHandler(
createPageEvent: (e: FetchEvent) => Promise<PageEvent>,
fn: (context: PageEvent) => JSX.Element,
options: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>) = {},
routerLoad?: (event: FetchEvent) => Promise<void>,
): H3 {
const handler = defineHandler({
middleware: middleware.length ? middleware.map(decorateMiddleware) : undefined,
Expand Down Expand Up @@ -64,6 +65,8 @@ export function createBaseHandler(
}
}

if (routerLoad) await routerLoad(event);

const context = await createPageEvent(event);

const resolvedOptions =
Expand Down Expand Up @@ -134,8 +137,9 @@ export function createBaseHandler(
export function createHandler(
fn: (context: PageEvent) => JSX.Element,
options: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>) = {},
routerLoad?: (event: FetchEvent) => Promise<void>,
): H3 {
return createBaseHandler(createPageEvent, fn, options);
return createBaseHandler(createPageEvent, fn, options, routerLoad);
}

export async function createPageEvent(ctx: FetchEvent) {
Expand Down
3 changes: 2 additions & 1 deletion packages/start/src/server/spa/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import type { FetchEvent, HandlerOptions, PageEvent } from "../types.ts";
export function createHandler(
fn: (context: PageEvent) => JSX.Element,
options?: HandlerOptions | ((context: PageEvent) => HandlerOptions),
routerLoad?: (event: FetchEvent) => Promise<void>,
): H3 {
return createBaseHandler(createPageEvent, fn, options);
return createBaseHandler(createPageEvent, fn, options, routerLoad);
}

async function createPageEvent(ctx: FetchEvent) {
Expand Down
Loading