solid-js 1.5.0 → 1.5.3

package/dist/dev.cjs

@@ -255,8 +255,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -265,6 +264,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -274,7 +274,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -291,25 +291,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -326,11 +327,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -339,7 +339,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -349,27 +349,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }
@@ -871,9 +870,7 @@ function runUserEffects(queue) {
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
   if (sharedConfig.context) setHydrateContext();
-  Effects = [];
   for (i = 0; i < userLength; i++) runTop(queue[i]);
-  if (Effects.length) runUserEffects(Effects);
 }
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;

package/dist/dev.js

@@ -251,8 +251,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -261,6 +260,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -270,7 +270,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -287,25 +287,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -322,11 +323,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -335,7 +335,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -345,27 +345,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }
@@ -867,9 +866,7 @@ function runUserEffects(queue) {
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
   if (sharedConfig.context) setHydrateContext();
-  Effects = [];
   for (i = 0; i < userLength; i++) runTop(queue[i]);
-  if (Effects.length) runUserEffects(Effects);
 }
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;

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/dist/solid.cjs

@@ -247,8 +247,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -257,6 +256,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -266,7 +266,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -283,25 +283,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -318,11 +319,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -331,7 +331,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -341,27 +341,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }
@@ -810,9 +809,7 @@ function runUserEffects(queue) {
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
   if (sharedConfig.context) setHydrateContext();
-  Effects = [];
   for (i = 0; i < userLength; i++) runTop(queue[i]);
-  if (Effects.length) runUserEffects(Effects);
 }
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;

package/dist/solid.js

@@ -243,8 +243,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -253,6 +252,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -262,7 +262,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -279,25 +279,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -314,11 +315,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -327,7 +327,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -337,27 +337,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }
@@ -806,9 +805,7 @@ function runUserEffects(queue) {
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
   if (sharedConfig.context) setHydrateContext();
-  Effects = [];
   for (i = 0; i < userLength; i++) runTop(queue[i]);
-  if (Effects.length) runUserEffects(Effects);
 }
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;

package/h/jsx-runtime/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "solid-js/h/jsx-runtime",
+  "main": "./dist/jsx.cjs",
+  "module": "./dist/jsx.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false
+}

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

@@ -283,9 +283,10 @@ export namespace JSX {
     onanimationiteration?: EventHandlerUnion<T, AnimationEvent>;
     ontransitionend?: EventHandlerUnion<T, TransitionEvent>;
   }
-  
+
   interface CSSProperties extends csstype.PropertiesHyphen {
     // Override
+    [key: `-${string}`]: string | number | undefined
   }
 
   type HTMLAutocapitalize = "off" | "none" | "on" | "sentences" | "words" | "characters";
