solid-js 1.7.7 → 1.7.8

package/dist/dev.cjs

@@ -880,7 +880,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -958,26 +969,23 @@ function castError(err) {
     cause: err
   });
 }
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
+}
 function handleError(err, owner = Owner) {
   const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
   if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      try {
-        for (const f of fns) f(error);
-      } catch (e) {
-        handleError(e, owner?.owner || null);
-      }
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else {
-    try {
-      for (const f of fns) f(error);
-    } catch (e) {
-      handleError(e, owner?.owner || null);
-    }
-  }
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1399,8 +1407,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });

package/dist/dev.js

@@ -878,7 +878,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -956,26 +967,23 @@ function castError(err) {
     cause: err
   });
 }
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
+}
 function handleError(err, owner = Owner) {
   const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
   if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      try {
-        for (const f of fns) f(error);
-      } catch (e) {
-        handleError(e, owner?.owner || null);
-      }
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else {
-    try {
-      for (const f of fns) f(error);
-    } catch (e) {
-      handleError(e, owner?.owner || null);
-    }
-  }
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1397,8 +1405,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });

package/dist/server.cjs

@@ -19,7 +19,7 @@ function handleError(err, owner = Owner) {
   try {
     for (const f of fns) f(error);
   } catch (e) {
-    handleError(e, owner?.owner || null);
+    handleError(e, owner && owner.owner || null);
   }
 }
 const UNOWNED = {
@@ -424,7 +424,7 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!!$e${id}>${resolveSSRNode(res)}<!!$/e${id}>`
+    t: `<!--!$e${id}-->${resolveSSRNode(res)}<!--!$/e${id}-->`
   };
 }
 const SuspenseContext = createContext();
@@ -635,7 +635,7 @@ function Suspense(props) {
         noHydrate: true
       });
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!--pl-${id}-->`
       };
       setHydrateContext(ctx);
       return res;

package/dist/server.js

@@ -17,7 +17,7 @@ function handleError(err, owner = Owner) {
   try {
     for (const f of fns) f(error);
   } catch (e) {
-    handleError(e, owner?.owner || null);
+    handleError(e, owner && owner.owner || null);
   }
 }
 const UNOWNED = {
@@ -422,7 +422,7 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!!$e${id}>${resolveSSRNode(res)}<!!$/e${id}>`
+    t: `<!--!$e${id}-->${resolveSSRNode(res)}<!--!$/e${id}-->`
   };
 }
 const SuspenseContext = createContext();
@@ -633,7 +633,7 @@ function Suspense(props) {
         noHydrate: true
       });
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!--pl-${id}-->`
       };
       setHydrateContext(ctx);
       return res;

package/dist/solid.cjs

@@ -840,7 +840,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -917,26 +928,23 @@ function castError(err) {
     cause: err
   });
 }
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
+}
 function handleError(err, owner = Owner) {
   const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
   if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      try {
-        for (const f of fns) f(error);
-      } catch (e) {
-        handleError(e, owner?.owner || null);
-      }
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else {
-    try {
-      for (const f of fns) f(error);
-    } catch (e) {
-      handleError(e, owner?.owner || null);
-    }
-  }
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1354,8 +1362,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });

package/dist/solid.js

@@ -838,7 +838,18 @@ function runUserEffects(queue) {
     const e = queue[i];
     if (!e.user) runTop(e);else queue[userLength++] = e;
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
 }
 function lookUpstream(node, ignore) {
@@ -915,26 +926,23 @@ function castError(err) {
     cause: err
   });
 }
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
+}
 function handleError(err, owner = Owner) {
   const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
   if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      try {
-        for (const f of fns) f(error);
-      } catch (e) {
-        handleError(e, owner?.owner || null);
-      }
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else {
-    try {
-      for (const f of fns) f(error);
-    } catch (e) {
-      handleError(e, owner?.owner || null);
-    }
-  }
+  });else runErrors(error, fns, owner);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1352,8 +1360,11 @@ function lazy(fn) {
     const ctx = sharedConfig.context;
     if (ctx) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
       });

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

