solid-js 1.5.2 → 1.5.3

package/dist/server.cjs

@@ -489,7 +489,6 @@ function lazy(fn) {
     return p;
   };
   const contexts = new Set();
-  setTimeout(load);
   const wrap = props => {
     load();
     const id = sharedConfig.context.id.slice(0, -1);
@@ -503,21 +502,22 @@ function lazy(fn) {
       ctx.resources.set(id, track);
       contexts.add(ctx);
     }
-    if (sharedConfig.context.async) p.then(() => {
-      track.loading = false;
-      notifySuspense(contexts);
-    });
+    if (sharedConfig.context.async) {
+      sharedConfig.context.block(p.then(() => {
+        track.loading = false;
+        notifySuspense(contexts);
+      }));
+    }
     return "";
   };
   wrap.preload = load;
   return wrap;
 }
 function suspenseComplete(c) {
-  if (c.complete) return true;
   for (const r of c.resources.values()) {
     if (r.loading) return false;
   }
-  return c.complete = true;
+  return true;
 }
 function notifySuspense(contexts) {
   for (const c of contexts) {
@@ -556,8 +556,7 @@ function Suspense(props) {
       if (suspenseComplete(value)) {
         done(resolveSSRNode(res));
       }
-    },
-    complete: false
+    }
   });
   function runSuspense() {
     setHydrateContext({ ...ctx,
@@ -584,7 +583,11 @@ function Suspense(props) {
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {
-    setHydrateContext(undefined);
+    setHydrateContext({ ...ctx,
+      count: 0,
+      id: ctx.id + "0.f",
+      noHydrate: true
+    });
     const res = {
       t: `<span id="pl-${id}">${resolveSSRNode(props.fallback)}</span>`
     };

package/dist/server.js

@@ -485,7 +485,6 @@ function lazy(fn) {
     return p;
   };
   const contexts = new Set();
-  setTimeout(load);
   const wrap = props => {
     load();
     const id = sharedConfig.context.id.slice(0, -1);
@@ -499,21 +498,22 @@ function lazy(fn) {
       ctx.resources.set(id, track);
       contexts.add(ctx);
     }
-    if (sharedConfig.context.async) p.then(() => {
-      track.loading = false;
-      notifySuspense(contexts);
-    });
+    if (sharedConfig.context.async) {
+      sharedConfig.context.block(p.then(() => {
+        track.loading = false;
+        notifySuspense(contexts);
+      }));
+    }
     return "";
   };
   wrap.preload = load;
   return wrap;
 }
 function suspenseComplete(c) {
-  if (c.complete) return true;
   for (const r of c.resources.values()) {
     if (r.loading) return false;
   }
-  return c.complete = true;
+  return true;
 }
 function notifySuspense(contexts) {
   for (const c of contexts) {
@@ -552,8 +552,7 @@ function Suspense(props) {
       if (suspenseComplete(value)) {
         done(resolveSSRNode(res));
       }
-    },
-    complete: false
+    }
   });
   function runSuspense() {
     setHydrateContext({ ...ctx,
@@ -580,7 +579,11 @@ function Suspense(props) {
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {
-    setHydrateContext(undefined);
+    setHydrateContext({ ...ctx,
+      count: 0,
+      id: ctx.id + "0.f",
+      noHydrate: true
+    });
     const res = {
       t: `<span id="pl-${id}">${resolveSSRNode(props.fallback)}</span>`
     };

package/h/jsx-runtime/types/jsx.d.ts

@@ -286,7 +286,7 @@ export namespace JSX {
 
   interface CSSProperties extends csstype.PropertiesHyphen {
     // Override
-    [key: `—${string}`]: string | number | undefined
+    [key: `-${string}`]: string | number | undefined
   }
 
   type HTMLAutocapitalize = "off" | "none" | "on" | "sentences" | "words" | "characters";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/types/jsx.d.ts

@@ -285,7 +285,7 @@ export namespace JSX {
 
   interface CSSProperties extends csstype.PropertiesHyphen {
     // Override
-    [key: `—${string}`]: string | number | undefined
+    [key: `-${string}`]: string | number | undefined
   }
 
   type HTMLAutocapitalize = "off" | "none" | "on" | "sentences" | "words" | "characters";

package/types/server/rendering.d.ts

@@ -82,7 +82,6 @@ declare type SuspenseContextType = {
         loading: boolean;
         error: any;
     }>;
-    complete: boolean;
     completed: () => void;
 };
 export declare type ResourceActions<T> = {
@@ -131,6 +130,7 @@ declare type HydrationContext = {
     count: number;
     writeResource: (id: string, v: Promise<any> | any, error?: boolean, deferStream?: boolean) => void;
     replace: (id: string, replacement: () => any) => void;
+    block: (p: Promise<any>) => void;
     resources: Record<string, any>;
     suspense: Record<string, SuspenseContextType>;
     registerFragment: (v: string) => (v?: string, err?: any) => boolean;

package/web/dist/server.cjs

@@ -266,8 +266,7 @@ function toRefParam(index) {
 const REPLACE_SCRIPT = `function $df(e,t,d,l){d=document.getElementById(e),(l=document.getElementById("pl-"+e))&&l.replaceWith(...d.childNodes),d.remove(),_$HY.set(e,t)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
-  let context;
-  solidJs.sharedConfig.context = context = {
+  solidJs.sharedConfig.context = {
     id: options.renderId || "",
     count: 0,
     suspense: {},
@@ -279,8 +278,8 @@ function renderToString(code, options = {}) {
     }
   };
   let html = resolveSSRNode(escape(code()));
-  solidJs.sharedConfig.context = undefined;
-  html = injectAssets(context.assets, html);
+  solidJs.sharedConfig.context.noHydrate = true;
+  html = injectAssets(solidJs.sharedConfig.context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
   return html;
 }
@@ -354,6 +353,9 @@ function renderToStream(code, options = {}) {
     suspense: {},
     assets: [],
     nonce,
+    block(p) {
+      if (!firstFlushed) blockingResources.push(p);
+    },
     replace(id, payloadFn) {
       if (firstFlushed) return;
       const placeholder = `<!${id}>`;
@@ -393,14 +395,15 @@ function renderToStream(code, options = {}) {
             }
           }
         }
-        Promise.resolve().then(checkEnd);
+        if (!registry.size) Promise.resolve().then(checkEnd);
         return firstFlushed;
       };
     }
   };
   let html = resolveSSRNode(escape(code()));
   function doShell() {
-    solidJs.sharedConfig.context = undefined;
+    solidJs.sharedConfig.context = context;
+    context.noHydrate = true;
     html = injectAssets(context.assets, html);
     for (const key in context.resources) {
       if (!("data" in context.resources[key] || context.resources[key].ref[0].error)) pushTask(`_$HY.init("${key}")`);
@@ -429,7 +432,7 @@ function renderToStream(code, options = {}) {
           complete();
         };
       } else onCompleteAll = complete;
-      checkEnd();
+      if (!registry.size) Promise.resolve().then(checkEnd);
     },
     pipe(w) {
       Promise.allSettled(blockingResources).then(() => {

package/web/dist/server.js

@@ -263,8 +263,7 @@ function toRefParam(index) {
 const REPLACE_SCRIPT = `function $df(e,t,d,l){d=document.getElementById(e),(l=document.getElementById("pl-"+e))&&l.replaceWith(...d.childNodes),d.remove(),_$HY.set(e,t)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
-  let context;
-  sharedConfig.context = context = {
+  sharedConfig.context = {
     id: options.renderId || "",
     count: 0,
     suspense: {},
@@ -276,8 +275,8 @@ function renderToString(code, options = {}) {
     }
   };
   let html = resolveSSRNode(escape(code()));
-  sharedConfig.context = undefined;
-  html = injectAssets(context.assets, html);
+  sharedConfig.context.noHydrate = true;
+  html = injectAssets(sharedConfig.context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
   return html;
 }
@@ -351,6 +350,9 @@ function renderToStream(code, options = {}) {
     suspense: {},
     assets: [],
     nonce,
+    block(p) {
+      if (!firstFlushed) blockingResources.push(p);
+    },
     replace(id, payloadFn) {
       if (firstFlushed) return;
       const placeholder = `<!${id}>`;
@@ -390,14 +392,15 @@ function renderToStream(code, options = {}) {
             }
           }
         }
-        Promise.resolve().then(checkEnd);
+        if (!registry.size) Promise.resolve().then(checkEnd);
         return firstFlushed;
       };
     }
   };
   let html = resolveSSRNode(escape(code()));
   function doShell() {
-    sharedConfig.context = undefined;
+    sharedConfig.context = context;
+    context.noHydrate = true;
     html = injectAssets(context.assets, html);
     for (const key in context.resources) {
       if (!("data" in context.resources[key] || context.resources[key].ref[0].error)) pushTask(`_$HY.init("${key}")`);
@@ -426,7 +429,7 @@ function renderToStream(code, options = {}) {
           complete();
         };
       } else onCompleteAll = complete;
-      checkEnd();
+      if (!registry.size) Promise.resolve().then(checkEnd);
     },
     pipe(w) {
       Promise.allSettled(blockingResources).then(() => {