Skip to content

Commit 1d71851

Browse files
fix: merge serializationAdapters from createStart getOptions and router.options (#5321)
* feat: merge `serializationAdapters` from `createStart` `getOptions` and `router.options` * fix lint --------- Co-authored-by: Manuel Schiller <[email protected]>
1 parent cf48427 commit 1d71851

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

packages/start-client-core/src/client/hydrateStart.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ export async function hydrateStart(): Promise<AnyRouter> {
2525
}
2626

2727
serializationAdapters.push(ServerFunctionSerializationAdapter)
28+
if (router.options.serializationAdapters) {
29+
serializationAdapters.push(...router.options.serializationAdapters)
30+
}
2831

2932
router.update({
3033
basepath: process.env.TSS_ROUTER_BASEPATH,

packages/start-server-core/src/createStartHandler.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ export function createStartHandler<TRegister = Register>(
145145
origin: router.options.origin ?? origin,
146146
...{
147147
defaultSsr: startOptions.defaultSsr,
148-
serializationAdapters: startOptions.serializationAdapters,
148+
serializationAdapters: [
149+
...(startOptions.serializationAdapters || []),
150+
...(router.options.serializationAdapters || []),
151+
],
149152
},
150153
basepath: ROUTER_BASEPATH,
151154
})

0 commit comments

Comments
 (0)