solid-js 1.6.1 → 1.6.3

package/dist/dev.cjs

@@ -335,7 +335,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !(p && "then" in p)) {
-      loadEnd(pr, p);
+      loadEnd(pr, p, undefined, lookup);
       return p;
     }
     pr = p;
@@ -345,7 +345,7 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e), lookup));
   }
   Object.defineProperties(read, {
     state: {
@@ -419,12 +419,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -578,7 +579,9 @@ function useContext(context) {
 }
 function children(fn) {
   const children = createMemo(fn);
-  const memo = createMemo(() => resolveChildren(children()));
+  const memo = createMemo(() => resolveChildren(children()), undefined, {
+    name: "children"
+  }) ;
   memo.toArray = () => {
     const c = memo();
     return Array.isArray(c) ? c : c != null ? [c] : [];
@@ -1142,7 +1145,9 @@ function mapArray(list, mapFn, options = {}) {
     function mapper(disposer) {
       disposers[j] = disposer;
       if (indexes) {
-        const [s, set] = createSignal(j);
+        const [s, set] = createSignal(j, {
+          name: "index"
+        }) ;
         indexes[j] = set;
         return mapFn(newItems[j], s);
       }
@@ -1204,7 +1209,9 @@ function indexArray(list, mapFn, options = {}) {
     });
     function mapper(disposer) {
       disposers[i] = disposer;
-      const [s, set] = createSignal(newItems[i]);
+      const [s, set] = createSignal(newItems[i], {
+        name: "value"
+      }) ;
       signals[i] = set;
       return mapFn(s, i);
     }
@@ -1256,7 +1263,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1359,7 +1366,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
-      Object.assign(Comp, {
+      if ("_SOLID_DEV_") Object.assign(Comp, {
         [$DEVCOMP]: true
       });
       if (!ctx) return Comp(props);
@@ -1383,20 +1390,25 @@ function For(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(mapArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(mapArray(() => props.each, props.children, fallback || undefined), undefined, {
+    name: "value"
+  }) ;
 }
 function Index(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(indexArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(indexArray(() => props.each, props.children, fallback || undefined), undefined, {
+    name: "value"
+  }) ;
 }
 function Show(props) {
   let strictEqual = false;
   const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => strictEqual ? a === b : !a === !b
-  });
+    equals: (a, b) => strictEqual ? a === b : !a === !b,
+    name: "condition"
+  } );
   return createMemo(() => {
     const c = condition();
     if (c) {
@@ -1406,11 +1418,14 @@ function Show(props) {
       return fn ? untrack(() => child(c)) : child;
     }
     return props.fallback;
-  });
+  }, undefined, {
+    name: "value"
+  } );
 }
 function Switch(props) {
   let strictEqual = false;
   let keyed = false;
+  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
         evalConditions = createMemo(() => {
     let conds = conditions();
@@ -1424,8 +1439,9 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
-  });
+    equals,
+    name: "eval conditions"
+  } );
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
     if (index < 0) return props.fallback;
@@ -1433,7 +1449,9 @@ function Switch(props) {
     const fn = typeof c === "function" && c.length > 0;
     strictEqual = keyed || fn;
     return fn ? untrack(() => c(when)) : c;
-  });
+  }, undefined, {
+    name: "value"
+  } );
 }
 function Match(props) {
   return props;
@@ -1446,7 +1464,9 @@ function ErrorBoundary(props) {
   let err;
   let v;
   if (sharedConfig.context && sharedConfig.load && (v = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count))) err = v[0];
-  const [errored, setErrored] = createSignal(err);
+  const [errored, setErrored] = createSignal(err, {
+    name: "errored"
+  } );
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
@@ -1461,7 +1481,9 @@ function ErrorBoundary(props) {
     }
     onError(setErrored);
     return props.children;
-  });
+  }, undefined, {
+    name: "value"
+  } );
 }
 
 const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;

package/dist/dev.js

@@ -331,7 +331,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !(p && "then" in p)) {
-      loadEnd(pr, p);
+      loadEnd(pr, p, undefined, lookup);
       return p;
     }
     pr = p;
