solid-js 1.7.6 → 1.7.7

package/dist/dev.cjs

@@ -958,19 +958,26 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
-}
-function handleError(err) {
-  const fns = ERROR && lookup(Owner, ERROR);
-  if (!fns) throw err;
+function handleError(err, owner = Owner) {
+  const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
+  if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, error);
+      try {
+        for (const f of fns) f(error);
+      } catch (e) {
+        handleError(e, owner?.owner || null);
+      }
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else {
+    try {
+      for (const f of fns) f(error);
+    } catch (e) {
+      handleError(e, owner?.owner || null);
+    }
+  }
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1301,28 +1308,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (key === "__proto__" || key === "constructor") continue;
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (!defined.has(key)) {
         if (desc.get) {
+          defined.add(key);
           Object.defineProperty(target, key, {
             enumerable: true,
             configurable: true,
             get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
           });
-        } else target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));

package/dist/dev.js

@@ -956,19 +956,26 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
-}
-function handleError(err) {
-  const fns = ERROR && lookup(Owner, ERROR);
-  if (!fns) throw err;
+function handleError(err, owner = Owner) {
+  const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
+  if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, error);
+      try {
+        for (const f of fns) f(error);
+      } catch (e) {
+        handleError(e, owner?.owner || null);
+      }
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else {
+    try {
+      for (const f of fns) f(error);
+    } catch (e) {
+      handleError(e, owner?.owner || null);
+    }
+  }
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1299,28 +1306,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (key === "__proto__" || key === "constructor") continue;
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (!defined.has(key)) {
         if (desc.get) {
+          defined.add(key);
           Object.defineProperty(target, key, {
             enumerable: true,
             configurable: true,
             get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
           });
-        } else target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));

package/dist/server.cjs

@@ -12,11 +12,15 @@ function castError(err) {
     cause: err
   });
 }
-function handleError(err) {
+function handleError(err, owner = Owner) {
+  const fns = lookup(owner, ERROR);
   const error = castError(err);
-  const fns = lookup(Owner, ERROR);
   if (!fns) throw error;
-  for (const f of fns) f(error);
+  try {
+    for (const f of fns) f(error);
+  } catch (e) {
+    handleError(e, owner?.owner || null);
+  }
 }
 const UNOWNED = {
   context: null,

package/dist/server.js

@@ -10,11 +10,15 @@ function castError(err) {
     cause: err
   });
 }
-function handleError(err) {
+function handleError(err, owner = Owner) {
+  const fns = lookup(owner, ERROR);
   const error = castError(err);
-  const fns = lookup(Owner, ERROR);
   if (!fns) throw error;
-  for (const f of fns) f(error);
+  try {
+    for (const f of fns) f(error);
+  } catch (e) {
+    handleError(e, owner?.owner || null);
+  }
 }
 const UNOWNED = {
   context: null,

package/dist/solid.cjs

@@ -917,19 +917,26 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
-}
-function handleError(err) {
-  const fns = ERROR && lookup(Owner, ERROR);
-  if (!fns) throw err;
+function handleError(err, owner = Owner) {
+  const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
+  if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, error);
+      try {
+        for (const f of fns) f(error);
+      } catch (e) {
+        handleError(e, owner?.owner || null);
+      }
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else {
+    try {
+      for (const f of fns) f(error);
+    } catch (e) {
+      handleError(e, owner?.owner || null);
+    }
+  }
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1256,28 +1263,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (key === "__proto__" || key === "constructor") continue;
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (!defined.has(key)) {
         if (desc.get) {
+          defined.add(key);
           Object.defineProperty(target, key, {
             enumerable: true,
             configurable: true,
             get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
           });
-        } else target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));

package/dist/solid.js

@@ -915,19 +915,26 @@ function castError(err) {
     cause: err
   });
 }
