fix: prevent hooks exported from hooks.js from overwriting hooks fr…

…om `hooks.server.js` (#13104) * specifically write to each property * changeset * Update .changeset/mean-bottles-wash.md
sveltejs · Dec 10, 2024 · 85b5716 · 85b5716
1 parent 7168778
commit 85b5716
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.changeset/mean-bottles-wash.md b/.changeset/mean-bottles-wash.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: prevent hooks exported from `hooks.js` from overwriting hooks from `hooks.server.js`
diff --git 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,
 	};
 }