Skip to content

Commit 37cb198

Browse files
committed
feat: merge serializationAdapters from createStart getOptions and router.options
1 parent 0683940 commit 37cb198

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ export async function hydrateStart(): Promise<AnyRouter> {
2525
}
2626

2727
serializationAdapters.push(ServerFunctionSerializationAdapter)
28-
router.options.serializationAdapters = serializationAdapters
28+
router.options.serializationAdapters = [
29+
...serializationAdapters,
30+
...(router.options?.serializationAdapters || []),
31+
]
2932

3033
if (!router.state.matches.length) {
3134
await hydrate(router)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,10 @@ export function createStartHandler<TRegister = Register>(
168168
origin,
169169
...{
170170
defaultSsr: startOptions.defaultSsr,
171-
serializationAdapters: startOptions.serializationAdapters,
171+
serializationAdapters: [
172+
...(startOptions.serializationAdapters || []),
173+
...(router?.options?.serializationAdapters || []),
174+
],
172175
},
173176
})
174177
return router

0 commit comments

Comments
 (0)