solid-js 1.3.14 → 1.3.15

package/dist/dev.cjs

@@ -448,8 +448,8 @@ options) {
   return prevValue => {
     let input;
     if (isArray) {
-      input = [];
-      for (let i = 0; i < deps.length; i++) input.push(deps[i]());
+      input = Array(deps.length);
+      for (let i = 0; i < deps.length; i++) input[i] = deps[i]();
     } else input = deps();
     if (defer) {
       defer = false;
@@ -880,6 +880,7 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
+  if (sharedConfig.context) setHydrateContext();
   const resume = queue.length;
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
@@ -1532,7 +1533,7 @@ function Suspense(props) {
       });
       flicker = s;
       p.then(err => {
-        if (error = err) return set();
+        if ((error = err) || sharedConfig.done) return set();
         sharedConfig.gather(key);
         setHydrateContext(ctx);
         set();

package/dist/dev.js

@@ -444,8 +444,8 @@ options) {
   return prevValue => {
     let input;
     if (isArray) {
-      input = [];
-      for (let i = 0; i < deps.length; i++) input.push(deps[i]());
+      input = Array(deps.length);
+      for (let i = 0; i < deps.length; i++) input[i] = deps[i]();
     } else input = deps();
     if (defer) {
       defer = false;
@@ -876,6 +876,7 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
+  if (sharedConfig.context) setHydrateContext();
   const resume = queue.length;
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
@@ -1528,7 +1529,7 @@ function Suspense(props) {
       });
       flicker = s;
       p.then(err => {
-        if (error = err) return set();
+        if ((error = err) || sharedConfig.done) return set();
         sharedConfig.gather(key);
         setHydrateContext(ctx);
         set();

package/dist/server.cjs

@@ -508,7 +508,7 @@ function Suspense(props) {
   if (ctx.streaming) {
     setHydrateContext(undefined);
     const res = {
-      t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
+      t: `<span id="pl-${id}">${resolveSSRNode(props.fallback)}</span>`
     };
     setHydrateContext(ctx);
     return res;

package/dist/server.js

@@ -504,7 +504,7 @@ function Suspense(props) {
   if (ctx.streaming) {
     setHydrateContext(undefined);
     const res = {
-      t: `<span id="pl${id}">${resolveSSRNode(props.fallback)}</span>`
+      t: `<span id="pl-${id}">${resolveSSRNode(props.fallback)}</span>`
     };
     setHydrateContext(ctx);
     return res;

package/dist/solid.cjs

@@ -445,8 +445,8 @@ options) {
   return prevValue => {
     let input;
     if (isArray) {
-      input = [];
-      for (let i = 0; i < deps.length; i++) input.push(deps[i]());
+      input = Array(deps.length);
+      for (let i = 0; i < deps.length; i++) input[i] = deps[i]();
     } else input = deps();
     if (defer) {
       defer = false;
@@ -822,6 +822,7 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
+  if (sharedConfig.context) setHydrateContext();
   const resume = queue.length;
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
@@ -1447,7 +1448,7 @@ function Suspense(props) {
       });
       flicker = s;
       p.then(err => {
-        if (error = err) return set();
+        if ((error = err) || sharedConfig.done) return set();
         sharedConfig.gather(key);
         setHydrateContext(ctx);
         set();

package/dist/solid.js

@@ -441,8 +441,8 @@ options) {
   return prevValue => {
     let input;
     if (isArray) {
-      input = [];
-      for (let i = 0; i < deps.length; i++) input.push(deps[i]());
+      input = Array(deps.length);
+      for (let i = 0; i < deps.length; i++) input[i] = deps[i]();
     } else input = deps();
     if (defer) {
       defer = false;
@@ -818,6 +818,7 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
+  if (sharedConfig.context) setHydrateContext();
   const resume = queue.length;
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
@@ -1443,7 +1444,7 @@ function Suspense(props) {
       });
       flicker = s;
       p.then(err => {
-        if (error = err) return set();
+        if ((error = err) || sharedConfig.done) return set();
         sharedConfig.gather(key);
         setHydrateContext(ctx);
         set();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9a41feafea10717e785c603eadb96c6133cd2988"
+  "gitHead": "0a6fc7bbeebf14f1a9297358801acf365dfbb716"
 }

package/types/reactive/signal.d.ts

@@ -201,7 +201,7 @@ export interface Resource<T> extends Accessor<T> {
 }
 export declare type ResourceActions<T> = {
     mutate: Setter<T>;
-    refetch: (info?: unknown) => void;
+    refetch: (info?: unknown) => T | Promise<T> | undefined | null;
 };
 export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
 export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);

package/types/render/hydration.d.ts

@@ -10,6 +10,7 @@ declare type SharedConfig = {
     load?: (id: string) => Promise<any> | undefined;
     gather?: (key: string) => void;
     registry?: Map<string, Element>;
+    done?: boolean;
 };
 export declare const sharedConfig: SharedConfig;
 export declare function setHydrateContext(context?: HydrationContext): void;

package/web/dist/dev.cjs

@@ -337,6 +337,10 @@ function eventHandler(e) {
       return node || document;
     }
   });
+  if (window._$HY && !solidJs.sharedConfig.done) {
+    solidJs.sharedConfig.done = true;
+    document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
+  }
   while (node !== null) {
     const handler = node[key];
     if (handler && !node.disabled) {

package/web/dist/dev.js

@@ -334,6 +334,10 @@ function eventHandler(e) {
       return node || document;
     }
   });
+  if (window._$HY && !sharedConfig.done) {
+    sharedConfig.done = true;
+    document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
+  }
   while (node !== null) {
     const handler = node[key];
     if (handler && !node.disabled) {

package/web/dist/server.cjs

@@ -232,7 +232,7 @@ function stringifyString(str) {
   return result;
 }
 
-const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
+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||null)}`;
 const FRAGMENT_REPLACE = /<!\[([\d-]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -675,7 +675,7 @@ function Dynamic(props) {
   if (comp) {
     if (t === "function") return comp(others);else if (t === "string") {
       const [local, sOthers] = solidJs.splitProps(others, ["children"]);
-      return ssr([`<${comp}`, ' ', ">", `</${comp}>`], ssrHydrationKey(), ssrSpread(sOthers), local.children || "");
+      return ssr([`<${comp}`, ' ', ">", `</${comp}>`], ssrHydrationKey(), ssrSpread(sOthers), escape(local.children || ""));
     }
   }
 }

package/web/dist/server.js

@@ -229,7 +229,7 @@ function stringifyString(str) {
   return result;
 }
 
-const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
+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||null)}`;
 const FRAGMENT_REPLACE = /<!\[([\d-]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -672,7 +672,7 @@ function Dynamic(props) {
   if (comp) {
     if (t === "function") return comp(others);else if (t === "string") {
       const [local, sOthers] = splitProps(others, ["children"]);
-      return ssr([`<${comp}`, ' ', ">", `</${comp}>`], ssrHydrationKey(), ssrSpread(sOthers), local.children || "");
+      return ssr([`<${comp}`, ' ', ">", `</${comp}>`], ssrHydrationKey(), ssrSpread(sOthers), escape(local.children || ""));
     }
   }
 }

package/web/dist/web.cjs

@@ -336,6 +336,10 @@ function eventHandler(e) {
       return node || document;
     }
   });
+  if (window._$HY && !solidJs.sharedConfig.done) {
+    solidJs.sharedConfig.done = true;
+    document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
+  }
   while (node !== null) {
     const handler = node[key];
     if (handler && !node.disabled) {

package/web/dist/web.js

@@ -333,6 +333,10 @@ function eventHandler(e) {
       return node || document;
     }
   });
+  if (window._$HY && !sharedConfig.done) {
+    sharedConfig.done = true;
+    document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
+  }
   while (node !== null) {
     const handler = node[key];
     if (handler && !node.disabled) {