Skip to content

Commit 85b5716

Browse files
authored
fix: prevent hooks exported from hooks.js from overwriting hooks from hooks.server.js (#13104)
* specifically write to each property * changeset * Update .changeset/mean-bottles-wash.md
1 parent 7168778 commit 85b5716

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.changeset/mean-bottles-wash.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/kit': patch
3+
---
4+
5+
fix: prevent hooks exported from `hooks.js` from overwriting hooks from `hooks.server.js`

packages/kit/src/core/sync/write_server.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,19 @@ export const options = {
6464
};
6565
6666
export async function get_hooks() {
67+
let handle;
68+
let handleFetch;
69+
let handleError;
70+
${server_hooks ? `({ handle, handleFetch, handleError } = await import(${s(server_hooks)}));` : ''}
71+
72+
let reroute;
73+
${universal_hooks ? `({ reroute } = await import(${s(universal_hooks)}));` : ''}
74+
6775
return {
68-
${server_hooks ? `...(await import(${s(server_hooks)})),` : ''}
69-
${universal_hooks ? `...(await import(${s(universal_hooks)})),` : ''}
76+
handle,
77+
handleFetch,
78+
handleError,
79+
reroute,
7080
};
7181
}
7282

0 commit comments

Comments
 (0)