@solidjs/web 2.0.0-beta.17 → 2.0.0-beta.18

package/dist/dev.cjs

@@ -959,8 +959,7 @@ function insertExpression(parent, value, current, marker) {
     if (tc === "string" || tc === "number") {
       parent.firstChild.data = value;
     } else {
-      const owned = ownedChildCount(current);
-      if (owned === -1 || owned === parent.childNodes.length) parent.textContent = value;else {
+      if (ownsAllChildren(parent, current)) parent.textContent = value;else {
         removeOwnedChildren(parent, current);
         parent.insertBefore(document.createTextNode(value), parent.firstChild);
       }
@@ -1027,11 +1026,15 @@ function appendNodes(parent, array, marker = null) {
     if (marker) n[$$SLOT] = marker;
   }
 }
-function ownedChildCount(current) {
-  if (Array.isArray(current)) return current.length;
-  if (current == null) return -1;
-  if (current === "") return 0;
-  return 1;
+function ownsAllChildren(parent, current) {
+  if (current == null) return true;
+  if (Array.isArray(current)) {
+    return current.length ? parent.firstChild === current[0] && parent.lastChild === current[current.length - 1] : parent.firstChild === null;
+  }
+  if (current === "") return parent.firstChild === null;
+  if (current.nodeType) return parent.firstChild === current && parent.lastChild === current;
+  const first = parent.firstChild;
+  return first !== null && first.nodeType === 3 && parent.lastChild === first;
 }
 function removeOwnedChildren(parent, current) {
   if (Array.isArray(current)) {
@@ -1048,8 +1051,7 @@ function removeOwnedChildren(parent, current) {
 }
 function cleanChildren(parent, current, marker, replacement) {
   if (marker === undefined) {
-    const owned = ownedChildCount(current);
-    if (owned === -1 || owned === parent.childNodes.length) return parent.textContent = "";
+    if (ownsAllChildren(parent, current)) return parent.textContent = "";
     return removeOwnedChildren(parent, current);
   }
   if (current.length) {
@@ -1124,11 +1126,16 @@ const hydrate = (...args) => {
   return hydrate$1(...args);
 };
 function Portal(props) {
+  return solidJs.runWithOwner(solidJs.createOwner(), () => portalImpl(props));
+}
+function portalImpl(props) {
   const treeMarker = document.createTextNode(""),
     startMarker = document.createTextNode(""),
     endMarker = document.createTextNode(""),
     mount = () => props.mount || document.body,
-    content = solidJs.createMemo(() => [startMarker, props.children]);
+    content = solidJs.createMemo(() => [startMarker, props.children], {
+      ssrSource: "client"
+    });
   solidJs.createRenderEffect(
   () => [mount(), content(), solidJs.getOwner()], ([, c, owner]) => {
     const m = solidJs.untrack(mount);
@@ -1149,8 +1156,10 @@ function Portal(props) {
         c = n;
       }
     };
-  }, {
-    schedule: true
+  },
+  {
+    schedule: true,
+    ssrSource: "client"
   });
   solidJs.createEffect(mount, () => {
     const m = solidJs.untrack(mount);
@@ -1158,6 +1167,11 @@ function Portal(props) {
     if (!ownerRoot || ownerRoot.contains(m)) return;
     registerDelegatedContainer(m, ownerRoot);
     return () => unregisterDelegatedContainer(m, ownerRoot);
+  }, {
+    ssrSource: "client"
+  });
+  if (solidJs.sharedConfig.hydrating) return solidJs.createMemo(() => treeMarker, {
+    ssrSource: "client"
   });
   return treeMarker;
 }

package/dist/dev.js

@@ -1,4 +1,4 @@
-import { createRenderEffect, createMemo, sharedConfig, untrack, runWithOwner, flatten, createRoot, merge, createComponent, omit, getOwner, createEffect, $DEVCOMP, enableHydration, enforceLoadingBoundary, flush } from 'solid-js';
+import { createRenderEffect, createMemo, sharedConfig, untrack, runWithOwner, flatten, createRoot, merge, createComponent, omit, createOwner, $DEVCOMP, enableHydration, enforceLoadingBoundary, flush, getOwner, createEffect } from 'solid-js';
 export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, untrack } from 'solid-js';
 
 const DOMWithState = {
@@ -958,8 +958,7 @@ function insertExpression(parent, value, current, marker) {
     if (tc === "string" || tc === "number") {
       parent.firstChild.data = value;
     } else {
-      const owned = ownedChildCount(current);
-      if (owned === -1 || owned === parent.childNodes.length) parent.textContent = value;else {
+      if (ownsAllChildren(parent, current)) parent.textContent = value;else {
         removeOwnedChildren(parent, current);
         parent.insertBefore(document.createTextNode(value), parent.firstChild);
       }
@@ -1026,11 +1025,15 @@ function appendNodes(parent, array, marker = null) {
     if (marker) n[$$SLOT] = marker;
   }
 }
-function ownedChildCount(current) {
-  if (Array.isArray(current)) return current.length;
-  if (current == null) return -1;
-  if (current === "") return 0;
-  return 1;
+function ownsAllChildren(parent, current) {
+  if (current == null) return true;
+  if (Array.isArray(current)) {
+    return current.length ? parent.firstChild === current[0] && parent.lastChild === current[current.length - 1] : parent.firstChild === null;
+  }
+  if (current === "") return parent.firstChild === null;
+  if (current.nodeType) return parent.firstChild === current && parent.lastChild === current;
+  const first = parent.firstChild;
+  return first !== null && first.nodeType === 3 && parent.lastChild === first;
 }
 function removeOwnedChildren(parent, current) {
   if (Array.isArray(current)) {
@@ -1047,8 +1050,7 @@ function removeOwnedChildren(parent, current) {
 }
 function cleanChildren(parent, current, marker, replacement) {
   if (marker === undefined) {
-    const owned = ownedChildCount(current);
-    if (owned === -1 || owned === parent.childNodes.length) return parent.textContent = "";
+    if (ownsAllChildren(parent, current)) return parent.textContent = "";
     return removeOwnedChildren(parent, current);
   }
   if (current.length) {
@@ -1123,11 +1125,16 @@ const hydrate = (...args) => {
   return hydrate$1(...args);
 };
 function Portal(props) {
+  return runWithOwner(createOwner(), () => portalImpl(props));
+}
+function portalImpl(props) {
   const treeMarker = document.createTextNode(""),
     startMarker = document.createTextNode(""),
     endMarker = document.createTextNode(""),
     mount = () => props.mount || document.body,
-    content = createMemo(() => [startMarker, props.children]);
+    content = createMemo(() => [startMarker, props.children], {
+      ssrSource: "client"
+    });
   createRenderEffect(
   () => [mount(), content(), getOwner()], ([, c, owner]) => {
     const m = untrack(mount);
@@ -1148,8 +1155,10 @@ function Portal(props) {
         c = n;
       }
     };
-  }, {
-    schedule: true
+  },
+  {
+    schedule: true,
+    ssrSource: "client"
   });
   createEffect(mount, () => {
     const m = untrack(mount);
@@ -1157,6 +1166,11 @@ function Portal(props) {
     if (!ownerRoot || ownerRoot.contains(m)) return;
     registerDelegatedContainer(m, ownerRoot);
     return () => unregisterDelegatedContainer(m, ownerRoot);
+  }, {
+    ssrSource: "client"
+  });
+  if (sharedConfig.hydrating) return createMemo(() => treeMarker, {
+    ssrSource: "client"
   });
   return treeMarker;
 }

package/dist/server.cjs

@@ -66,25 +66,32 @@ const effect = (fn, effectFn, options) => solidJs.createRenderEffect(fn, effectF
 } : transparentOptions);
 const memo = fn => solidJs.createMemo(() => fn(), syncOptions);
 
-const ES2017FLAG = seroval.Feature.AggregateError |
-seroval.Feature.BigIntTypedArray;
-const GLOBAL_IDENTIFIER = "_$HY.r";
-function createSerializer({
+const DEFAULT_DISABLED_FEATURES = seroval.Feature.AggregateError | seroval.Feature.BigIntTypedArray;
+const HYDRATION_GLOBAL = "_$HY.r";
+const DEFAULT_WEB_PLUGINS = Object.freeze([web.AbortSignalPlugin,
+web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
+web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin]);
+function resolveSerializerPlugins(customPlugins) {
+  return customPlugins ? [...customPlugins, ...DEFAULT_WEB_PLUGINS] : [...DEFAULT_WEB_PLUGINS];
+}
+function createSerializer(options) {
+  return new seroval.Serializer({
+    ...options,
+    plugins: resolveSerializerPlugins(options.plugins),
+    disabledFeatures: options.disabledFeatures === undefined ? DEFAULT_DISABLED_FEATURES : options.disabledFeatures
+  });
+}
+function createHydrationSerializer({
   onData,
   onDone,
   scopeId,
   onError,
-  plugins: customPlugins
+  plugins
 }) {
-  const defaultPlugins = [web.AbortSignalPlugin,
-  web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
-  web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin];
-  const allPlugins = customPlugins ? [...customPlugins, ...defaultPlugins] : defaultPlugins;
-  return new seroval.Serializer({
+  return createSerializer({
     scopeId,
-    plugins: allPlugins,
-    globalIdentifier: GLOBAL_IDENTIFIER,
-    disabledFeatures: ES2017FLAG,
+    plugins,
+    globalIdentifier: HYDRATION_GLOBAL,
     onData,
     onDone,
     onError
@@ -93,6 +100,7 @@ function createSerializer({
 function getLocalHeaderScript(id) {
   return seroval.getCrossReferenceHeader(id) + ";";
 }
+seroval.Feature.RegExp;
 
 function joinAssetPath(base, file) {
   if (/^(?:[a-z][a-z0-9+.-]*:)?\/\//i.test(file)) return file;
@@ -124,7 +132,7 @@ function resolveAssets(moduleUrl, manifest) {
   };
 }
 function registerEntryAssets(manifest) {
-  if (!manifest) return;
+  if (!manifest || typeof manifest === "function" || typeof manifest.resolve === "function") return;
   const ctx = solidJs.sharedConfig.context;
   if (!ctx?.registerAsset) return;
   for (const key in manifest) {
@@ -205,10 +213,21 @@ function applyAssetTracking(context, tracking, manifest) {
   });
   context.registerModule = tracking.registerModule;
   context.getBoundaryModules = tracking.getBoundaryModules;
-  if (manifest) context.resolveAssets = moduleUrl => resolveAssets(moduleUrl, manifest);
+  if (typeof manifest === "function") {
+    context.resolveAssets = manifest;
+  } else if (manifest && typeof manifest.resolve === "function") {
+    context.resolveAssets = key => manifest.resolve(key);
+    if (typeof manifest.resolveSync === "function") {
+      context.resolveAssetsSync = key => manifest.resolveSync(key);
+    }
+  } else if (manifest) {
+    const resolve = moduleUrl => resolveAssets(moduleUrl, manifest);
+    context.resolveAssets = resolve;
+    context.resolveAssetsSync = resolve;
+  }
 }
 const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
-const REPLACE_SCRIPT = `function $df(e,n,o,t){if(!(n=document.getElementById(e))||!(o=document.getElementById("pl-"+e)))return 0;for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)t=o.nextSibling,o.remove(),o=t;_$HY.done?o.remove():o.replaceWith(n.content),n.remove(),_$HY.fe(e);return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return 0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1;return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}`;
+const REPLACE_SCRIPT = `function $df(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById("pl-"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!=="pl-"+e);)t=o.nextSibling,o.remove(),o=t;_$HY.done?o.remove():o.replaceWith(n.content),n.remove(),_$HY.fe(e),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}`;
 function renderToString(code, options = {}) {
   const {
     renderId = "",
@@ -217,7 +236,7 @@ function renderToString(code, options = {}) {
     manifest
   } = options;
   let scripts = "";
-  const serializer = createSerializer({
+  const serializer = createHydrationSerializer({
     scopeId: renderId,
     plugins: options.plugins,
     onData(script) {
@@ -311,7 +330,7 @@ function renderToStream(code, options = {}) {
     completed = true;
     if (firstFlushed) dispose();
   };
-  const serializer = createSerializer({
+  const serializer = createHydrationSerializer({
     scopeId: options.renderId,
     plugins: options.plugins,
     onData: pushTask,
@@ -1305,7 +1324,9 @@ function Dynamic(props) {
   return solidJs.createComponent(Comp, solidJs.omit(props, "component"));
 }
 function Portal(props) {
-  throw new Error("Portal is not supported on the server");
+  const o = solidJs.getOwner();
+  if (o?.id != null) solidJs.getNextChildId(o);
+  return undefined;
 }
 
 Object.defineProperty(exports, "Errored", {

package/dist/server.js

@@ -1,6 +1,6 @@
 import { createRenderEffect, createMemo, sharedConfig, createRoot, ssrHandleError, getOwner, runWithOwner, createComponent, omit, getNextChildId, NotReadyError } from 'solid-js';
 export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, merge as mergeProps, ssrScope as scope, untrack } from 'solid-js';
-import { Serializer, Feature, getCrossReferenceHeader } from 'seroval';
+import { Serializer, getCrossReferenceHeader, Feature } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
 const DOMWithState = {
@@ -65,25 +65,32 @@ const effect = (fn, effectFn, options) => createRenderEffect(fn, effectFn, optio
 } : transparentOptions);
 const memo = fn => createMemo(() => fn(), syncOptions);
 
-const ES2017FLAG = Feature.AggregateError |
-Feature.BigIntTypedArray;
-const GLOBAL_IDENTIFIER = "_$HY.r";
-function createSerializer({
+const DEFAULT_DISABLED_FEATURES = Feature.AggregateError | Feature.BigIntTypedArray;
+const HYDRATION_GLOBAL = "_$HY.r";
+const DEFAULT_WEB_PLUGINS = Object.freeze([AbortSignalPlugin,
+CustomEventPlugin, DOMExceptionPlugin, EventPlugin,
+FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin]);
+function resolveSerializerPlugins(customPlugins) {
+  return customPlugins ? [...customPlugins, ...DEFAULT_WEB_PLUGINS] : [...DEFAULT_WEB_PLUGINS];
+}
+function createSerializer(options) {
+  return new Serializer({
+    ...options,
+    plugins: resolveSerializerPlugins(options.plugins),
+    disabledFeatures: options.disabledFeatures === undefined ? DEFAULT_DISABLED_FEATURES : options.disabledFeatures
+  });
+}
+function createHydrationSerializer({
   onData,
   onDone,
   scopeId,
   onError,
-  plugins: customPlugins
+  plugins
 }) {
-  const defaultPlugins = [AbortSignalPlugin,
-  CustomEventPlugin, DOMExceptionPlugin, EventPlugin,
-  FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin];
-  const allPlugins = customPlugins ? [...customPlugins, ...defaultPlugins] : defaultPlugins;
-  return new Serializer({
+  return createSerializer({
     scopeId,
-    plugins: allPlugins,
-    globalIdentifier: GLOBAL_IDENTIFIER,
-    disabledFeatures: ES2017FLAG,
+    plugins,
+    globalIdentifier: HYDRATION_GLOBAL,
     onData,
     onDone,
     onError
@@ -92,6 +99,7 @@ function createSerializer({
 function getLocalHeaderScript(id) {
   return getCrossReferenceHeader(id) + ";";
 }
+Feature.RegExp;
 
 function joinAssetPath(base, file) {
   if (/^(?:[a-z][a-z0-9+.-]*:)?\/\//i.test(file)) return file;
@@ -123,7 +131,7 @@ function resolveAssets(moduleUrl, manifest) {
   };
 }
 function registerEntryAssets(manifest) {
-  if (!manifest) return;
+  if (!manifest || typeof manifest === "function" || typeof manifest.resolve === "function") return;
   const ctx = sharedConfig.context;
   if (!ctx?.registerAsset) return;
   for (const key in manifest) {
@@ -204,10 +212,21 @@ function applyAssetTracking(context, tracking, manifest) {
   });
   context.registerModule = tracking.registerModule;
   context.getBoundaryModules = tracking.getBoundaryModules;
-  if (manifest) context.resolveAssets = moduleUrl => resolveAssets(moduleUrl, manifest);
+  if (typeof manifest === "function") {
+    context.resolveAssets = manifest;
+  } else if (manifest && typeof manifest.resolve === "function") {
+    context.resolveAssets = key => manifest.resolve(key);
+    if (typeof manifest.resolveSync === "function") {
+      context.resolveAssetsSync = key => manifest.resolveSync(key);
+    }
+  } else if (manifest) {
+    const resolve = moduleUrl => resolveAssets(moduleUrl, manifest);
+    context.resolveAssets = resolve;
+    context.resolveAssetsSync = resolve;
+  }
 }
 const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
-const REPLACE_SCRIPT = `function $df(e,n,o,t){if(!(n=document.getElementById(e))||!(o=document.getElementById("pl-"+e)))return 0;for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)t=o.nextSibling,o.remove(),o=t;_$HY.done?o.remove():o.replaceWith(n.content),n.remove(),_$HY.fe(e);return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return 0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1;return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}`;
+const REPLACE_SCRIPT = `function $df(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById("pl-"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!=="pl-"+e);)t=o.nextSibling,o.remove(),o=t;_$HY.done?o.remove():o.replaceWith(n.content),n.remove(),_$HY.fe(e),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}`;
 function renderToString(code, options = {}) {
   const {
     renderId = "",
@@ -216,7 +235,7 @@ function renderToString(code, options = {}) {
     manifest
   } = options;
   let scripts = "";
-  const serializer = createSerializer({
+  const serializer = createHydrationSerializer({
     scopeId: renderId,
     plugins: options.plugins,
     onData(script) {
@@ -310,7 +329,7 @@ function renderToStream(code, options = {}) {
     completed = true;
     if (firstFlushed) dispose();
   };
-  const serializer = createSerializer({
+  const serializer = createHydrationSerializer({
     scopeId: options.renderId,
     plugins: options.plugins,
     onData: pushTask,
@@ -1304,7 +1323,9 @@ function Dynamic(props) {
   return createComponent(Comp, omit(props, "component"));
 }
 function Portal(props) {
-  throw new Error("Portal is not supported on the server");
+  const o = getOwner();
+  if (o?.id != null) getNextChildId(o);
+  return undefined;
 }
 
 export { Assets, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HydrationScript, MathMLElements, Namespaces, Portal, RawTextElements, RequestContext, SVGElements, VoidElements, notSup as acquireAsset, notSup as addEvent, applyRef, notSup as assign, notSup as className, notSup as delegateEvents, dynamic, notSup as dynamicProperty, effect, escape, generateHydrationScript, getAssets, notSup as getDelegatedRoot, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, notSup as hydrate, notSup as insert, isDev, isServer, memo, notSup as ref, notSup as registerDelegatedContainer, notSup as registerDelegatedRoot, notSup as render, renderToStream, renderToString, renderToStringAsync, notSup as runHydrationEvents, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, notSup as style, notSup as template, notSup as unregisterDelegatedContainer, notSup as unregisterDelegatedRoot, useAssets };

package/dist/web.cjs

@@ -902,8 +902,7 @@ function insertExpression(parent, value, current, marker) {
     if (tc === "string" || tc === "number") {
       parent.firstChild.data = value;
     } else {
-      const owned = ownedChildCount(current);
-      if (owned === -1 || owned === parent.childNodes.length) parent.textContent = value;else {
+      if (ownsAllChildren(parent, current)) parent.textContent = value;else {
         removeOwnedChildren(parent, current);
         parent.insertBefore(document.createTextNode(value), parent.firstChild);
       }
@@ -970,11 +969,15 @@ function appendNodes(parent, array, marker = null) {
     if (marker) n[$$SLOT] = marker;
   }
 }
-function ownedChildCount(current) {
-  if (Array.isArray(current)) return current.length;
-  if (current == null) return -1;
-  if (current === "") return 0;
-  return 1;
+function ownsAllChildren(parent, current) {
+  if (current == null) return true;
+  if (Array.isArray(current)) {
+    return current.length ? parent.firstChild === current[0] && parent.lastChild === current[current.length - 1] : parent.firstChild === null;
+  }
+  if (current === "") return parent.firstChild === null;
+  if (current.nodeType) return parent.firstChild === current && parent.lastChild === current;
+  const first = parent.firstChild;
+  return first !== null && first.nodeType === 3 && parent.lastChild === first;
 }
 function removeOwnedChildren(parent, current) {
   if (Array.isArray(current)) {
@@ -991,8 +994,7 @@ function removeOwnedChildren(parent, current) {
 }
 function cleanChildren(parent, current, marker, replacement) {
   if (marker === undefined) {
-    const owned = ownedChildCount(current);
-    if (owned === -1 || owned === parent.childNodes.length) return parent.textContent = "";
+    if (ownsAllChildren(parent, current)) return parent.textContent = "";
     return removeOwnedChildren(parent, current);
   }
   if (current.length) {
@@ -1065,11 +1067,16 @@ const hydrate = (...args) => {
   return hydrate$1(...args);
 };
 function Portal(props) {
+  return solidJs.runWithOwner(solidJs.createOwner(), () => portalImpl(props));
+}
+function portalImpl(props) {
   const treeMarker = document.createTextNode(""),
     startMarker = document.createTextNode(""),
     endMarker = document.createTextNode(""),
     mount = () => props.mount || document.body,
-    content = solidJs.createMemo(() => [startMarker, props.children]);
+    content = solidJs.createMemo(() => [startMarker, props.children], {
+      ssrSource: "client"
+    });
   solidJs.createRenderEffect(
   () => [mount(), content(), solidJs.getOwner()], ([, c, owner]) => {
     const m = solidJs.untrack(mount);
@@ -1090,8 +1097,10 @@ function Portal(props) {
         c = n;
       }
     };
-  }, {
-    schedule: true
+  },
+  {
+    schedule: true,
+    ssrSource: "client"
   });
   solidJs.createEffect(mount, () => {
     const m = solidJs.untrack(mount);
@@ -1099,6 +1108,11 @@ function Portal(props) {
     if (!ownerRoot || ownerRoot.contains(m)) return;
     registerDelegatedContainer(m, ownerRoot);
     return () => unregisterDelegatedContainer(m, ownerRoot);
+  }, {
+    ssrSource: "client"
+  });
+  if (solidJs.sharedConfig.hydrating) return solidJs.createMemo(() => treeMarker, {
+    ssrSource: "client"
   });
   return treeMarker;
 }

package/dist/web.js

@@ -1,4 +1,4 @@
-import { createRenderEffect, createMemo, sharedConfig, untrack, runWithOwner, flatten, createRoot, merge, createComponent, omit, getOwner, createEffect, enableHydration, flush } from 'solid-js';
+import { createRenderEffect, createMemo, sharedConfig, untrack, runWithOwner, flatten, createRoot, merge, createComponent, omit, createOwner, enableHydration, flush, getOwner, createEffect } from 'solid-js';
 export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, untrack } from 'solid-js';
 
 const DOMWithState = {
@@ -901,8 +901,7 @@ function insertExpression(parent, value, current, marker) {
     if (tc === "string" || tc === "number") {
       parent.firstChild.data = value;
     } else {
-      const owned = ownedChildCount(current);
-      if (owned === -1 || owned === parent.childNodes.length) parent.textContent = value;else {
+      if (ownsAllChildren(parent, current)) parent.textContent = value;else {
         removeOwnedChildren(parent, current);
         parent.insertBefore(document.createTextNode(value), parent.firstChild);
       }
@@ -969,11 +968,15 @@ function appendNodes(parent, array, marker = null) {
     if (marker) n[$$SLOT] = marker;
   }
 }
-function ownedChildCount(current) {
-  if (Array.isArray(current)) return current.length;
-  if (current == null) return -1;
-  if (current === "") return 0;
-  return 1;
+function ownsAllChildren(parent, current) {
+  if (current == null) return true;
+  if (Array.isArray(current)) {
+    return current.length ? parent.firstChild === current[0] && parent.lastChild === current[current.length - 1] : parent.firstChild === null;
+  }
+  if (current === "") return parent.firstChild === null;
+  if (current.nodeType) return parent.firstChild === current && parent.lastChild === current;
+  const first = parent.firstChild;
+  return first !== null && first.nodeType === 3 && parent.lastChild === first;
 }
 function removeOwnedChildren(parent, current) {
   if (Array.isArray(current)) {
@@ -990,8 +993,7 @@ function removeOwnedChildren(parent, current) {
 }
 function cleanChildren(parent, current, marker, replacement) {
   if (marker === undefined) {
-    const owned = ownedChildCount(current);
-    if (owned === -1 || owned === parent.childNodes.length) return parent.textContent = "";
+    if (ownsAllChildren(parent, current)) return parent.textContent = "";
     return removeOwnedChildren(parent, current);
   }
   if (current.length) {
@@ -1064,11 +1066,16 @@ const hydrate = (...args) => {
   return hydrate$1(...args);
 };
 function Portal(props) {
+  return runWithOwner(createOwner(), () => portalImpl(props));
+}
+function portalImpl(props) {
   const treeMarker = document.createTextNode(""),
     startMarker = document.createTextNode(""),
     endMarker = document.createTextNode(""),
     mount = () => props.mount || document.body,
-    content = createMemo(() => [startMarker, props.children]);
+    content = createMemo(() => [startMarker, props.children], {
+      ssrSource: "client"
+    });
   createRenderEffect(
   () => [mount(), content(), getOwner()], ([, c, owner]) => {
     const m = untrack(mount);
@@ -1089,8 +1096,10 @@ function Portal(props) {
         c = n;
       }
     };
-  }, {
-    schedule: true
+  },
+  {
+    schedule: true,
+    ssrSource: "client"
   });
   createEffect(mount, () => {
     const m = untrack(mount);
@@ -1098,6 +1107,11 @@ function Portal(props) {
     if (!ownerRoot || ownerRoot.contains(m)) return;
     registerDelegatedContainer(m, ownerRoot);
     return () => unregisterDelegatedContainer(m, ownerRoot);
+  }, {
+    ssrSource: "client"
+  });
+  if (sharedConfig.hydrating) return createMemo(() => treeMarker, {
+    ssrSource: "client"
   });
   return treeMarker;
 }