From 22580661c4d13a9a832de7a19aabadd838455ce6 Mon Sep 17 00:00:00 2001
From: Nicolas Bayet <nicolas.bayet@gmail.com>
Date: Fri, 26 Sep 2025 18:27:22 +0200
Subject: [PATCH] up

---
 src/runtime/hooks.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/runtime/hooks.ts b/src/runtime/hooks.ts
index 25600e30..f7a4df38 100644
--- a/src/runtime/hooks.ts
+++ b/src/runtime/hooks.ts
@@ -99,15 +99,25 @@ export function useEffect<T extends unknown[]>(
       popExecutionContext();
     }
   };
+  const computeDependenciesWithContext = () => {
+    pushExecutionContext(context);
+    let r: any;
+    try {
+      r = computeDependencies();
+    } finally {
+      popExecutionContext();
+    }
+    return r;
+  };
 
   onMounted(() => {
-    dependencies = computeDependencies();
+    dependencies = computeDependenciesWithContext();
     runEffect();
   });
 
   onPatched(() => {
-    const newDeps = computeDependencies();
-    const shouldReapply = newDeps.some((val, i) => val !== dependencies[i]);
+    const newDeps = computeDependenciesWithContext();
+    const shouldReapply = newDeps.some((val: any, i: number) => val !== dependencies[i]);
     if (shouldReapply) {
       dependencies = newDeps;
       if (cleanup) {