solid-js 1.6.2 → 1.6.4

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: {
@@ -579,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] : [];
@@ -1143,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);
       }
@@ -1205,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);
     }
@@ -1260,7 +1266,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy ||= !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1354,9 +1366,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
@@ -1384,20 +1393,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) {
@@ -1407,11 +1421,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();
@@ -1425,8 +1442,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;
@@ -1434,7 +1452,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;
@@ -1447,7 +1467,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));
@@ -1462,7 +1484,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: {
@@ -575,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] : [];
@@ -1139,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);
       }
@@ -1201,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);
     }
@@ -1256,7 +1262,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy ||= !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1350,9 +1362,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
@@ -1380,20 +1389,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) {
@@ -1403,11 +1417,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();
@@ -1421,8 +1438,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;
@@ -1430,7 +1448,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;
@@ -1443,7 +1463,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));
@@ -1458,7 +1480,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,23 @@ 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--) {
+              let s = sources[i] || {};
+              if (typeof s === "function") s = s();
+              const v = s[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
+    }
   }
   return target;
 }

package/dist/server.js

@@ -287,7 +287,23 @@ 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--) {
+              let s = sources[i] || {};
+              if (typeof s === "function") s = s();
+              const v = s[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: {
@@ -1174,7 +1174,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy ||= !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1268,9 +1274,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
@@ -1296,13 +1299,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;
@@ -1319,11 +1322,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();
@@ -1337,7 +1341,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();
@@ -1346,7 +1350,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;
@@ -1359,7 +1363,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));
@@ -1373,7 +1377,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: {
@@ -1170,7 +1170,13 @@ function resolveSource(s) {
   return !(s = typeof s === "function" ? s() : s) ? {} : s;
 }
 function mergeProps(...sources) {
-  if (sources.some(s => s && ($PROXY in s || typeof s === "function"))) {
+  let proxy = false;
+  for (let i = 0; i < sources.length; i++) {
+    const s = sources[i];
+    proxy ||= !!s && $PROXY in s;
+    sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
+  }
+  if (proxy) {
     return new Proxy({
       get(property) {
         for (let i = sources.length - 1; i >= 0; i--) {
@@ -1264,9 +1270,6 @@ function lazy(fn) {
     } else if (!comp) {
       const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
-    } else {
-      const c = comp();
-      if (c) return c(props);
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
@@ -1292,13 +1295,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;
@@ -1315,11 +1318,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();
@@ -1333,7 +1337,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();
@@ -1342,7 +1346,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;
@@ -1355,7 +1359,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));
@@ -1369,7 +1373,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.2",
+  "version": "1.6.4",
   "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/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/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/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;
       },