@@ -341,7 +341,7 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e), lookup));
   }
   Object.defineProperties(read, {
     state: {
@@ -415,12 +415,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -574,7 +575,9 @@ function useContext(context) {
 }
 function children(fn) {
   const children = createMemo(fn);
-  const memo = createMemo(() => resolveChildren(children()));
+  const memo = createMemo(() => resolveChildren(children()), undefined, {
+    name: "children"
+  }) ;
   memo.toArray = () => {
     const c = memo();
     return Array.isArray(c) ? c : c != null ? [c] : [];
@@ -1138,7 +1141,9 @@ function mapArray(list, mapFn, options = {}) {
     function mapper(disposer) {
       disposers[j] = disposer;
       if (indexes) {
-        const [s, set] = createSignal(j);
+        const [s, set] = createSignal(j, {
+          name: "index"
+        }) ;
         indexes[j] = set;
         return mapFn(newItems[j], s);
       }
@@ -1200,7 +1205,9 @@ function indexArray(list, mapFn, options = {}) {
     });
     function mapper(disposer) {
       disposers[i] = disposer;
-      const [s, set] = createSignal(newItems[i]);
+      const [s, set] = createSignal(newItems[i], {
+        name: "value"
+      }) ;
       signals[i] = set;
       return mapFn(s, i);
     }
@@ -1252,7 +1259,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1355,7 +1362,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
-      Object.assign(Comp, {
+      if ("_SOLID_DEV_") Object.assign(Comp, {
         [$DEVCOMP]: true
       });
       if (!ctx) return Comp(props);
@@ -1379,20 +1386,25 @@ function For(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(mapArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(mapArray(() => props.each, props.children, fallback || undefined), undefined, {
+    name: "value"
+  }) ;
 }
 function Index(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(indexArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(indexArray(() => props.each, props.children, fallback || undefined), undefined, {
+    name: "value"
+  }) ;
 }
 function Show(props) {
   let strictEqual = false;
   const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => strictEqual ? a === b : !a === !b
-  });
+    equals: (a, b) => strictEqual ? a === b : !a === !b,
+    name: "condition"
+  } );
   return createMemo(() => {
     const c = condition();
     if (c) {
@@ -1402,11 +1414,14 @@ function Show(props) {
       return fn ? untrack(() => child(c)) : child;
     }
     return props.fallback;
-  });
+  }, undefined, {
+    name: "value"
+  } );
 }
 function Switch(props) {
   let strictEqual = false;
   let keyed = false;
+  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
         evalConditions = createMemo(() => {
     let conds = conditions();
@@ -1420,8 +1435,9 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
-  });
+    equals,
+    name: "eval conditions"
+  } );
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
     if (index < 0) return props.fallback;
@@ -1429,7 +1445,9 @@ function Switch(props) {
     const fn = typeof c === "function" && c.length > 0;
     strictEqual = keyed || fn;
     return fn ? untrack(() => c(when)) : c;
-  });
+  }, undefined, {
+    name: "value"
+  } );
 }
 function Match(props) {
   return props;
@@ -1442,7 +1460,9 @@ function ErrorBoundary(props) {
   let err;
   let v;
   if (sharedConfig.context && sharedConfig.load && (v = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count))) err = v[0];
-  const [errored, setErrored] = createSignal(err);
+  const [errored, setErrored] = createSignal(err, {
+    name: "errored"
+  } );
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
@@ -1457,7 +1477,9 @@ function ErrorBoundary(props) {
     }
     onError(setErrored);
     return props.children;
-  });
+  }, undefined, {
+    name: "value"
+  } );
 }
 
 const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;

package/dist/server.cjs

@@ -291,7 +291,21 @@ function mergeProps(...sources) {
   for (let i = 0; i < sources.length; i++) {
     let source = sources[i];
     if (typeof source === "function") source = source();
-    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    if (source) {
+      const descriptors = Object.getOwnPropertyDescriptors(source);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
+    }
   }
   return target;
 }

package/dist/server.js

@@ -287,7 +287,21 @@ function mergeProps(...sources) {
   for (let i = 0; i < sources.length; i++) {
     let source = sources[i];
     if (typeof source === "function") source = source();
-    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    if (source) {
+      const descriptors = Object.getOwnPropertyDescriptors(source);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
+    }
   }
   return target;
 }

package/dist/solid.cjs

@@ -327,7 +327,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !(p && "then" in p)) {
-      loadEnd(pr, p);
+      loadEnd(pr, p, undefined, lookup);
       return p;
     }
     pr = p;
