solid-js 1.3.0-beta.4 → 1.3.0-beta.5

package/dist/dev.cjs

@@ -1512,7 +1512,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/dist/dev.js

@@ -1508,7 +1508,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/dist/server.cjs

@@ -351,7 +351,7 @@ function createResource(fn, fetcher, options = {}) {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -363,7 +363,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -502,9 +502,10 @@ function Suspense(props) {
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
 exports.$PROXY = $PROXY;

package/dist/server.js

@@ -347,7 +347,7 @@ function createResource(fn, fetcher, options = {}) {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -359,7 +359,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -498,9 +498,10 @@ function Suspense(props) {
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
 export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -1436,7 +1436,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/dist/solid.js

@@ -1432,7 +1432,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.0-beta.4",
+  "version": "1.3.0-beta.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -132,5 +132,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "c9307f020f33ff584f2d896c219e530d8ee97a9c"
+  "gitHead": "18bc089262ac37bf761140489c1e6ecbe1ea92d8"
 }