-function runErrors(fns, err) {
-  for (const f of fns) f(err);
-}
-function handleError(err) {
-  const fns = ERROR && lookup(Owner, ERROR);
-  if (!fns) throw err;
+function handleError(err, owner = Owner) {
+  const fns = ERROR && lookup(owner, ERROR);
   const error = castError(err);
+  if (!fns) throw error;
   if (Effects) Effects.push({
     fn() {
-      runErrors(fns, error);
+      try {
+        for (const f of fns) f(error);
+      } catch (e) {
+        handleError(e, owner?.owner || null);
+      }
     },
     state: STALE
-  });else runErrors(fns, error);
+  });else {
+    try {
+      for (const f of fns) f(error);
+    } catch (e) {
+      handleError(e, owner?.owner || null);
+    }
+  }
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1254,28 +1261,29 @@ function mergeProps(...sources) {
   }
   const target = {};
   const sourcesMap = {};
-  let someNonTargetKey = false;
+  const defined = new Set();
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    someNonTargetKey = someNonTargetKey || i !== 0 && !!sourceKeys.length;
     for (let i = 0, length = sourceKeys.length; i < length; i++) {
       const key = sourceKeys[i];
-      if (key === "__proto__" || key === "constructor") {
-        continue;
-      } else if (!(key in target)) {
-        const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (key === "__proto__" || key === "constructor") continue;
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (!defined.has(key)) {
         if (desc.get) {
+          defined.add(key);
           Object.defineProperty(target, key, {
             enumerable: true,
             configurable: true,
             get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
           });
-        } else target[key] = desc.value;
+        } else {
+          if (desc.value !== undefined) defined.add(key);
+          target[key] = desc.value;
+        }
       } else {
         const sources = sourcesMap[key];
-        const desc = Object.getOwnPropertyDescriptor(source, key);
         if (sources) {
           if (desc.get) {
             sources.push(desc.get.bind(source));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -46,51 +46,37 @@
   "exports": {
     ".": {
       "worker": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "browser": {
         "development": {
-          "import": {
-            "types": "./types/index.d.ts",
-            "default": "./dist/dev.js"
-          },
-          "require": "./dist/dev.cjs"
-        },
-        "import": {
           "types": "./types/index.d.ts",
-          "default": "./dist/solid.js"
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
         },
+        "types": "./types/index.d.ts",
+        "import": "./dist/solid.js",
         "require": "./dist/solid.cjs"
       },
       "deno": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "node": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "development": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/dev.js"
-        },
-        "require": "./dist/dev.cjs"
-      },
-      "import": {
         "types": "./types/index.d.ts",
-        "default": "./dist/solid.js"
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
       },
+      "types": "./types/index.d.ts",
+      "import": "./dist/solid.js",
       "require": "./dist/solid.cjs"
     },
     "./dist/*": "./dist/*",
@@ -104,146 +90,106 @@
     },
     "./store": {
       "worker": {
-        "import": {
-          "types": "./store/types/index.d.ts",
-          "default": "./store/dist/server.js"
-        },
+        "types": "./store/types/index.d.ts",
+        "import": "./store/dist/server.js",
         "require": "./store/dist/server.cjs"
       },
       "browser": {
         "development": {
-          "import": {
-            "types": "./store/types/index.d.ts",
-            "default": "./store/dist/dev.js"
-          },
-          "require": "./store/dist/dev.cjs"
-        },
-        "import": {
           "types": "./store/types/index.d.ts",
-          "default": "./store/dist/store.js"
+          "import": "./store/dist/dev.js",
+          "require": "./store/dist/dev.cjs"
         },
+        "types": "./store/types/index.d.ts",
+        "import": "./store/dist/store.js",
         "require": "./store/dist/store.cjs"
       },
       "deno": {
-        "import": {
-          "types": "./store/types/index.d.ts",
-          "default": "./store/dist/server.js"
-        },
+        "types": "./store/types/index.d.ts",
+        "import": "./store/dist/server.js",
         "require": "./store/dist/server.cjs"
       },
       "node": {
-        "import": {
-          "types": "./store/types/index.d.ts",
-          "default": "./store/dist/server.js"
-        },
+        "types": "./store/types/index.d.ts",
+        "import": "./store/dist/server.js",
         "require": "./store/dist/server.cjs"
       },
       "development": {
-        "import": {
-          "types": "./store/types/index.d.ts",
-          "default": "./store/dist/dev.js"
-        },
-        "require": "./store/dist/dev.cjs"
-      },
-      "import": {
         "types": "./store/types/index.d.ts",
-        "default": "./store/dist/store.js"
+        "import": "./store/dist/dev.js",
+        "require": "./store/dist/dev.cjs"
       },
+      "types": "./store/types/index.d.ts",
+      "import": "./store/dist/store.js",
       "require": "./store/dist/store.cjs"
     },
     "./store/dist/*": "./store/dist/*",
     "./web": {
       "worker": {
-        "import": {
-          "types": "./web/types/index.d.ts",
-          "default": "./web/dist/server.js"
-        },
+        "types": "./web/types/index.d.ts",
+        "import": "./web/dist/server.js",
         "require": "./web/dist/server.cjs"
       },
       "browser": {
         "development": {
-          "import": {
-            "types": "./web/types/index.d.ts",
-            "default": "./web/dist/dev.js"
-          },
-          "require": "./web/dist/dev.cjs"
-        },
-        "import": {
           "types": "./web/types/index.d.ts",
-          "default": "./web/dist/web.js"
+          "import": "./web/dist/dev.js",
+          "require": "./web/dist/dev.cjs"
         },
+        "types": "./web/types/index.d.ts",
+        "import": "./web/dist/web.js",
         "require": "./web/dist/web.cjs"
       },
       "deno": {
-        "import": {
-          "types": "./web/types/index.d.ts",
-          "default": "./web/dist/server.js"
-        },
+        "types": "./web/types/index.d.ts",
+        "import": "./web/dist/server.js",
         "require": "./web/dist/server.cjs"
       },
       "node": {
-        "import": {
-          "types": "./web/types/index.d.ts",
-          "default": "./web/dist/server.js"
-        },
+        "types": "./web/types/index.d.ts",
+        "import": "./web/dist/server.js",
         "require": "./web/dist/server.cjs"
       },
       "development": {
-        "import": {
-          "types": "./web/types/index.d.ts",
-          "default": "./web/dist/dev.js"
-        },
-        "require": "./web/dist/dev.cjs"
-      },
-      "import": {
         "types": "./web/types/index.d.ts",
-        "default": "./web/dist/web.js"
+        "import": "./web/dist/dev.js",
+        "require": "./web/dist/dev.cjs"
       },
+      "types": "./web/types/index.d.ts",
+      "import": "./web/dist/web.js",
       "require": "./web/dist/web.cjs"
     },
     "./web/dist/*": "./web/dist/*",
     "./universal": {
       "development": {
-        "import": {
-          "types": "./universal/types/index.d.ts",
-          "default": "./universal/dist/dev.js"
-        },
-        "require": "./universal/dist/dev.cjs"
-      },
-      "import": {
         "types": "./universal/types/index.d.ts",
-        "default": "./universal/dist/universal.js"
+        "import": "./universal/dist/dev.js",
+        "require": "./universal/dist/dev.cjs"
       },
+      "types": "./universal/types/index.d.ts",
+      "import": "./universal/dist/universal.js",
       "require": "./universal/dist/universal.cjs"
     },
     "./universal/dist/*": "./universal/dist/*",
     "./h": {
-      "import": {
-        "types": "./h/types/index.d.ts",
-        "default": "./h/dist/h.js"
-      },
+      "types": "./h/types/index.d.ts",
+      "import": "./h/dist/h.js",
       "require": "./h/dist/h.cjs"
     },
     "./h/jsx-runtime": {
-      "import": {
-        "types": "./h/jsx-runtime/types/index.d.ts",
-        "default": "./h/jsx-runtime/dist/jsx.js"
-      },
+      "types": "./h/jsx-runtime/types/index.d.ts",
+      "import": "./h/jsx-runtime/dist/jsx.js",
       "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"
-      },
+      "types": "./h/jsx-runtime/types/index.d.ts",
+      "import": "./h/jsx-runtime/dist/jsx.js",
       "require": "./h/jsx-runtime/dist/jsx.cjs"
     },
     "./h/dist/*": "./h/dist/*",
     "./html": {
-      "import": {
-        "types": "./html/types/index.d.ts",
-        "default": "./html/dist/html.js"
-      },
+      "types": "./html/types/index.d.ts",
+      "import": "./html/dist/html.js",
       "require": "./html/dist/html.cjs"
     },
     "./html/dist/*": "./html/dist/*",

package/store/package.json

@@ -13,51 +13,37 @@
   "exports": {
     ".": {
       "worker": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "browser": {
         "development": {
-          "import": {
-            "types": "./types/index.d.ts",
-            "default": "./dist/dev.js"
-          },
-          "require": "./dist/dev.cjs"
-        },
-        "import": {
           "types": "./types/index.d.ts",
-          "default": "./dist/store.js"
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
         },
+        "types": "./types/index.d.ts",
+        "import": "./dist/store.js",
         "require": "./dist/store.cjs"
       },
       "deno": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "node": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "development": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/dev.js"
-        },
-        "require": "./dist/dev.cjs"
-      },
-      "import": {
         "types": "./types/index.d.ts",
-        "default": "./dist/store.js"
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
       },
+      "types": "./types/index.d.ts",
+      "import": "./dist/store.js",
       "require": "./dist/store.cjs"
     }
   }