@@ -1,4 +1,4 @@
-import * as csstype from 'csstype';
+import * as csstype from "csstype";
 
 /**
  * Based on JSX types for Surplus and Inferno and adapted for `dom-expressions`.
@@ -9,7 +9,7 @@ import * as csstype from 'csstype';
 type DOMElement = Element;
 
 export namespace JSX {
-  type FunctionMaybe<T = unknown> = ({ (): T }) | T;
+  type FunctionMaybe<T = unknown> = { (): T } | T;
   type Element =
     | Node
     | ArrayElement
@@ -61,7 +61,7 @@ export namespace JSX {
     };
     $ServerOnly?: boolean;
   }
-  type Accessor<T> = () => T
+  type Accessor<T> = () => T;
   interface Directives {}
   interface DirectiveFunctions {
     [x: string]: (el: Element, accessor: Accessor<any>) => void;
@@ -74,7 +74,9 @@ export namespace JSX {
     [Key in keyof Directives as `use:${Key}`]?: Directives[Key];
   };
   type DirectiveFunctionAttributes<T> = {
-    [K in keyof DirectiveFunctions as string extends K ? never : `use:${K}`]?: DirectiveFunctions[K] extends (
+    [K in keyof DirectiveFunctions as string extends K
+      ? never
+      : `use:${K}`]?: DirectiveFunctions[K] extends (
       el: infer E, // will be unknown if not provided
       ...rest: infer R // use rest so that we can check whether it's provided or not
     ) => void
@@ -95,13 +97,23 @@ export namespace JSX {
   };
   type OnAttributes<T> = {
     [Key in keyof CustomEvents as `on:${Key}`]?: EventHandler<T, CustomEvents[Key]>;
-  }
+  };
   type OnCaptureAttributes<T> = {
-    [Key in keyof CustomCaptureEvents as `oncapture:${Key}`]?: EventHandler<T, CustomCaptureEvents[Key]>;
-  }
-  interface DOMAttributes<T> extends CustomAttributes<T>, DirectiveAttributes, DirectiveFunctionAttributes<T>,
-                                     PropAttributes, AttrAttributes, OnAttributes<T>, OnCaptureAttributes<T>,
-                                     CustomEventHandlersCamelCase<T>, CustomEventHandlersLowerCase<T> {
+    [Key in keyof CustomCaptureEvents as `oncapture:${Key}`]?: EventHandler<
+      T,
+      CustomCaptureEvents[Key]
+    >;
+  };
+  interface DOMAttributes<T>
+    extends CustomAttributes<T>,
+      DirectiveAttributes,
+      DirectiveFunctionAttributes<T>,
+      PropAttributes,
+      AttrAttributes,
+      OnAttributes<T>,
+      OnCaptureAttributes<T>,
+      CustomEventHandlersCamelCase<T>,
+      CustomEventHandlersLowerCase<T> {
     children?: Element;
     innerHTML?: string;
     innerText?: string | number;
@@ -187,7 +199,8 @@ export namespace JSX {
     onProgress?: EventHandlerUnion<T, Event>;
     onRateChange?: EventHandlerUnion<T, Event>;
     onReset?: EventHandlerUnion<T, Event>;
-    onScroll?: EventHandlerUnion<T, UIEvent>;
+    onScroll?: EventHandlerUnion<T, Event>;
+    onScrollEnd?: EventHandlerUnion<T, Event>;
     onSeeked?: EventHandlerUnion<T, Event>;
     onSeeking?: EventHandlerUnion<T, Event>;
     onSelect?: EventHandlerUnion<T, UIEvent>;
@@ -204,7 +217,10 @@ export namespace JSX {
     onTouchEnd?: EventHandlerUnion<T, TouchEvent>;
     onTouchMove?: EventHandlerUnion<T, TouchEvent>;
     onTouchStart?: EventHandlerUnion<T, TouchEvent>;
+    onTransitionStart?: EventHandlerUnion<T, TransitionEvent>;
     onTransitionEnd?: EventHandlerUnion<T, TransitionEvent>;
+    onTransitionRun?: EventHandlerUnion<T, TransitionEvent>;
+    onTransitionCancel?: EventHandlerUnion<T, TransitionEvent>;
     onVolumeChange?: EventHandlerUnion<T, Event>;
     onWaiting?: EventHandlerUnion<T, Event>;
     onWheel?: EventHandlerUnion<T, WheelEvent>;
@@ -270,7 +286,8 @@ export namespace JSX {
     onprogress?: EventHandlerUnion<T, Event>;
     onratechange?: EventHandlerUnion<T, Event>;
     onreset?: EventHandlerUnion<T, Event>;
-    onscroll?: EventHandlerUnion<T, UIEvent>;
+    onscroll?: EventHandlerUnion<T, Event>;
+    onscrollend?: EventHandlerUnion<T, Event>;
     onseeked?: EventHandlerUnion<T, Event>;
     onseeking?: EventHandlerUnion<T, Event>;
     onselect?: EventHandlerUnion<T, UIEvent>;
@@ -287,7 +304,10 @@ export namespace JSX {
     ontouchend?: EventHandlerUnion<T, TouchEvent>;
     ontouchmove?: EventHandlerUnion<T, TouchEvent>;
     ontouchstart?: EventHandlerUnion<T, TouchEvent>;
+    ontransitionstart?: EventHandlerUnion<T, TransitionEvent>;
     ontransitionend?: EventHandlerUnion<T, TransitionEvent>;
+    ontransitionrun?: EventHandlerUnion<T, TransitionEvent>;
+    ontransitioncancel?: EventHandlerUnion<T, TransitionEvent>;
     onvolumechange?: EventHandlerUnion<T, Event>;
     onwaiting?: EventHandlerUnion<T, Event>;
     onwheel?: EventHandlerUnion<T, WheelEvent>;
@@ -295,7 +315,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";
@@ -538,76 +558,77 @@ export namespace JSX {
     /** 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">;
+      | "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> {
@@ -643,7 +664,9 @@ export namespace JSX {
     itemref?: FunctionMaybe<string>;
     part?: FunctionMaybe<string>;
     exportparts?: FunctionMaybe<string>;
-    inputmode?: FunctionMaybe<"none" | "text" | "tel" | "url" | "email" | "numeric" | "decimal" | "search">;
+    inputmode?: FunctionMaybe<
+      "none" | "text" | "tel" | "url" | "email" | "numeric" | "decimal" | "search"
+    >;
     contentEditable?: FunctionMaybe<boolean | "inherit">;
     contextMenu?: FunctionMaybe<string>;
     tabIndex?: FunctionMaybe<number | string>;
@@ -654,7 +677,9 @@ export namespace JSX {
     itemId?: FunctionMaybe<string>;
     itemRef?: FunctionMaybe<string>;
     exportParts?: FunctionMaybe<string>;
-    inputMode?: FunctionMaybe<"none" | "text" | "tel" | "url" | "email" | "numeric" | "decimal" | "search">;
+    inputMode?: FunctionMaybe<
+      "none" | "text" | "tel" | "url" | "email" | "numeric" | "decimal" | "search"
+    >;
   }
   interface AnchorHTMLAttributes<T> extends HTMLAttributes<T> {
     download?: FunctionMaybe<any>;
@@ -741,7 +766,7 @@ export namespace JSX {
     name?: FunctionMaybe<string>;
   }
   interface FormHTMLAttributes<T> extends HTMLAttributes<T> {
-    acceptcharset?: FunctionMaybe<string>;
+    "accept-charset"?: FunctionMaybe<string>;
     action?: FunctionMaybe<string>;
     autocomplete?: FunctionMaybe<string>;
     encoding?: FunctionMaybe<HTMLFormEncType>;
@@ -750,7 +775,6 @@ export namespace JSX {
     name?: FunctionMaybe<string>;
     novalidate?: FunctionMaybe<boolean>;
     target?: FunctionMaybe<string>;
-    acceptCharset?: FunctionMaybe<string>;
     noValidate?: FunctionMaybe<boolean>;
   }
   interface IframeHTMLAttributes<T> extends HTMLAttributes<T> {
@@ -885,9 +909,8 @@ export namespace JSX {
   interface MetaHTMLAttributes<T> extends HTMLAttributes<T> {
     charset?: FunctionMaybe<string>;
     content?: FunctionMaybe<string>;
-    httpequiv?: FunctionMaybe<string>;
+    "http-equiv"?: FunctionMaybe<string>;
     name?: FunctionMaybe<string>;
-    httpEquiv?: FunctionMaybe<string>;
   }
   interface MeterHTMLAttributes<T> extends HTMLAttributes<T> {
     form?: FunctionMaybe<string>;
@@ -1017,7 +1040,7 @@ export namespace JSX {
     rowspan?: FunctionMaybe<number | string>;
     colSpan?: FunctionMaybe<number | string>;
     rowSpan?: FunctionMaybe<number | string>;
-    scope?: FunctionMaybe<'col' | 'row' | 'rowgroup' | 'colgroup'>;
+    scope?: FunctionMaybe<"col" | "row" | "rowgroup" | "colgroup">;
   }
   interface TimeHTMLAttributes<T> extends HTMLAttributes<T> {
     datetime?: FunctionMaybe<string>;
@@ -1223,26 +1246,30 @@ export namespace JSX {
       | "stroke"
       | "all"
       | "none"
-      | "inherit">;
-    "shape-rendering"?: FunctionMaybe<"auto" | "optimizeSpeed" | "crispEdges" | "geometricPrecision" | "inherit">;
+      | "inherit"
+    >;
+    "shape-rendering"?: FunctionMaybe<
+      "auto" | "optimizeSpeed" | "crispEdges" | "geometricPrecision" | "inherit"
+    >;
     "stop-color"?: FunctionMaybe<string>;
     "stop-opacity"?: FunctionMaybe<number | string | "inherit">;
     stroke?: FunctionMaybe<string>;
     "stroke-dasharray"?: FunctionMaybe<string>;
     "stroke-dashoffset"?: FunctionMaybe<number | string>;
     "stroke-linecap"?: FunctionMaybe<"butt" | "round" | "square" | "inherit">;
-    "stroke-linejoin"?: FunctionMaybe<"arcs" | "bevel" | "miter" | "miter-clip" | "round" | "inherit">;
+    "stroke-linejoin"?: FunctionMaybe<
+      "arcs" | "bevel" | "miter" | "miter-clip" | "round" | "inherit"
+    >;
     "stroke-miterlimit"?: FunctionMaybe<number | string | "inherit">;
     "stroke-opacity"?: FunctionMaybe<number | string | "inherit">;
     "stroke-width"?: FunctionMaybe<number | string>;
     "text-anchor"?: FunctionMaybe<"start" | "middle" | "end" | "inherit">;
-    "text-decoration"?: FunctionMaybe<"none" | "underline" | "overline" | "line-through" | "blink" | "inherit">;
+    "text-decoration"?: FunctionMaybe<
+      "none" | "underline" | "overline" | "line-through" | "blink" | "inherit"
+    >;
     "text-rendering"?: FunctionMaybe<
-      | "auto"
-      | "optimizeSpeed"
-      | "optimizeLegibility"
-      | "geometricPrecision"
-      | "inherit">;
+      "auto" | "optimizeSpeed" | "optimizeLegibility" | "geometricPrecision" | "inherit"
+    >;
     "unicode-bidi"?: FunctionMaybe<string>;
     visibility?: FunctionMaybe<"visible" | "hidden" | "collapse" | "inherit">;
     "word-spacing"?: FunctionMaybe<number | string>;
@@ -1293,7 +1320,7 @@ export namespace JSX {
     gradientUnits?: FunctionMaybe<SVGUnits>;
     gradientTransform?: FunctionMaybe<string>;
     spreadMethod?: FunctionMaybe<"pad" | "reflect" | "repeat">;
-    href?: FunctionMaybe<string>
+    href?: FunctionMaybe<string>;
   }
   interface GraphicsElementSVGAttributes<T>
     extends CoreSVGAttributes<T>,

package/package.json

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

package/types/jsx.d.ts

@@ -266,7 +266,8 @@ export namespace JSX {
     onProgress?: EventHandlerUnion<T, Event>;
     onRateChange?: EventHandlerUnion<T, Event>;
     onReset?: EventHandlerUnion<T, Event>;
-    onScroll?: EventHandlerUnion<T, UIEvent>;
+    onScroll?: EventHandlerUnion<T, Event>;
+    onScrollEnd?: EventHandlerUnion<T, Event>;
     onSeeked?: EventHandlerUnion<T, Event>;
     onSeeking?: EventHandlerUnion<T, Event>;
     onSelect?: EventHandlerUnion<T, UIEvent>;
@@ -352,7 +353,8 @@ export namespace JSX {
     onprogress?: EventHandlerUnion<T, Event>;
     onratechange?: EventHandlerUnion<T, Event>;
     onreset?: EventHandlerUnion<T, Event>;
-    onscroll?: EventHandlerUnion<T, UIEvent>;
+    onscroll?: EventHandlerUnion<T, Event>;
+    onscrollend?: EventHandlerUnion<T, Event>;
     onseeked?: EventHandlerUnion<T, Event>;
     onseeking?: EventHandlerUnion<T, Event>;
     onselect?: EventHandlerUnion<T, UIEvent>;
@@ -839,7 +841,7 @@ export namespace JSX {
     name?: string;
   }
   interface FormHTMLAttributes<T> extends HTMLAttributes<T> {
-    acceptcharset?: string;
+    "accept-charset"?: string;
     action?: string;
     autocomplete?: string;
     encoding?: HTMLFormEncType;
@@ -848,7 +850,6 @@ export namespace JSX {
     name?: string;
     novalidate?: boolean;
     target?: string;
-    acceptCharset?: string;
     noValidate?: boolean;
   }
   interface IframeHTMLAttributes<T> extends HTMLAttributes<T> {
@@ -989,9 +990,8 @@ export namespace JSX {
   interface MetaHTMLAttributes<T> extends HTMLAttributes<T> {
     charset?: string;
     content?: string;
-    httpequiv?: string;
+    "http-equiv"?: string;
     name?: string;
-    httpEquiv?: string;
   }
   interface MeterHTMLAttributes<T> extends HTMLAttributes<T> {
     form?: string;
@@ -1101,6 +1101,7 @@ export namespace JSX {
     cols?: number | string;
     dirname?: string;
     disabled?: boolean;
+    enterkeyhint?: "enter" | "done" | "go" | "next" | "previous" | "search" | "send";
     form?: string;
     maxlength?: number | string;
     minlength?: number | string;

package/types/render/hydration.d.ts

@@ -1,3 +1,4 @@
+import { Computation } from "../reactive/signal";
 export type HydrationContext = {
     id: string;
     count: number;
@@ -11,6 +12,8 @@ type SharedConfig = {
     gather?: (key: string) => void;
     registry?: Map<string, Element>;
     done?: boolean;
+    count?: number;
+    effects?: Computation<any, any>[];
 };
 export declare const sharedConfig: SharedConfig;
 export declare function setHydrateContext(context?: HydrationContext): void;

package/web/dist/server.cjs

@@ -124,10 +124,10 @@ function renderToStream(code, options = {}) {
     },
     replace(id, payloadFn) {
       if (firstFlushed) return;
-      const placeholder = `<!!$${id}>`;
+      const placeholder = `<!--!$${id}-->`;
       const first = html.indexOf(placeholder);
       if (first === -1) return;
-      const last = html.indexOf(`<!!$/${id}>`, first + placeholder.length);
+      const last = html.indexOf(`<!--!$/${id}-->`, first + placeholder.length);
       html = html.replace(html.slice(first, last + placeholder.length + 1), resolveSSRNode(payloadFn()));
     },
     writeResource(id, p, error, wait) {
@@ -197,7 +197,7 @@ function renderToStream(code, options = {}) {
         fn(tmp);
       }
       if (onCompleteAll) {
-        ogComplete = onCompleteAll;
+        let ogComplete = onCompleteAll;
         onCompleteAll = options => {
           ogComplete(options);
           complete();
@@ -462,7 +462,7 @@ function serializeSet(registry, key, value) {
 }
 function replacePlaceholder(html, key, value) {
   const marker = `<template id="pl-${key}">`;
-  const close = `<!pl-${key}>`;
+  const close = `<!--pl-${key}-->`;
   const first = html.indexOf(marker);
   if (first === -1) return html;
   const last = html.indexOf(close, first + marker.length);

package/web/dist/server.js

@@ -123,10 +123,10 @@ function renderToStream(code, options = {}) {
     },
     replace(id, payloadFn) {
       if (firstFlushed) return;
-      const placeholder = `<!!$${id}>`;
+      const placeholder = `<!--!$${id}-->`;
       const first = html.indexOf(placeholder);
       if (first === -1) return;
-      const last = html.indexOf(`<!!$/${id}>`, first + placeholder.length);
+      const last = html.indexOf(`<!--!$/${id}-->`, first + placeholder.length);
       html = html.replace(html.slice(first, last + placeholder.length + 1), resolveSSRNode(payloadFn()));
     },
     writeResource(id, p, error, wait) {
@@ -196,7 +196,7 @@ function renderToStream(code, options = {}) {
         fn(tmp);
       }
       if (onCompleteAll) {
-        ogComplete = onCompleteAll;
+        let ogComplete = onCompleteAll;
         onCompleteAll = options => {
           ogComplete(options);
           complete();
@@ -461,7 +461,7 @@ function serializeSet(registry, key, value) {
 }
 function replacePlaceholder(html, key, value) {
   const marker = `<template id="pl-${key}">`;
-  const close = `<!pl-${key}>`;
+  const close = `<!--pl-${key}-->`;
   const first = html.indexOf(marker);
   if (first === -1) return html;
   const last = html.indexOf(close, first + marker.length);