@@ -527,6 +528,77 @@ export namespace JSX {
     "aria-valuenow"?: number | string;
     /** Defines the human readable text alternative of aria-valuenow for a range widget. */
     "aria-valuetext"?: string;
+    role?: FunctionMaybe<
+    | "alert"
+    | "alertdialog"
+    | "application"
+    | "article"
+    | "banner"
+    | "button"
+    | "cell"
+    | "checkbox"
+    | "columnheader"
+    | "combobox"
+    | "complementary"
+    | "contentinfo"
+    | "definition"
+    | "dialog"
+    | "directory"
+    | "document"
+    | "feed"
+    | "figure"
+    | "form"
+    | "grid"
+    | "gridcell"
+    | "group"
+    | "heading"
+    | "img"
+    | "link"
+    | "list"
+    | "listbox"
+    | "listitem"
+    | "log"
+    | "main"
+    | "marquee"
+    | "math"
+    | "menu"
+    | "menubar"
+    | "menuitem"
+    | "menuitemcheckbox"
+    | "menuitemradio"
+    | "meter"
+    | "navigation"
+    | "none"
+    | "note"
+    | "option"
+    | "presentation"
+    | "progressbar"
+    | "radio"
+    | "radiogroup"
+    | "region"
+    | "row"
+    | "rowgroup"
+    | "rowheader"
+    | "scrollbar"
+    | "search"
+    | "searchbox"
+    | "separator"
+    | "slider"
+    | "spinbutton"
+    | "status"
+    | "switch"
+    | "tab"
+    | "table"
+    | "tablist"
+    | "tabpanel"
+    | "term"
+    | "textbox"
+    | "timer"
+    | "toolbar"
+    | "tooltip"
+    | "tree"
+    | "treegrid"
+    | "treeitem">;
   }
 
   interface HTMLAttributes<T> extends AriaAttributes, DOMAttributes<T> {
@@ -552,77 +624,6 @@ export namespace JSX {
     resource?: FunctionMaybe<string>;
     typeof?: FunctionMaybe<string>;
     vocab?: FunctionMaybe<string>;
-    role?: FunctionMaybe<
-      | "alert"
-      | "alertdialog"
-      | "application"
-      | "article"
-      | "banner"
-      | "button"
-      | "cell"
-      | "checkbox"
-      | "columnheader"
-      | "combobox"
-      | "complementary"
-      | "contentinfo"
-      | "definition"
-      | "dialog"
-      | "directory"
-      | "document"
-      | "feed"
-      | "figure"
-      | "form"
-      | "grid"
-      | "gridcell"
-      | "group"
-      | "heading"
-      | "img"
-      | "link"
-      | "list"
-      | "listbox"
-      | "listitem"
-      | "log"
-      | "main"
-      | "marquee"
-      | "math"
-      | "menu"
-      | "menubar"
-      | "menuitem"
-      | "menuitemcheckbox"
-      | "menuitemradio"
-      | "meter"
-      | "navigation"
-      | "none"
-      | "note"
-      | "option"
-      | "presentation"
-      | "progressbar"
-      | "radio"
-      | "radiogroup"
-      | "region"
-      | "row"
-      | "rowgroup"
-      | "rowheader"
-      | "scrollbar"
-      | "search"
-      | "searchbox"
-      | "separator"
-      | "slider"
-      | "spinbutton"
-      | "status"
-      | "switch"
-      | "tab"
-      | "table"
-      | "tablist"
-      | "tabpanel"
-      | "term"
-      | "textbox"
-      | "timer"
-      | "toolbar"
-      | "tooltip"
-      | "tree"
-      | "treegrid"
-      | "treeitem">;
     autocapitalize?: FunctionMaybe<HTMLAutocapitalize>;
     slot?: FunctionMaybe<string>;
     color?: FunctionMaybe<string>;
@@ -1082,7 +1083,7 @@ export namespace JSX {
     | "defer xMidYMax slice"
     | "defer xMaxYMax slice";
   type SVGUnits = "userSpaceOnUse" | "objectBoundingBox";
-  interface CoreSVGAttributes<T> extends DOMAttributes<T> {
+  interface CoreSVGAttributes<T> extends AriaAttributes, DOMAttributes<T> {
     id?: FunctionMaybe<string>;
     lang?: FunctionMaybe<string>;
     tabIndex?: FunctionMaybe<number | string>;

package/h/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "solid-js/h",
+  "main": "./dist/h.cjs",
+  "module": "./dist/h.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false
+}

package/html/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "solid-js/html",
+  "main": "./dist/html.cjs",
+  "module": "./dist/html.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.5.0",
+  "version": "1.5.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -23,16 +23,22 @@
     "dist",
     "store/dist",
     "store/types",
+    "store/package.json",
     "web/dist",
     "web/types",
+    "web/package.json",
     "h/dist",
     "h/types",
+    "h/package.json",
     "h/jsx-runtime/dist",
     "h/jsx-runtime/types",
+    "h/jsx-runtime/package.json",
     "html/dist",
     "html/types",
+    "html/package.json",
     "universal/dist",
     "universal/types",
+    "universal/package.json",
     "types",
     "jsx-runtime.d.ts"
   ],

package/store/package.json

@@ -0,0 +1,50 @@
+{
+  "name": "solid-js/store",
+  "main": "./dist/server.cjs",
+  "module": "./dist/server.js",
+  "browser": {
+    "./dist/server.cjs": "./dist/store.cjs",
+    "./dist/server.js": "./dist/store.js"
+  },
+  "unpkg": "./dist/store.cjs",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/dev.js"
+          },
+          "require": "./dist/dev.cjs"
+        },
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/store.js"
+        },
+        "require": "./dist/store.cjs"
+      },
+      "node": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/dev.js"
+        },
+        "require": "./dist/dev.cjs"
+      },
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./dist/store.js"
+      },
+      "require": "./dist/store.cjs"
+    }
+  }
+}