@@ -337,7 +337,7 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e), lookup));
   }
   Object.defineProperties(read, {
     state: {
@@ -411,12 +411,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -1170,7 +1171,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1273,6 +1274,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      if (false) ;
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1294,13 +1296,13 @@ function For(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(mapArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(mapArray(() => props.each, props.children, fallback || undefined));
 }
 function Index(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(indexArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(indexArray(() => props.each, props.children, fallback || undefined));
 }
 function Show(props) {
   let strictEqual = false;
@@ -1317,11 +1319,12 @@ function Show(props) {
       return fn ? untrack(() => child(c)) : child;
     }
     return props.fallback;
-  });
+  }, undefined, undefined);
 }
 function Switch(props) {
   let strictEqual = false;
   let keyed = false;
+  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
         evalConditions = createMemo(() => {
     let conds = conditions();
@@ -1335,7 +1338,7 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
+    equals
   });
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
@@ -1344,7 +1347,7 @@ function Switch(props) {
     const fn = typeof c === "function" && c.length > 0;
     strictEqual = keyed || fn;
     return fn ? untrack(() => c(when)) : c;
-  });
+  }, undefined, undefined);
 }
 function Match(props) {
   return props;
@@ -1357,7 +1360,7 @@ function ErrorBoundary(props) {
   let err;
   let v;
   if (sharedConfig.context && sharedConfig.load && (v = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count))) err = v[0];
-  const [errored, setErrored] = createSignal(err);
+  const [errored, setErrored] = createSignal(err, undefined);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
@@ -1371,7 +1374,7 @@ function ErrorBoundary(props) {
     }
     onError(setErrored);
     return props.children;
-  });
+  }, undefined, undefined);
 }
 
 const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;

package/dist/solid.js

@@ -323,7 +323,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !(p && "then" in p)) {
-      loadEnd(pr, p);
+      loadEnd(pr, p, undefined, lookup);
       return p;
     }
     pr = p;
@@ -333,7 +333,7 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e), lookup));
   }
   Object.defineProperties(read, {
     state: {
@@ -407,12 +407,13 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  let result,
-      listener = Listener;
+  const listener = Listener;
   Listener = null;
-  result = fn();
-  Listener = listener;
-  return result;
+  try {
+    return fn();
+  } finally {
+    Listener = listener;
+  }
 }
 function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
@@ -1166,7 +1167,7 @@ const propTraps = {
   }
 };
 function resolveSource(s) {
-  return (s = typeof s === "function" ? s() : s) == null ? {} : s;
+  return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
   if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
@@ -1269,6 +1270,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      if (false) ;
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1290,13 +1292,13 @@ function For(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(mapArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(mapArray(() => props.each, props.children, fallback || undefined));
 }
 function Index(props) {
   const fallback = "fallback" in props && {
     fallback: () => props.fallback
   };
-  return createMemo(indexArray(() => props.each, props.children, fallback ? fallback : undefined));
+  return createMemo(indexArray(() => props.each, props.children, fallback || undefined));
 }
 function Show(props) {
   let strictEqual = false;
@@ -1313,11 +1315,12 @@ function Show(props) {
       return fn ? untrack(() => child(c)) : child;
     }
     return props.fallback;
-  });
+  }, undefined, undefined);
 }
 function Switch(props) {
   let strictEqual = false;
   let keyed = false;
+  const equals = (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
         evalConditions = createMemo(() => {
     let conds = conditions();
@@ -1331,7 +1334,7 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
+    equals
   });
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
@@ -1340,7 +1343,7 @@ function Switch(props) {
     const fn = typeof c === "function" && c.length > 0;
     strictEqual = keyed || fn;
     return fn ? untrack(() => c(when)) : c;
-  });
+  }, undefined, undefined);
 }
 function Match(props) {
   return props;
@@ -1353,7 +1356,7 @@ function ErrorBoundary(props) {
   let err;
   let v;
   if (sharedConfig.context && sharedConfig.load && (v = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count))) err = v[0];
-  const [errored, setErrored] = createSignal(err);
+  const [errored, setErrored] = createSignal(err, undefined);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
@@ -1367,7 +1370,7 @@ function ErrorBoundary(props) {
     }
     onError(setErrored);
     return props.children;
-  });
+  }, undefined, undefined);
 }
 
 const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;

