solid-js 1.6.0-beta.2 → 1.6.0-beta.3

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

@@ -603,7 +603,7 @@ export namespace JSX {
 
   interface HTMLAttributes<T> extends AriaAttributes, DOMAttributes<T> {
     accessKey?: FunctionMaybe<string>;
-    class?: FunctionMaybe<string>;
+    class?: FunctionMaybe<string> | undefined;
     contenteditable?: FunctionMaybe<boolean | "inherit">;
     contextmenu?: FunctionMaybe<string>;
     dir?: FunctionMaybe<HTMLDir>;
@@ -1090,7 +1090,7 @@ export namespace JSX {
     tabindex?: FunctionMaybe<number | string>;
   }
   interface StylableSVGAttributes {
-    class?: FunctionMaybe<string>;
+    class?: FunctionMaybe<string> | undefined;
     style?: FunctionMaybe<CSSProperties | string>;
   }
   interface TransformableSVGAttributes {

package/package.json

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

package/types/jsx.d.ts

@@ -611,7 +611,7 @@ export namespace JSX {
   interface HTMLAttributes<T> extends AriaAttributes, DOMAttributes<T> {
     // [key: ClassKeys]: boolean;
     accessKey?: string;
-    class?: string;
+    class?: string | undefined;
     contenteditable?: boolean | "inherit";
     contextmenu?: string;
     dir?: HTMLDir;
@@ -1098,7 +1098,7 @@ export namespace JSX {
     tabindex?: number | string;
   }
   interface StylableSVGAttributes {
-    class?: string;
+    class?: string | undefined;
     style?: CSSProperties | string;
   }
   interface TransformableSVGAttributes {

package/web/dist/server.cjs

@@ -647,8 +647,16 @@ function generateHydrationScript({
   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=>e.r[t];</script><!--xs-->`;
 }
 function Hydration(props) {
-  solidJs.sharedConfig.context.noHydrate = false;
-  return props.children;
+  if (!solidJs.sharedConfig.context.noHydrate) return props.children;
+  const context = solidJs.sharedConfig.context;
+  solidJs.sharedConfig.context = { ...context,
+    count: 0,
+    id: `${context.id}${context.count++}-`,
+    noHydrate: false
+  };
+  const res = props.children;
+  solidJs.sharedConfig.context = context;
+  return res;
 }
 function NoHydration(props) {
   solidJs.sharedConfig.context.noHydrate = true;

package/web/dist/server.js

@@ -644,8 +644,16 @@ function generateHydrationScript({
   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=>e.r[t];</script><!--xs-->`;
 }
 function Hydration(props) {
-  sharedConfig.context.noHydrate = false;
-  return props.children;
+  if (!sharedConfig.context.noHydrate) return props.children;
+  const context = sharedConfig.context;
+  sharedConfig.context = { ...context,
+    count: 0,
+    id: `${context.id}${context.count++}-`,
+    noHydrate: false
+  };
+  const res = props.children;
+  sharedConfig.context = context;
+  return res;
 }
 function NoHydration(props) {
   sharedConfig.context.noHydrate = true;