fix #2236 improper shortcircuit in resource hydration

solidjs · Aug 8, 2024 · 80dd276 · 80dd276
1 parent c8fe58e
commit 80dd276
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/hip-pumas-smile.md b/.changeset/hip-pumas-smile.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix #2236 improper shortcircuit in resource hydration
diff --git a/packages/solid/src/reactive/signal.ts b/packages/solid/src/reactive/signal.ts
@@ -623,7 +623,7 @@ export function createResource<T, S, R>(
     id = sharedConfig.getNextContextId();
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue as T;
-    else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
+    else if (sharedConfig.load && sharedConfig.has!(id)) initP = sharedConfig.load(id);
   }
   function loadEnd(p: Promise<T> | null, v: T | undefined, error?: any, key?: S) {
     if (pr === p) {