fix onHydrate call being skipped

ryansolid · ryansolid · commit 80ca972fd3d6 · 2023-10-30T10:01:25.000-07:00
diff --git a/.changeset/clean-dancers-destroy.md b/.changeset/clean-dancers-destroy.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix `onHydrate` call being skipped
diff --git a/packages/solid/src/reactive/signal.ts b/packages/solid/src/reactive/signal.ts
@@ -692,12 +692,12 @@ export function createResource<T, S, R>(
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
+    pr = p;
     if ("value" in p) {
       if ((p as any).status === "success") loadEnd(pr, p.value as T, undefined, lookup);
       else loadEnd(pr, undefined, undefined, lookup);
       return p;
     }
-    pr = p;
     scheduled = true;
     queueMicrotask(() => (scheduled = false));
     runUpdates(() => {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"solid-js": patch
 +---
++
 +fix `onHydrate` call being skipped
Original file line number	Diff line number	Diff line change
`@@ -692,12 +692,12 @@ export function createResource<T, S, R>(`
`692`	`692`	`loadEnd(pr, p, undefined, lookup);`
`693`	`693`	`return p;`
`694`	`694`	`}`
	`695`	`+ pr = p;`
`695`	`696`	`if ("value" in p) {`
`696`	`697`	`if ((p as any).status === "success") loadEnd(pr, p.value as T, undefined, lookup);`
`697`	`698`	`else loadEnd(pr, undefined, undefined, lookup);`
`698`	`699`	`return p;`
`699`	`700`	`}`
`700`		`- pr = p;`
`701`	`701`	`scheduled = true;`
`702`	`702`	`queueMicrotask(() => (scheduled = false));`
`703`	`703`	`runUpdates(() => {`