package/h/dist/h.cjs

@@ -8,6 +8,8 @@ function createHyperScript(r) {
     let args = [].slice.call(arguments),
         e,
         multiExpression = false;
+    while (Array.isArray(args[0])) args = args[0];
+    if (args[0][$ELEMENT]) args.unshift(h.Fragment);
     typeof args[0] === "string" && detectMultiExpression(args);
     const ret = () => {
       while (args.length) item(args.shift());
@@ -86,6 +88,7 @@ function createHyperScript(r) {
       }
     }
   }
+  h.Fragment = props => props.children;
   return h;
 }
 

package/h/dist/h.js

@@ -6,6 +6,8 @@ function createHyperScript(r) {
     let args = [].slice.call(arguments),
         e,
         multiExpression = false;
+    while (Array.isArray(args[0])) args = args[0];
+    if (args[0][$ELEMENT]) args.unshift(h.Fragment);
     typeof args[0] === "string" && detectMultiExpression(args);
     const ret = () => {
       while (args.length) item(args.shift());
@@ -84,6 +86,7 @@ function createHyperScript(r) {
       }
     }
   }
+  h.Fragment = props => props.children;
   return h;
 }
 

package/h/jsx-dev-runtime/package.json

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

package/h/types/hyperscript.d.ts

@@ -12,6 +12,9 @@ declare type ExpandableNode = Node & {
 };
 export declare type HyperScript = {
     (...args: any[]): () => ExpandableNode | ExpandableNode[];
+    Fragment: (props: {
+        children: (() => ExpandableNode) | (() => ExpandableNode)[];
+    }) => ExpandableNode[];
 };
 export declare function createHyperScript(r: Runtime): HyperScript;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -33,6 +33,7 @@
     "h/jsx-runtime/dist",
     "h/jsx-runtime/types",
     "h/jsx-runtime/package.json",
+    "h/jsx-dev-runtime/package.json",
     "html/dist",
     "html/types",
     "html/package.json",
@@ -97,6 +98,10 @@
       "types": "./types/jsx.d.ts",
       "default": "./dist/solid.js"
     },
