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

package/dist/web.cjs

@@ -48,9 +48,7 @@ const Namespaces = {
 };
 const VoidElements = /*#__PURE__*/new Set(["area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source", "track", "wbr"]);
 const RawTextElements = /*#__PURE__*/new Set(["style", "script", "noscript", "template", "textarea", "title"]);
-const DOMElements = /*#__PURE__*/new Set(["html", "base", "head", "link", "meta", "style", "title", "body", "address", "article", "aside", "footer", "header", "main", "nav", "section", "body", "blockquote", "dd", "div", "dl", "dt", "figcaption", "figure", "hr", "li", "ol", "p", "pre", "ul", "a", "abbr", "b", "bdi", "bdo", "br", "cite", "code", "data", "dfn", "em", "i", "kbd", "mark", "q", "rp", "rt", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "u", "var", "wbr", "area", "audio", "img", "map", "track", "video", "embed", "iframe", "object", "param", "picture", "portal", "source", "svg", "math", "canvas", "noscript", "script", "del", "ins", "caption", "col", "colgroup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "button", "datalist", "fieldset", "form", "input", "label", "legend", "meter", "optgroup", "option", "output", "progress", "select", "textarea", "details", "dialog", "menu", "summary", "details", "slot", "template", "acronym", "applet", "basefont", "bgsound", "big", "blink", "center", "content", "dir", "font", "frame", "frameset", "hgroup", "image", "keygen", "marquee", "menuitem", "nobr", "noembed", "noframes", "plaintext", "rb", "rtc", "shadow", "spacer", "strike", "tt", "xmp", "a", "abbr", "acronym", "address", "applet", "area", "article", "aside", "audio", "b", "base", "basefont", "bdi", "bdo", "bgsound", "big", "blink", "blockquote", "body", "br", "button", "canvas", "caption", "center", "cite", "code", "col", "colgroup", "content", "data", "datalist", "dd", "del", "details", "dfn", "dialog", "dir", "div", "dl", "dt", "em", "embed", "fieldset", "figcaption", "figure", "font", "footer", "form", "frame", "frameset", "head", "header", "hgroup", "hr", "html", "i", "iframe", "image", "img", "input", "ins", "kbd", "keygen", "label", "legend", "li", "link", "main", "map", "mark", "marquee", "menu", "menuitem", "meta", "meter", "nav", "nobr", "noembed", "noframes", "noscript", "object", "ol", "optgroup", "option", "output", "p", "param", "picture", "plaintext", "portal", "pre", "progress", "q", "rb", "rp", "rt", "rtc", "ruby", "s", "samp", "script", "section", "select", "shadow", "slot", "small", "source", "spacer", "span", "strike", "strong", "style", "sub", "summary", "sup", "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "tt", "u", "ul", "var", "video", "wbr", "xmp", "input", "h1", "h2", "h3", "h4", "h5", "h6",
-"webview",
-"isindex", "listing", "multicol", "nextid", "noindex", "search"]);
+const DOMElements = /*#__PURE__*/new Set(/*#__PURE__*/"a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,math,menu,menuitem,meta,meter,multicol,nav,nextid,nobr,noembed,noframes,noindex,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,portal,pre,progress,q,rb,rp,rt,rtc,ruby,s,samp,script,search,section,select,shadow,slot,small,source,spacer,span,strike,strong,style,sub,summary,sup,svg,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,webview,xmp".split(","));
 
 const transparentOptions = {
   transparent: true,
@@ -410,6 +408,44 @@ function scope(fn) {
 const SCOPE_OPTIONS = {
   scope: true
 };
+let hydrationRt = null;
+function installHydrationRuntime() {
+  hydrationRt = {
+    claimInitial(parent, multi, initial) {
+      if (isHydrating(parent)) {
+        if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
+        if (Array.isArray(initial)) stripTextSeparators(initial);
+      }
+      return initial;
+    },
+    reclaimRegion(current, parent, marker) {
+      if (!solidJs.sharedConfig.hydrating || !current || !parent.isConnected) return current;
+      const first = Array.isArray(current) ? current[0] : current;
+      if (!first || !first.nodeType || first.isConnected) return current;
+      let nodes;
+      if (marker) {
+        nodes = [];
+        let node = marker.previousSibling,
+          depth = 0;
+        while (node) {
+          if (node.nodeType === 8) {
+            const v = node.nodeValue;
+            if (v === "/") depth++;else if (v === "$") {
+              if (depth === 0) break;
+              depth--;
+            }
+          }
+          nodes.unshift(node);
+          node = node.previousSibling;
+        }
+      } else nodes = [...parent.childNodes];
+      return stripTextSeparators(nodes);
+    },
+    dedupEvent(e) {
+      return !!(solidJs.sharedConfig.registry && solidJs.sharedConfig.events && solidJs.sharedConfig.events.find(([el, ev]) => ev === e));
+    }
+  };
+}
 function stripTextSeparators(nodes) {
   let j = 0;
   for (let i = 0; i < nodes.length; i++) {
@@ -422,10 +458,7 @@ function insert(parent, accessor, marker, initial, options) {
   const multi = marker !== undefined;
   const host = options && options.host;
   if (multi && !initial) initial = [];
-  if (isHydrating(parent)) {
-    if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
-    if (Array.isArray(initial)) stripTextSeparators(initial);
-  }
+  if (hydrationRt !== null) initial = hydrationRt.claimInitial(parent, multi, initial);
   if (typeof accessor !== "function") {
     accessor = normalize(accessor, initial, multi, true);
     if (typeof accessor !== "function") {
@@ -440,34 +473,11 @@ function insert(parent, accessor, marker, initial, options) {
     initial = [placeholder];
   }
   let current = initial;
-  function reclaimSwappedRegion() {
-    if (!solidJs.sharedConfig.hydrating || !current || !parent.isConnected) return;
-    const first = Array.isArray(current) ? current[0] : current;
-    if (!first || !first.nodeType || first.isConnected) return;
-    let nodes;
-    if (marker) {
-      nodes = [];
-      let node = marker.previousSibling,
-        depth = 0;
-      while (node) {
-        if (node.nodeType === 8) {
-          const v = node.nodeValue;
-          if (v === "/") depth++;else if (v === "$") {
-            if (depth === 0) break;
-            depth--;
-          }
-        }
-        nodes.unshift(node);
-        node = node.previousSibling;
-      }
-    } else nodes = [...parent.childNodes];
-    current = stripTextSeparators(nodes);
-  }
   effect(prev => {
-    reclaimSwappedRegion();
+    if (hydrationRt !== null) current = hydrationRt.reclaimRegion(current, parent, marker);
     const value = normalize(accessor(), current, multi, true);
     if (typeof value !== "function") return value;
-    effect(() => (reclaimSwappedRegion(), normalize(value, current, multi)), inner => {
+    effect(() => (hydrationRt !== null && (current = hydrationRt.reclaimRegion(current, parent, marker)), normalize(value, current, multi)), inner => {
       insertExpression(parent, inner, current, marker);
       current = inner;
       host && tagHost(current, host);
@@ -619,6 +629,7 @@ function loadModuleAssets(mapping) {
   return pending.length ? Promise.all(pending).then(() => {}) : undefined;
 }
 function hydrate$1(code, element, options = {}) {
+  installHydrationRuntime();
   if (globalThis._$HY.done) return render$1(code, element, [...element.childNodes], options);
   options.renderId ||= "";
   if (!globalThis._$HY.modules) globalThis._$HY.modules = {};
@@ -826,9 +837,7 @@ function assignProp(node, prop, value, prev, skipRef, nodeName) {
   return value;
 }
 function eventHandler(e, container, state) {
-  if (solidJs.sharedConfig.registry && solidJs.sharedConfig.events) {
-    if (solidJs.sharedConfig.events.find(([el, ev]) => ev === e)) return;
-  }
+  if (hydrationRt !== null && hydrationRt.dedupEvent(e)) return;
   const prev = e[$$EVENT_OWNER];
   let resumeNode;
   if (prev) {
@@ -893,7 +902,7 @@ function eventHandler(e, container, state) {
   retarget(oriTarget);
 }
 function insertExpression(parent, value, current, marker) {
-  if (isHydrating(parent)) return;
+  if (hydrationRt !== null && isHydrating(parent)) return;
   if (value === current) return;
   const t = typeof value,
     multi = marker !== undefined;
@@ -902,8 +911,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 +978,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 +1003,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) {
@@ -1044,6 +1055,67 @@ function ssrHydrationKey() {}
 function resolveSSRNode(node) {}
 function escape(html) {}
 
+const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
+class ResponseEnvelope {
+  constructor(response, value) {
+    this.response = response;
+    this.value = value;
+  }
+}
+ResponseEnvelope.prototype[ENVELOPE] = true;
+function isResponseEnvelope(value) {
+  return !!(value && typeof value === "object" && value[ENVELOPE]);
+}
+function initWithRevalidate(init) {
+  const {
+    revalidate,
+    ...responseInit
+  } = init;
+  const headers = new Headers(responseInit.headers);
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
+  return {
+    responseInit,
+    headers
+  };
+}
+function redirect(url, init = 302) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(typeof init === "number" ? {
+    status: init
+  } : init);
+  if (responseInit.status === undefined) {
+    responseInit.status = 302;
+  }
+  headers.set("Location", url);
+  return new Response(null, {
+    ...responseInit,
+    headers
+  });
+}
+function reload(init = {}) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(init);
+  return new Response(null, {
+    ...responseInit,
+    headers
+  });
+}
+function respond(value, init = {}) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(init);
+  headers.set("Content-Type", "application/json");
+  return new ResponseEnvelope(new Response(JSON.stringify(value), {
+    ...responseInit,
+    headers
+  }), value);
+}
+
 const mergeProps = solidJs.merge;
 const isServer = false;
 const isDev = false;
@@ -1065,11 +1137,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 +1167,10 @@ function Portal(props) {
         c = n;
       }
     };
-  }, {
-    schedule: true
+  },
+  {
+    schedule: true,
+    ssrSource: "client"
   });
   solidJs.createEffect(mount, () => {
     const m = solidJs.untrack(mount);
@@ -1099,6 +1178,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;
 }
@@ -1194,6 +1278,7 @@ exports.Namespaces = Namespaces;
 exports.Portal = Portal;
 exports.RawTextElements = RawTextElements;
 exports.RequestContext = RequestContext;
+exports.ResponseEnvelope = ResponseEnvelope;
 exports.SVGElements = SVGElements;
 exports.VoidElements = VoidElements;
 exports.acquireAsset = acquireAsset;
@@ -1218,18 +1303,23 @@ exports.getNextSibling = getNextSibling;
 exports.getRequestEvent = voidFn;
 exports.hydrate = hydrate;
 exports.insert = insert;
+exports.installHydrationRuntime = installHydrationRuntime;
 exports.isDev = isDev;
+exports.isResponseEnvelope = isResponseEnvelope;
 exports.isServer = isServer;
 exports.memo = memo;
 exports.mergeProps = mergeProps;
+exports.redirect = redirect;
 exports.ref = ref;
 exports.registerDelegatedContainer = registerDelegatedContainer;
 exports.registerDelegatedRoot = registerDelegatedRoot;
+exports.reload = reload;
 exports.render = render;
 exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;
 exports.renderToStringAsync = renderToStringAsync;
 exports.resolveSSRNode = resolveSSRNode;
+exports.respond = respond;
 exports.runHydrationEvents = runHydrationEvents;
 exports.scope = scope;
 exports.setAttribute = setAttribute;

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 = {
@@ -47,9 +47,7 @@ const Namespaces = {
 };
 const VoidElements = /*#__PURE__*/new Set(["area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source", "track", "wbr"]);
 const RawTextElements = /*#__PURE__*/new Set(["style", "script", "noscript", "template", "textarea", "title"]);
-const DOMElements = /*#__PURE__*/new Set(["html", "base", "head", "link", "meta", "style", "title", "body", "address", "article", "aside", "footer", "header", "main", "nav", "section", "body", "blockquote", "dd", "div", "dl", "dt", "figcaption", "figure", "hr", "li", "ol", "p", "pre", "ul", "a", "abbr", "b", "bdi", "bdo", "br", "cite", "code", "data", "dfn", "em", "i", "kbd", "mark", "q", "rp", "rt", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "u", "var", "wbr", "area", "audio", "img", "map", "track", "video", "embed", "iframe", "object", "param", "picture", "portal", "source", "svg", "math", "canvas", "noscript", "script", "del", "ins", "caption", "col", "colgroup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "button", "datalist", "fieldset", "form", "input", "label", "legend", "meter", "optgroup", "option", "output", "progress", "select", "textarea", "details", "dialog", "menu", "summary", "details", "slot", "template", "acronym", "applet", "basefont", "bgsound", "big", "blink", "center", "content", "dir", "font", "frame", "frameset", "hgroup", "image", "keygen", "marquee", "menuitem", "nobr", "noembed", "noframes", "plaintext", "rb", "rtc", "shadow", "spacer", "strike", "tt", "xmp", "a", "abbr", "acronym", "address", "applet", "area", "article", "aside", "audio", "b", "base", "basefont", "bdi", "bdo", "bgsound", "big", "blink", "blockquote", "body", "br", "button", "canvas", "caption", "center", "cite", "code", "col", "colgroup", "content", "data", "datalist", "dd", "del", "details", "dfn", "dialog", "dir", "div", "dl", "dt", "em", "embed", "fieldset", "figcaption", "figure", "font", "footer", "form", "frame", "frameset", "head", "header", "hgroup", "hr", "html", "i", "iframe", "image", "img", "input", "ins", "kbd", "keygen", "label", "legend", "li", "link", "main", "map", "mark", "marquee", "menu", "menuitem", "meta", "meter", "nav", "nobr", "noembed", "noframes", "noscript", "object", "ol", "optgroup", "option", "output", "p", "param", "picture", "plaintext", "portal", "pre", "progress", "q", "rb", "rp", "rt", "rtc", "ruby", "s", "samp", "script", "section", "select", "shadow", "slot", "small", "source", "spacer", "span", "strike", "strong", "style", "sub", "summary", "sup", "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "tt", "u", "ul", "var", "video", "wbr", "xmp", "input", "h1", "h2", "h3", "h4", "h5", "h6",
-"webview",
-"isindex", "listing", "multicol", "nextid", "noindex", "search"]);
+const DOMElements = /*#__PURE__*/new Set(/*#__PURE__*/"a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,math,menu,menuitem,meta,meter,multicol,nav,nextid,nobr,noembed,noframes,noindex,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,portal,pre,progress,q,rb,rp,rt,rtc,ruby,s,samp,script,search,section,select,shadow,slot,small,source,spacer,span,strike,strong,style,sub,summary,sup,svg,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,webview,xmp".split(","));
 
 const transparentOptions = {
   transparent: true,
@@ -409,6 +407,44 @@ function scope(fn) {
 const SCOPE_OPTIONS = {
   scope: true
 };
+let hydrationRt = null;
+function installHydrationRuntime() {
+  hydrationRt = {
+    claimInitial(parent, multi, initial) {
+      if (isHydrating(parent)) {
+        if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
+        if (Array.isArray(initial)) stripTextSeparators(initial);
+      }
+      return initial;
+    },
+    reclaimRegion(current, parent, marker) {
+      if (!sharedConfig.hydrating || !current || !parent.isConnected) return current;
+      const first = Array.isArray(current) ? current[0] : current;
+      if (!first || !first.nodeType || first.isConnected) return current;
+      let nodes;
+      if (marker) {
+        nodes = [];
+        let node = marker.previousSibling,
+          depth = 0;
+        while (node) {
+          if (node.nodeType === 8) {
+            const v = node.nodeValue;
+            if (v === "/") depth++;else if (v === "$") {
+              if (depth === 0) break;
+              depth--;
+            }
+          }
+          nodes.unshift(node);
+          node = node.previousSibling;
+        }
+      } else nodes = [...parent.childNodes];
+      return stripTextSeparators(nodes);
+    },
+    dedupEvent(e) {
+      return !!(sharedConfig.registry && sharedConfig.events && sharedConfig.events.find(([el, ev]) => ev === e));
+    }
+  };
+}
 function stripTextSeparators(nodes) {
   let j = 0;
   for (let i = 0; i < nodes.length; i++) {
@@ -421,10 +457,7 @@ function insert(parent, accessor, marker, initial, options) {
   const multi = marker !== undefined;
   const host = options && options.host;
   if (multi && !initial) initial = [];
-  if (isHydrating(parent)) {
-    if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
-    if (Array.isArray(initial)) stripTextSeparators(initial);
-  }
+  if (hydrationRt !== null) initial = hydrationRt.claimInitial(parent, multi, initial);
   if (typeof accessor !== "function") {
     accessor = normalize(accessor, initial, multi, true);
     if (typeof accessor !== "function") {
@@ -439,34 +472,11 @@ function insert(parent, accessor, marker, initial, options) {
     initial = [placeholder];
   }
   let current = initial;
-  function reclaimSwappedRegion() {
-    if (!sharedConfig.hydrating || !current || !parent.isConnected) return;
-    const first = Array.isArray(current) ? current[0] : current;
-    if (!first || !first.nodeType || first.isConnected) return;
-    let nodes;
-    if (marker) {
-      nodes = [];
-      let node = marker.previousSibling,
-        depth = 0;
-      while (node) {
-        if (node.nodeType === 8) {
-          const v = node.nodeValue;
-          if (v === "/") depth++;else if (v === "$") {
-            if (depth === 0) break;
-            depth--;
-          }
-        }
-        nodes.unshift(node);
-        node = node.previousSibling;
-      }
-    } else nodes = [...parent.childNodes];
-    current = stripTextSeparators(nodes);
-  }
   effect(prev => {
-    reclaimSwappedRegion();
+    if (hydrationRt !== null) current = hydrationRt.reclaimRegion(current, parent, marker);
     const value = normalize(accessor(), current, multi, true);
     if (typeof value !== "function") return value;
-    effect(() => (reclaimSwappedRegion(), normalize(value, current, multi)), inner => {
+    effect(() => (hydrationRt !== null && (current = hydrationRt.reclaimRegion(current, parent, marker)), normalize(value, current, multi)), inner => {
       insertExpression(parent, inner, current, marker);
       current = inner;
       host && tagHost(current, host);
@@ -618,6 +628,7 @@ function loadModuleAssets(mapping) {
   return pending.length ? Promise.all(pending).then(() => {}) : undefined;
 }
 function hydrate$1(code, element, options = {}) {
+  installHydrationRuntime();
   if (globalThis._$HY.done) return render$1(code, element, [...element.childNodes], options);
   options.renderId ||= "";
   if (!globalThis._$HY.modules) globalThis._$HY.modules = {};
@@ -825,9 +836,7 @@ function assignProp(node, prop, value, prev, skipRef, nodeName) {
   return value;
 }
 function eventHandler(e, container, state) {
-  if (sharedConfig.registry && sharedConfig.events) {
-    if (sharedConfig.events.find(([el, ev]) => ev === e)) return;
-  }
+  if (hydrationRt !== null && hydrationRt.dedupEvent(e)) return;
   const prev = e[$$EVENT_OWNER];
   let resumeNode;
   if (prev) {
@@ -892,7 +901,7 @@ function eventHandler(e, container, state) {
   retarget(oriTarget);
 }
 function insertExpression(parent, value, current, marker) {
-  if (isHydrating(parent)) return;
+  if (hydrationRt !== null && isHydrating(parent)) return;
   if (value === current) return;
   const t = typeof value,
     multi = marker !== undefined;
@@ -901,8 +910,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 +977,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 +1002,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) {
@@ -1043,6 +1054,67 @@ function ssrHydrationKey() {}
 function resolveSSRNode(node) {}
 function escape(html) {}
 
+const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
+class ResponseEnvelope {
+  constructor(response, value) {
+    this.response = response;
+    this.value = value;
+  }
+}
+ResponseEnvelope.prototype[ENVELOPE] = true;
+function isResponseEnvelope(value) {
+  return !!(value && typeof value === "object" && value[ENVELOPE]);
+}
+function initWithRevalidate(init) {
+  const {
+    revalidate,
+    ...responseInit
+  } = init;
+  const headers = new Headers(responseInit.headers);
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
+  return {
+    responseInit,
+    headers
+  };
+}
+function redirect(url, init = 302) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(typeof init === "number" ? {
+    status: init
+  } : init);
+  if (responseInit.status === undefined) {
+    responseInit.status = 302;
+  }
+  headers.set("Location", url);
+  return new Response(null, {
+    ...responseInit,
+    headers
+  });
+}
+function reload(init = {}) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(init);
+  return new Response(null, {
+    ...responseInit,
+    headers
+  });
+}
+function respond(value, init = {}) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(init);
+  headers.set("Content-Type", "application/json");
+  return new ResponseEnvelope(new Response(JSON.stringify(value), {
+    ...responseInit,
+    headers
+  }), value);
+}
+
 const mergeProps = merge;
 const isServer = false;
 const isDev = false;
@@ -1064,11 +1136,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 +1166,10 @@ function Portal(props) {
         c = n;
       }
     };
-  }, {
-    schedule: true
+  },
+  {
+    schedule: true,
+    ssrSource: "client"
   });
   createEffect(mount, () => {
     const m = untrack(mount);
@@ -1098,6 +1177,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;
 }
@@ -1129,4 +1213,4 @@ function createElement(tagName, is = undefined) {
   });
 }
 
-export { voidFn as Assets, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, voidFn as HydrationScript, MathMLElements, Namespaces, Portal, RawTextElements, RequestContext, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, className, delegateEvents, dynamic, dynamicProperty, effect, escape, voidFn as generateHydrationScript, voidFn as getAssets, getDelegatedRoot, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, hydrate, insert, isDev, isServer, memo, mergeProps, ref, registerDelegatedContainer, registerDelegatedRoot, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, scope, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, voidFn as useAssets };
+export { voidFn as Assets, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, voidFn as HydrationScript, MathMLElements, Namespaces, Portal, RawTextElements, RequestContext, ResponseEnvelope, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, className, delegateEvents, dynamic, dynamicProperty, effect, escape, voidFn as generateHydrationScript, voidFn as getAssets, getDelegatedRoot, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, hydrate, insert, installHydrationRuntime, isDev, isResponseEnvelope, isServer, memo, mergeProps, redirect, ref, registerDelegatedContainer, registerDelegatedRoot, reload, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, respond, runHydrationEvents, scope, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, voidFn as useAssets };