package/types/reactive/signal.d.ts

@@ -366,7 +366,7 @@ export type EqualityCheckerFunction<T, U> = (a: U, b: T) => boolean;
  *
  * @description https://www.solidjs.com/docs/latest/api#createselector
  */
-export declare function createSelector<T, U>(source: Accessor<T>, fn?: EqualityCheckerFunction<T, U>, options?: BaseOptions): (key: U) => boolean;
+export declare function createSelector<T, U = T>(source: Accessor<T>, fn?: EqualityCheckerFunction<T, U>, options?: BaseOptions): (key: U) => boolean;
 /**
  * Holds changes inside the block before the reactive context is updated
  * @param fn wraps the reactive updates that should be batched

package/types/server/reactive.d.ts

@@ -38,7 +38,7 @@ export declare function cleanNode(node: Owner): void;
 export declare function catchError<T>(fn: () => T, handler: (err: Error) => void): T | undefined;
 /**
  * @deprecated since version 1.7.0 and will be removed in next major - use catchError instead
-*/
+ */
 export declare function onError(fn: (err: Error) => void): void;
 export declare function getListener(): null;
 export interface Context<T> {

package/universal/package.json

@@ -8,16 +8,12 @@
   "exports": {
     ".": {
       "development": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/dev.js"
-        },
-        "require": "./dist/dev.cjs"
-      },
-      "import": {
         "types": "./types/index.d.ts",
-        "default": "./dist/universal.js"
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
       },
+      "types": "./types/index.d.ts",
+      "import": "./dist/universal.js",
       "require": "./dist/universal.cjs"
     }
   }

