solid-js 1.8.14 → 1.8.16

package/dist/dev.cjs

@@ -460,7 +460,7 @@ function on(deps, fn, options) {
     } else input = deps();
     if (defer) {
       defer = false;
-      return undefined;
+      return prevValue;
     }
     const result = untrack(() => fn(input, prevInput, prevValue));
     prevInput = input;
@@ -1673,22 +1673,23 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref && (typeof ref !== "object" || ref.status !== "success")) p = ref;
+    if (ref) {
+      if (typeof ref !== "object" || ref.status !== "success") p = ref;else sharedConfig.gather(key);
+    }
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false
       });
       flicker = s;
       p.then(() => {
+        if (sharedConfig.done) return set();
         sharedConfig.gather(key);
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-      }).catch(err => {
-        if (err || sharedConfig.done) {
-          err && (error = err);
-          return set();
-        }
+      }, err => {
+        error = err;
+        set();
       });
     }
   }