Skip to content

fix: prevent hooks exported from hooks.js from overwriting hooks from hooks.server.js #13104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 10, 2024
Merged

fix: prevent hooks exported from hooks.js from overwriting hooks from hooks.server.js #13104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7e58ba
specifically write to each property
teemingc Dec 4, 2024
b2ee397
changeset
teemingc Dec 4, 2024
ada0065
Update .changeset/mean-bottles-wash.md
teemingc Dec 4, 2024
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/mean-bottles-wash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: prevent hooks exported from `hooks.js` from overwriting hooks from `hooks.server.js`
14 changes: 12 additions & 2 deletions packages/kit/src/core/sync/write_server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,19 @@ export const options = {
};

export async function get_hooks() {
let handle;
let handleFetch;
let handleError;
${server_hooks ? `({ handle, handleFetch, handleError } = await import(${s(server_hooks)}));` : ''}

let reroute;
${universal_hooks ? `({ reroute } = await import(${s(universal_hooks)}));` : ''}

return {
${server_hooks ? `...(await import(${s(server_hooks)})),` : ''}
${universal_hooks ? `...(await import(${s(universal_hooks)})),` : ''}
handle,
handleFetch,
handleError,
reroute,
};
}

Expand Down
Loading