+    "./jsx-dev-runtime": {
+      "types": "./types/jsx.d.ts",
+      "default": "./dist/solid.js"
+    },
     "./store": {
       "worker": {
         "import": {
@@ -226,6 +231,13 @@
       },
       "require": "./h/jsx-runtime/dist/jsx.cjs"
     },
+    "./h/jsx-dev-runtime": {
+      "import": {
+        "types": "./h/jsx-runtime/types/index.d.ts",
+        "default": "./h/jsx-runtime/dist/jsx.js"
+      },
+      "require": "./h/jsx-runtime/dist/jsx.cjs"
+    },
     "./h/dist/*": "./h/dist/*",
     "./html": {
       "import": {

package/store/dist/dev.cjs

@@ -116,8 +116,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -133,11 +132,10 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -261,8 +259,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -438,7 +435,14 @@ function produce(fn) {
   };
 }
 
+const DEV = {
+  $NAME,
+  $NODE,
+  isWrappable
+} ;
+
 exports.$RAW = $RAW;
+exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.modifyMutable = modifyMutable;

package/store/dist/dev.js

@@ -1,4 +1,4 @@
-import { DEV, $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
+import { $PROXY, DEV as DEV$1, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
       $NODE = Symbol("store-node"),
@@ -112,8 +112,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -129,11 +128,10 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (globalThis._$onStoreNodeUpdate) globalThis._$onStoreNodeUpdate(state, property, value, prev);
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -210,10 +208,10 @@ function createStore(...[store, options]) {
   const unwrappedStore = unwrap(store || {});
   const isArray = Array.isArray(unwrappedStore);
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createStore'. Expected an object.`);
-  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || DEV.hashValue(unwrappedStore)));
+  const wrappedStore = wrap$1(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
   {
-    const name = options && options.name || DEV.hashValue(unwrappedStore);
-    DEV.registerGraph(name, {
+    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
+    DEV$1.registerGraph(name, {
       value: unwrappedStore
     });
   }
@@ -257,8 +255,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -305,10 +302,10 @@ function wrap(value, name) {
 function createMutable(state, options) {
   const unwrappedStore = unwrap(state || {});
   if (typeof unwrappedStore !== "object" && typeof unwrappedStore !== "function") throw new Error(`Unexpected type ${typeof unwrappedStore} received when initializing 'createMutable'. Expected an object.`);
-  const wrappedStore = wrap(unwrappedStore, (options && options.name || DEV.hashValue(unwrappedStore)));
+  const wrappedStore = wrap(unwrappedStore, (options && options.name || DEV$1.hashValue(unwrappedStore)));
   {
-    const name = options && options.name || DEV.hashValue(unwrappedStore);
-    DEV.registerGraph(name, {
+    const name = options && options.name || DEV$1.hashValue(unwrappedStore);
+    DEV$1.registerGraph(name, {
       value: unwrappedStore
     });
   }
@@ -434,4 +431,10 @@ function produce(fn) {
   };
 }
 
-export { $RAW, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };
+const DEV = {
+  $NAME,
+  $NODE,
+  isWrappable
+} ;
+
+export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/dist/server.cjs

@@ -110,8 +110,10 @@ function produce(fn) {
     return state;
   };
 }
+const DEV = undefined;
 
 exports.$RAW = $RAW;
+exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.isWrappable = isWrappable;

package/store/dist/server.js

@@ -106,5 +106,6 @@ function produce(fn) {
     return state;
   };
 }
+const DEV = undefined;
 
-export { $RAW, createMutable, createStore, isWrappable, produce, reconcile, setProperty, unwrap, updatePath };
+export { $RAW, DEV, createMutable, createStore, isWrappable, produce, reconcile, setProperty, unwrap, updatePath };

package/store/dist/store.cjs

@@ -113,8 +113,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -128,11 +127,9 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -249,8 +246,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -416,7 +412,10 @@ function produce(fn) {
   };
 }
 
+const DEV = undefined;
+
 exports.$RAW = $RAW;
+exports.DEV = DEV;
 exports.createMutable = createMutable;
 exports.createStore = createStore;
 exports.modifyMutable = modifyMutable;

package/store/dist/store.js

@@ -109,8 +109,7 @@ const proxyTraps$1 = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set() {
@@ -124,11 +123,9 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value, deleting = false) {
   if (!deleting && state[property] === value) return;
-  const prev = state[property];
-  const len = state.length;
-  if (value === undefined) {
-    delete state[property];
-  } else state[property] = value;
+  const prev = state[property],
+        len = state.length;
+  if (value === undefined) delete state[property];else state[property] = value;
   let nodes = getDataNodes(state),
       node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
@@ -245,8 +242,7 @@ const proxyTraps = {
   },
   has(target, property) {
     if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
-    const tracked = getDataNodes(target)[property];
-    tracked && tracked();
+    this.get(target, property, target);
     return property in target;
   },
   set(target, property, value) {
@@ -412,4 +408,6 @@ function produce(fn) {
   };
 }
 
-export { $RAW, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };
+const DEV = undefined;
+
+export { $RAW, DEV, createMutable, createStore, modifyMutable, produce, reconcile, unwrap };

package/store/types/index.d.ts

@@ -2,3 +2,9 @@ export { createStore, unwrap, $RAW } from "./store.js";
 export type { Store, SetStoreFunction, NotWrappable, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store.js";
 export * from "./mutable.js";
 export * from "./modifiers.js";
+import { $NAME, $NODE, isWrappable } from "./store.js";
+export declare const DEV: {
+    readonly $NAME: typeof $NAME;
+    readonly $NODE: typeof $NODE;
+    readonly isWrappable: typeof isWrappable;
+} | undefined;

package/store/types/server.d.ts

@@ -12,4 +12,5 @@ declare type ReconcileOptions = {
 };
 export declare function reconcile<T extends U, U>(value: T, options?: ReconcileOptions): (state: U) => T;
 export declare function produce<T>(fn: (state: T) => void): (state: T) => T;
+export declare const DEV: undefined;
 export {};

package/store/types/store.d.ts

@@ -1,5 +1,18 @@
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-export declare type StoreNode = Record<PropertyKey, any>;
+declare global {
+    var _$onStoreNodeUpdate: OnStoreNodeUpdate | undefined;
+}
+declare type DataNode = {
+    (): any;
+    $(value?: any): void;
+};
+declare type DataNodes = Record<PropertyKey, DataNode>;
+export declare type OnStoreNodeUpdate = (state: StoreNode, property: PropertyKey, value: StoreNode | NotWrappable, prev: StoreNode | NotWrappable) => void;
+export interface StoreNode {
+    [$NAME]?: string;
+    [$NODE]?: DataNodes;
+    [key: PropertyKey]: any;
+}
 export declare namespace SolidStore {
     interface Unwrappable {
     }
@@ -7,9 +20,20 @@ export declare namespace SolidStore {
 export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined | SolidStore.Unwrappable[keyof SolidStore.Unwrappable];
 export declare type Store<T> = T;
 export declare function isWrappable<T>(obj: T | NotWrappable): obj is T;
+/**
+ * Returns the underlying data in the store without a proxy.
+ * @param item store proxy object
+ * @example
+ * ```js
+ * const initial = {z...};
+ * const [state, setState] = createStore(initial);
+ * initial === state; // => false
+ * initial === unwrap(state); // => true
+ * ```
+ */
 export declare function unwrap<T>(item: T, set?: Set<unknown>): T;
-export declare function getDataNodes(target: StoreNode): any;
-export declare function getDataNode(nodes: Record<string, any>, property: string | symbol, value: any): any;
+export declare function getDataNodes(target: StoreNode): DataNodes;
+export declare function getDataNode(nodes: DataNodes, property: PropertyKey, value: any): DataNode;
 export declare function proxyDescriptor(target: StoreNode, property: PropertyKey): PropertyDescriptor | undefined;
 export declare function trackSelf(target: StoreNode): void;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];

package/types/jsx.d.ts

@@ -727,6 +727,8 @@ export namespace JSX {
   }
   interface DialogHtmlAttributes<T> extends HTMLAttributes<T> {
     open?: boolean;
+    onClose?: EventHandlerUnion<T, Event>;
+    onCancel?: EventHandlerUnion<T, Event>;
   }
   interface EmbedHTMLAttributes<T> extends HTMLAttributes<T> {
     height?: number | string;

package/types/reactive/signal.d.ts

@@ -9,8 +9,8 @@ export declare var Owner: Owner | null;
 export declare let Transition: TransitionState | null;
 declare let ExternalSourceFactory: ExternalSourceFactory | null;
 declare global {
-    var _$afterUpdate: () => void;
-    var _$afterCreateRoot: (root: Owner) => void;
+    var _$afterUpdate: (() => void) | undefined;
+    var _$afterCreateRoot: ((root: Owner) => void) | undefined;
 }
 export interface SignalState<T> {
     value?: T;

package/types/render/component.d.ts

@@ -2,7 +2,7 @@ import type { JSX } from "../jsx.js";
 export declare function enableHydration(): void;
 /**
  * A general `Component` has no implicit `children` prop.  If desired, you can
- * specify one as in `Component<{name: String, children: JSX.Element>}`.
+ * specify one as in `Component<{name: String, children: JSX.Element}>`.
  */
 export declare type Component<P = {}> = (props: P) => JSX.Element;
 /**

package/web/dist/dev.cjs

@@ -358,14 +358,14 @@ function eventHandler(e) {
     solidJs.sharedConfig.done = true;
     document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
   }
-  while (node !== null) {
+  while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
       const data = node[`${key}Data`];
       data !== undefined ? handler.call(node, data, e) : handler.call(node, e);
       if (e.cancelBubble) return;
     }
-    node = node.host && node.host !== node && node.host instanceof Node ? node.host : node.parentNode;
+    node = node._$host || node.parentNode || node.host;
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -557,7 +557,7 @@ function Portal(props) {
           renderRoot = useShadow && container.attachShadow ? container.attachShadow({
       mode: "open"
     }) : container;
-    Object.defineProperty(container, "host", {
+    Object.defineProperty(container, "_$host", {
       get() {
         return marker.parentNode;
       },

package/web/dist/dev.js

@@ -355,14 +355,14 @@ function eventHandler(e) {
     sharedConfig.done = true;
     document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
   }
-  while (node !== null) {
+  while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
       const data = node[`${key}Data`];
       data !== undefined ? handler.call(node, data, e) : handler.call(node, e);
       if (e.cancelBubble) return;
     }
-    node = node.host && node.host !== node && node.host instanceof Node ? node.host : node.parentNode;
+    node = node._$host || node.parentNode || node.host;
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -554,7 +554,7 @@ function Portal(props) {
           renderRoot = useShadow && container.attachShadow ? container.attachShadow({
       mode: "open"
     }) : container;
-    Object.defineProperty(container, "host", {
+    Object.defineProperty(container, "_$host", {
       get() {
         return marker.parentNode;
       },

package/web/dist/server.cjs

@@ -103,7 +103,7 @@ function writeProp(cur, accessor) {
               case undefined:
                 BUFFER.push("Object.assign(Object.create(null),");
                 writeObject(cur);
-                BUFFER.push("))");
+                BUFFER.push(")");
                 break;
               default:
                 return false;
@@ -638,7 +638,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise(((e,o)=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}),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])}))));</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(e=>{let 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])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!solidJs.sharedConfig.context.noHydrate) return props.children;
@@ -871,4 +871,5 @@ exports.ssrElement = ssrElement;
 exports.ssrHydrationKey = ssrHydrationKey;
 exports.ssrSpread = ssrSpread;
 exports.ssrStyle = ssrStyle;
+exports.stringify = stringify;
 exports.useAssets = useAssets;

package/web/dist/server.js

@@ -100,7 +100,7 @@ function writeProp(cur, accessor) {
               case undefined:
                 BUFFER.push("Object.assign(Object.create(null),");
                 writeObject(cur);
-                BUFFER.push("))");
+                BUFFER.push(")");
                 break;
               default:
                 return false;
@@ -635,7 +635,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise(((e,o)=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}),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])}))));</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(e=>{let 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])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!sharedConfig.context.noHydrate) return props.children;
@@ -800,4 +800,4 @@ function Portal(props) {
   return "";
 }
 
-export { Assets, Dynamic, Hydration, HydrationScript, NoHydration, Portal, addEventListener, delegateEvents, escape, generateHydrationScript, getAssets, getHydrationKey, insert, isServer, pipeToNodeWritable, pipeToWritable, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, useAssets };
+export { Assets, Dynamic, Hydration, HydrationScript, NoHydration, Portal, addEventListener, delegateEvents, escape, generateHydrationScript, getAssets, getHydrationKey, insert, isServer, pipeToNodeWritable, pipeToWritable, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, stringify, useAssets };

package/web/dist/web.cjs

@@ -355,14 +355,14 @@ function eventHandler(e) {
     solidJs.sharedConfig.done = true;
     document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
   }
-  while (node !== null) {
+  while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
       const data = node[`${key}Data`];
       data !== undefined ? handler.call(node, data, e) : handler.call(node, e);
       if (e.cancelBubble) return;
     }
-    node = node.host && node.host !== node && node.host instanceof Node ? node.host : node.parentNode;
+    node = node._$host || node.parentNode || node.host;
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -554,7 +554,7 @@ function Portal(props) {
           renderRoot = useShadow && container.attachShadow ? container.attachShadow({
       mode: "open"
     }) : container;
-    Object.defineProperty(container, "host", {
+    Object.defineProperty(container, "_$host", {
       get() {
         return marker.parentNode;
       },

package/web/dist/web.js

@@ -352,14 +352,14 @@ function eventHandler(e) {
     sharedConfig.done = true;
     document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
   }
-  while (node !== null) {
+  while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
       const data = node[`${key}Data`];
       data !== undefined ? handler.call(node, data, e) : handler.call(node, e);
       if (e.cancelBubble) return;
     }
-    node = node.host && node.host !== node && node.host instanceof Node ? node.host : node.parentNode;
+    node = node._$host || node.parentNode || node.host;
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
@@ -551,7 +551,7 @@ function Portal(props) {
           renderRoot = useShadow && container.attachShadow ? container.attachShadow({
       mode: "open"
     }) : container;
-    Object.defineProperty(container, "host", {
+    Object.defineProperty(container, "_$host", {
       get() {
         return marker.parentNode;
       },

package/web/types/server.d.ts

@@ -49,6 +49,7 @@ export function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): J
 export function mergeProps(...sources: unknown[]): unknown;
 export function getOwner(): unknown;
 export function generateHydrationScript(options: { nonce?: string; eventNames?: string[] }): string;
+export function stringify(root: unknown): string;
 
 export function Hydration(props: { children?: JSX.Element }): JSX.Element;
 export function NoHydration(props: { children?: JSX.Element }): JSX.Element;