From f7e58ba6bc4cdfd4fd940065980e7a42c004d816 Mon Sep 17 00:00:00 2001 From: Chew Tee Ming Date: Wed, 4 Dec 2024 14:12:07 +0800 Subject: [PATCH 1/3] specifically write to each property --- packages/kit/src/core/sync/write_server.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/kit/src/core/sync/write_server.js b/packages/kit/src/core/sync/write_server.js index eb50bfd4735b..f4568743728e 100644 --- a/packages/kit/src/core/sync/write_server.js +++ b/packages/kit/src/core/sync/write_server.js @@ -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, }; } From b2ee397993687ddc1b293caf53c183fb744c8367 Mon Sep 17 00:00:00 2001 From: Chew Tee Ming Date: Wed, 4 Dec 2024 14:13:39 +0800 Subject: [PATCH 2/3] changeset --- .changeset/mean-bottles-wash.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/mean-bottles-wash.md diff --git a/.changeset/mean-bottles-wash.md b/.changeset/mean-bottles-wash.md new file mode 100644 index 000000000000..249bb2f07748 --- /dev/null +++ b/.changeset/mean-bottles-wash.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +fix: prevent hooks exported from `hooks.js` from overwriting hooks in `hooks.server.js` From ada0065a5a9a55d2ca0da834a5578b5ce4ef00cf Mon Sep 17 00:00:00 2001 From: Tee Ming Date: Wed, 4 Dec 2024 14:16:49 +0800 Subject: [PATCH 3/3] Update .changeset/mean-bottles-wash.md --- .changeset/mean-bottles-wash.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/mean-bottles-wash.md b/.changeset/mean-bottles-wash.md index 249bb2f07748..839cfa2a8a54 100644 --- a/.changeset/mean-bottles-wash.md +++ b/.changeset/mean-bottles-wash.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -fix: prevent hooks exported from `hooks.js` from overwriting hooks in `hooks.server.js` +fix: prevent hooks exported from `hooks.js` from overwriting hooks from `hooks.server.js`