solid-js 1.3.1 → 1.3.2

package/dist/dev.cjs

@@ -249,7 +249,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -506,7 +506,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1508,20 +1508,19 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+        p = undefined;
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);

package/dist/dev.js

@@ -245,7 +245,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -502,7 +502,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1504,20 +1504,19 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+        p = undefined;
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);

package/dist/solid.cjs

@@ -246,7 +246,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -503,7 +503,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1427,20 +1427,19 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+        p = undefined;
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);

package/dist/solid.js

@@ -242,7 +242,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -499,7 +499,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1423,20 +1423,19 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+        p = undefined;
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9198a44115b8450b0ae61355008a490c4e25007f"
+  "gitHead": "b0aa7b227de8a3b4dc686690207d54a8af244efc"
 }

package/web/dist/dev.cjs

@@ -59,7 +59,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -88,7 +88,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -347,6 +347,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -449,7 +450,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);

package/web/dist/dev.js

@@ -56,7 +56,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -85,7 +85,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -344,6 +344,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -446,7 +447,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);

package/web/dist/server.cjs

@@ -575,8 +575,8 @@ function getHydrationKey() {
 function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
-}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
+} = {}) {
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!--xs-->`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -586,7 +586,7 @@ function injectAssets(assets, html) {
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
-  const index = html.indexOf("<!xs>");
+  const index = html.indexOf("<!--xs-->");
   if (index > -1) {
     return html.slice(0, index) + tag + html.slice(index);
   }

package/web/dist/server.js

@@ -572,8 +572,8 @@ function getHydrationKey() {
 function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
-}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
+} = {}) {
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!--xs-->`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -583,7 +583,7 @@ function injectAssets(assets, html) {
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
-  const index = html.indexOf("<!xs>");
+  const index = html.indexOf("<!--xs-->");
   if (index > -1) {
     return html.slice(0, index) + tag + html.slice(index);
   }

package/web/dist/web.cjs

@@ -59,7 +59,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -88,7 +88,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -346,6 +346,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -448,7 +449,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);

package/web/dist/web.js

@@ -56,7 +56,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -85,7 +85,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -343,6 +343,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -445,7 +446,7 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
   } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);