fix stranded effects during hydration cancelation

solidjs · Aug 27, 2024 · 19d0295 · 19d0295
1 parent f8ae663
commit 19d0295
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.changeset/late-goats-live.md b/.changeset/late-goats-live.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix stranded effects during hydration cancelation
diff --git a/packages/solid/src/reactive/signal.ts b/packages/solid/src/reactive/signal.ts
@@ -1594,13 +1594,14 @@ function runUserEffects(queue: Computation<any>[]) {
       sharedConfig.effects || (sharedConfig.effects = []);
       sharedConfig.effects.push(...queue.slice(0, userLength));
       return;
-    } else if (sharedConfig.effects) {
-      queue = [...sharedConfig.effects, ...queue];
-      userLength += sharedConfig.effects.length;
-      delete sharedConfig.effects;
     }
     setHydrateContext();
   }
+  if (sharedConfig.effects && (sharedConfig.done || !sharedConfig.count)) {
+    queue = [...sharedConfig.effects, ...queue];
+    userLength += sharedConfig.effects.length;
+    delete sharedConfig.effects;
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 

diff --git a/packages/solid/src/render/hydration.ts b/packages/solid/src/render/hydration.ts
@@ -19,6 +19,7 @@ type SharedConfig = {
 export const sharedConfig: SharedConfig = {
   context: undefined,
   registry: undefined,
+  effects: undefined,
   done: false,
   getContextId() {
     return getContextId(this.context!.count);