solid-js 1.4.6 → 1.4.7

package/dist/dev.cjs

@@ -1550,7 +1550,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/dist/dev.js

@@ -1546,7 +1546,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/dist/solid.cjs

@@ -1459,7 +1459,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/dist/solid.js

@@ -1455,7 +1455,7 @@ function Suspense(props) {
         set();
         setHydrateContext();
       });
-    }
+    } else if (p === null) sharedConfig.gather(key);
   }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -151,5 +151,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9dc1ba00f653c924cae926ef8a1f1c3da8f41bb5"
+  "gitHead": "b2873ffbbb73ef76214d32db86a8f676722fb1c2"
 }

package/web/dist/server.cjs

@@ -279,17 +279,18 @@ function renderToStringAsync(code, options = {}) {
   });
   function asyncWrap(fn) {
     return new Promise(resolve => {
-      const registry = new Set();
+      const registry = new Map();
       const cache = Object.create(null);
       solidJs.sharedConfig.context.registerFragment = register;
       const rendered = fn();
       if (!registry.size) resolve(rendered);
       function register(key) {
-        registry.add(key);
+        if (!registry.has(key)) registry.set(key, []);
         return (value = "", error) => {
           if (!registry.has(key)) return;
           cache[key] = value;
           registry.delete(key);
+          if (waitForFragments(registry, key)) return;
           if (error) scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;else scripts += `_$HY.set("${key}", null);`;
           if (!registry.size) Promise.resolve().then(() => {
             let source = resolveSSRNode(rendered);
@@ -396,7 +397,7 @@ function renderToStream(code, options = {}) {
               pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}_$HY.set("${key}",${error ? serializeError(error) : "null"})`);
             } else {
               buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div>`);
-              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
+              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") + ";" : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
               scriptFlushed = true;
             }
           }

package/web/dist/server.js

@@ -276,17 +276,18 @@ function renderToStringAsync(code, options = {}) {
   });
   function asyncWrap(fn) {
     return new Promise(resolve => {
-      const registry = new Set();
+      const registry = new Map();
       const cache = Object.create(null);
       sharedConfig.context.registerFragment = register;
       const rendered = fn();
       if (!registry.size) resolve(rendered);
       function register(key) {
-        registry.add(key);
+        if (!registry.has(key)) registry.set(key, []);
         return (value = "", error) => {
           if (!registry.has(key)) return;
           cache[key] = value;
           registry.delete(key);
+          if (waitForFragments(registry, key)) return;
           if (error) scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;else scripts += `_$HY.set("${key}", null);`;
           if (!registry.size) Promise.resolve().then(() => {
             let source = resolveSSRNode(rendered);
@@ -393,7 +394,7 @@ function renderToStream(code, options = {}) {
               pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}_$HY.set("${key}",${error ? serializeError(error) : "null"})`);
             } else {
               buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div>`);
-              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
+              pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") + ";" : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
               scriptFlushed = true;
             }
           }