package/types/jsx.d.ts

@@ -1,4 +1,4 @@
-import * as csstype from 'csstype/index.js';
+import * as csstype from 'csstype';
 
 /**
  * Based on JSX types for Surplus and Inferno and adapted for `dom-expressions`.
@@ -285,6 +285,7 @@ export namespace JSX {
 
   interface CSSProperties extends csstype.PropertiesHyphen {
     // Override
+    [key: `-${string}`]: string | number | undefined
   }
 
   type HTMLAutocapitalize = "off" | "none" | "on" | "sentences" | "words" | "characters";
@@ -526,40 +527,6 @@ export namespace JSX {
     "aria-valuenow"?: number | string;
     /** Defines the human readable text alternative of aria-valuenow for a range widget. */
     "aria-valuetext"?: string;
-  }
-
-  // TODO: Should we allow this?
-  // type ClassKeys = `class:${string}`;
-  // type CSSKeys = Exclude<keyof csstype.PropertiesHyphen, `-${string}`>;
-
-  // type CSSAttributes = {
-  //   [key in CSSKeys as `style:${key}`]: csstype.PropertiesHyphen[key];
-  // };
-
-  interface HTMLAttributes<T> extends AriaAttributes, DOMAttributes<T> {
-    // [key: ClassKeys]: boolean;
-    accessKey?: string;
-    class?: string;
-    contenteditable?: boolean | "inherit";
-    contextmenu?: string;
-    dir?: HTMLDir;
-    draggable?: boolean;
-    hidden?: boolean;
-    id?: string;
-    lang?: string;
-    spellcheck?: boolean;
-    style?: CSSProperties | string;
-    tabindex?: number | string;
-    title?: string;
-    translate?: "yes" | "no";
-    about?: string;
-    datatype?: string;
-    inlist?: any;
-    prefix?: string;
-    property?: string;
-    resource?: string;
-    typeof?: string;
-    vocab?: string;
     role?:
       | "alert"
       | "alertdialog"
@@ -631,6 +598,40 @@ export namespace JSX {
       | "tree"
       | "treegrid"
       | "treeitem";
+  }
+
+  // TODO: Should we allow this?
+  // type ClassKeys = `class:${string}`;
+  // type CSSKeys = Exclude<keyof csstype.PropertiesHyphen, `-${string}`>;
+
+  // type CSSAttributes = {
+  //   [key in CSSKeys as `style:${key}`]: csstype.PropertiesHyphen[key];
+  // };
+
+  interface HTMLAttributes<T> extends AriaAttributes, DOMAttributes<T> {
+    // [key: ClassKeys]: boolean;
+    accessKey?: string;
+    class?: string;
+    contenteditable?: boolean | "inherit";
+    contextmenu?: string;
+    dir?: HTMLDir;
+    draggable?: boolean;
+    hidden?: boolean;
+    id?: string;
+    lang?: string;
+    spellcheck?: boolean;
+    style?: CSSProperties | string;
+    tabindex?: number | string;
+    title?: string;
+    translate?: "yes" | "no";
+    about?: string;
+    datatype?: string;
+    inlist?: any;
+    prefix?: string;
+    property?: string;
+    resource?: string;
+    typeof?: string;
+    vocab?: string;
     autocapitalize?: HTMLAutocapitalize;
     slot?: string;
     color?: string;
@@ -1090,7 +1091,7 @@ export namespace JSX {
     | "defer xMidYMax slice"
     | "defer xMaxYMax slice";
   type SVGUnits = "userSpaceOnUse" | "objectBoundingBox";
-  interface CoreSVGAttributes<T> extends DOMAttributes<T> {
+  interface CoreSVGAttributes<T> extends AriaAttributes, DOMAttributes<T> {
     id?: string;
     lang?: string;
     tabIndex?: number | string;

package/types/reactive/signal.d.ts

@@ -234,7 +234,7 @@ interface Errored {
 export declare type Resource<T> = Unresolved | Pending | Ready<T> | Refreshing<T> | Errored;
 export declare type InitializedResource<T> = Ready<T> | Refreshing<T> | Errored;
 export declare type ResourceActions<T, R = unknown> = {
-    mutate: Setter<T | undefined>;
+    mutate: Setter<T>;
     refetch: (info?: R) => T | Promise<T> | undefined | null;
 };
 export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
@@ -256,7 +256,10 @@ export declare type ResourceOptions<T, S = unknown> = {
 export declare type InitializedResourceOptions<T, S = unknown> = ResourceOptions<T, S> & {
     initialValue: T;
 };
-export declare type ResourceReturn<T, R = unknown> = [Resource<T>, ResourceActions<T, R>];
+export declare type ResourceReturn<T, R = unknown> = [
+    Resource<T>,
+    ResourceActions<T | undefined, R>
+];
 export declare type InitializedResourceReturn<T, R = unknown> = [
     InitializedResource<T>,
     ResourceActions<T, R>

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/universal/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "solid-js/universal",
+  "main": "./dist/universal.cjs",
+  "module": "./dist/universal.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "development": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/dev.js"
+        },
+        "require": "./dist/dev.cjs"
+      },
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./dist/universal.js"
+      },
+      "require": "./dist/universal.cjs"
+    }
+  }
+}

package/web/dist/dev.cjs

@@ -250,6 +250,8 @@ function hydrate$1(code, element, options = {}) {
 function getNextElement(template) {
   let node, key;
   if (!solidJs.sharedConfig.context || !(node = solidJs.sharedConfig.registry.get(key = getHydrationKey()))) {
+    if (solidJs.sharedConfig.context) console.warn("Unable to find DOM nodes for hydration key:", key);
+    if (!template) throw new Error("Unrecoverable Hydration Mismatch. No template for key: " + key);
     return template.cloneNode(true);
   }
   if (solidJs.sharedConfig.completed) solidJs.sharedConfig.completed.add(node);
@@ -458,7 +460,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;

package/web/dist/dev.js

@@ -247,6 +247,8 @@ function hydrate$1(code, element, options = {}) {
 function getNextElement(template) {
   let node, key;
   if (!sharedConfig.context || !(node = sharedConfig.registry.get(key = getHydrationKey()))) {
+    if (sharedConfig.context) console.warn("Unable to find DOM nodes for hydration key:", key);
+    if (!template) throw new Error("Unrecoverable Hydration Mismatch. No template for key: " + key);
     return template.cloneNode(true);
   }
   if (sharedConfig.completed) sharedConfig.completed.add(node);
@@ -455,7 +457,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;

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(() => {
@@ -528,8 +531,8 @@ function ssrElement(tag, props, children, needsId) {
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
-    if (ChildProperties.has(prop) && children === undefined) {
-      children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+    if (ChildProperties.has(prop)) {
+      if (children === undefined) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];

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(() => {
@@ -525,8 +528,8 @@ function ssrElement(tag, props, children, needsId) {
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
-    if (ChildProperties.has(prop) && children === undefined) {
-      children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+    if (ChildProperties.has(prop)) {
+      if (children === undefined) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];

package/web/dist/web.cjs

@@ -457,7 +457,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;

package/web/dist/web.js

@@ -454,7 +454,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;

package/web/package.json

@@ -0,0 +1,50 @@
+{
+  "name": "solid-js/web",
+  "main": "./dist/server.cjs",
+  "module": "./dist/server.js",
+  "browser": {
+    "./dist/server.cjs": "./dist/web.cjs",
+    "./dist/server.js": "./dist/web.js"
+  },
+  "unpkg": "./dist/web.cjs",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/dev.js"
+          },
+          "require": "./dist/dev.cjs"
+        },
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/web.js"
+        },
+        "require": "./dist/web.cjs"
+      },
+      "node": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/dev.js"
+        },
+        "require": "./dist/dev.cjs"
+      },
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./dist/web.js"
+      },
+      "require": "./dist/web.cjs"
+    }
+  }
+}

package/web/types/client.d.ts

@@ -67,4 +67,4 @@ export function getAssets(): string;
 export function Assets(props: { children?: JSX.Element }): JSX.Element;
 export function HydrationScript(): JSX.Element;
 export function NoHydration(props: { children?: JSX.Element }): JSX.Element;
-export function getHydrationScript(): string;
+export function generateHydrationScript(): string;