package/web/dist/dev.cjs

@@ -576,12 +576,12 @@ function Portal(props) {
   let hydrating = !!solidJs.sharedConfig.context;
   solidJs.createEffect(() => {
     if (hydrating) solidJs.getOwner().user = hydrating = false;
-    content || (content = solidJs.runWithOwner(owner, () => props.children));
+    content || (content = solidJs.runWithOwner(owner, () => solidJs.createMemo(() => props.children)));
     const el = mount();
     if (el instanceof HTMLHeadElement) {
       const [clean, setClean] = solidJs.createSignal(false);
       const cleanup = () => setClean(true);
-      solidJs.createRoot(dispose => insert(el, () => !clean() ? content : dispose(), null));
+      solidJs.createRoot(dispose => insert(el, () => !clean() ? content() : dispose(), null));
       solidJs.onCleanup(cleanup);
     } else {
       const container = createElement(props.isSVG ? "g" : "div", props.isSVG),

package/web/dist/dev.js

@@ -1,4 +1,4 @@
-import { createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, getOwner, createEffect, runWithOwner, createSignal, onCleanup, splitProps, createMemo, $DEVCOMP } from 'solid-js';
+import { createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, getOwner, createEffect, runWithOwner, createMemo, createSignal, onCleanup, splitProps, $DEVCOMP } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, createMemo as memo, mergeProps, untrack } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -575,12 +575,12 @@ function Portal(props) {
   let hydrating = !!sharedConfig.context;
   createEffect(() => {
     if (hydrating) getOwner().user = hydrating = false;
-    content || (content = runWithOwner(owner, () => props.children));
+    content || (content = runWithOwner(owner, () => createMemo(() => props.children)));
     const el = mount();
     if (el instanceof HTMLHeadElement) {
       const [clean, setClean] = createSignal(false);
       const cleanup = () => setClean(true);
-      createRoot(dispose => insert(el, () => !clean() ? content : dispose(), null));
+      createRoot(dispose => insert(el, () => !clean() ? content() : dispose(), null));
       onCleanup(cleanup);
     } else {
       const container = createElement(props.isSVG ? "g" : "div", props.isSVG),

package/web/dist/web.cjs

@@ -576,12 +576,12 @@ function Portal(props) {
   let hydrating = !!solidJs.sharedConfig.context;
   solidJs.createEffect(() => {
     if (hydrating) solidJs.getOwner().user = hydrating = false;
-    content || (content = solidJs.runWithOwner(owner, () => props.children));
+    content || (content = solidJs.runWithOwner(owner, () => solidJs.createMemo(() => props.children)));
     const el = mount();
     if (el instanceof HTMLHeadElement) {
       const [clean, setClean] = solidJs.createSignal(false);
       const cleanup = () => setClean(true);
-      solidJs.createRoot(dispose => insert(el, () => !clean() ? content : dispose(), null));
+      solidJs.createRoot(dispose => insert(el, () => !clean() ? content() : dispose(), null));
       solidJs.onCleanup(cleanup);
     } else {
       const container = createElement(props.isSVG ? "g" : "div", props.isSVG),

package/web/dist/web.js

@@ -1,4 +1,4 @@
-import { createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, getOwner, createEffect, runWithOwner, createSignal, onCleanup, splitProps, createMemo, $DEVCOMP } from 'solid-js';
+import { createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, getOwner, createEffect, runWithOwner, createMemo, createSignal, onCleanup, splitProps, $DEVCOMP } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, createMemo as memo, mergeProps, untrack } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -575,12 +575,12 @@ function Portal(props) {
   let hydrating = !!sharedConfig.context;
   createEffect(() => {
     if (hydrating) getOwner().user = hydrating = false;
-    content || (content = runWithOwner(owner, () => props.children));
+    content || (content = runWithOwner(owner, () => createMemo(() => props.children)));
     const el = mount();
     if (el instanceof HTMLHeadElement) {
       const [clean, setClean] = createSignal(false);
       const cleanup = () => setClean(true);
-      createRoot(dispose => insert(el, () => !clean() ? content : dispose(), null));
+      createRoot(dispose => insert(el, () => !clean() ? content() : dispose(), null));
       onCleanup(cleanup);
     } else {
       const container = createElement(props.isSVG ? "g" : "div", props.isSVG),

package/web/package.json

@@ -13,51 +13,37 @@
   "exports": {
     ".": {
       "worker": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "browser": {
         "development": {
-          "import": {
-            "types": "./types/index.d.ts",
-            "default": "./dist/dev.js"
-          },
-          "require": "./dist/dev.cjs"
-        },
-        "import": {
           "types": "./types/index.d.ts",
-          "default": "./dist/web.js"
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
         },
+        "types": "./types/index.d.ts",
+        "import": "./dist/web.js",
         "require": "./dist/web.cjs"
       },
       "deno": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "node": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/server.js"
-        },
+        "types": "./types/index.d.ts",
+        "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
       "development": {
-        "import": {
-          "types": "./types/index.d.ts",
-          "default": "./dist/dev.js"
-        },
-        "require": "./dist/dev.cjs"
-      },
-      "import": {
         "types": "./types/index.d.ts",
-        "default": "./dist/web.js"
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
       },
+      "types": "./types/index.d.ts",
+      "import": "./dist/web.js",
       "require": "./dist/web.cjs"
     }
   }