solid-js 1.8.19 → 1.8.21

package/web/dist/server.cjs

@@ -482,7 +482,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let a=o.composedPath&&o.composedPath()[0]||o.target,s=t(a);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!solidJs.sharedConfig.context.noHydrate) return props.children;

package/web/dist/server.js

@@ -1,30 +1,86 @@
-import { sharedConfig, createRoot, splitProps } from 'solid-js';
-export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, mergeProps } from 'solid-js';
-import { Feature, Serializer, getCrossReferenceHeader } from 'seroval';
-import { CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
+import { sharedConfig, createRoot, splitProps } from "solid-js";
+export {
+  ErrorBoundary,
+  For,
+  Index,
+  Match,
+  Show,
+  Suspense,
+  SuspenseList,
+  Switch,
+  createComponent,
+  mergeProps
+} from "solid-js";
+import { Feature, Serializer, getCrossReferenceHeader } from "seroval";
+import {
+  CustomEventPlugin,
+  DOMExceptionPlugin,
+  EventPlugin,
+  FormDataPlugin,
+  HeadersPlugin,
+  ReadableStreamPlugin,
+  RequestPlugin,
+  ResponsePlugin,
+  URLSearchParamsPlugin,
+  URLPlugin
+} from "seroval-plugins/web";
 
-const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "inert", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
-const BooleanAttributes = /*#__PURE__*/new Set(booleans);
-const ChildProperties = /*#__PURE__*/new Set(["innerHTML", "textContent", "innerText", "children"]);
-const Aliases = /*#__PURE__*/Object.assign(Object.create(null), {
+const booleans = [
+  "allowfullscreen",
+  "async",
+  "autofocus",
+  "autoplay",
+  "checked",
+  "controls",
+  "default",
+  "disabled",
+  "formnovalidate",
+  "hidden",
+  "indeterminate",
+  "inert",
+  "ismap",
+  "loop",
+  "multiple",
+  "muted",
+  "nomodule",
+  "novalidate",
+  "open",
+  "playsinline",
+  "readonly",
+  "required",
+  "reversed",
+  "seamless",
+  "selected"
+];
+const BooleanAttributes = /*#__PURE__*/ new Set(booleans);
+const ChildProperties = /*#__PURE__*/ new Set([
+  "innerHTML",
+  "textContent",
+  "innerText",
+  "children"
+]);
+const Aliases = /*#__PURE__*/ Object.assign(Object.create(null), {
   className: "class",
   htmlFor: "for"
 });
 
-const ES2017FLAG = Feature.AggregateError
-| Feature.BigIntTypedArray;
-const GLOBAL_IDENTIFIER = '_$HY.r';
-function createSerializer({
-  onData,
-  onDone,
-  scopeId,
-  onError
-}) {
+const ES2017FLAG = Feature.AggregateError | Feature.BigIntTypedArray;
+const GLOBAL_IDENTIFIER = "_$HY.r";
+function createSerializer({ onData, onDone, scopeId, onError }) {
   return new Serializer({
     scopeId,
     plugins: [
-    CustomEventPlugin, DOMExceptionPlugin, EventPlugin,
-    FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin],
+      CustomEventPlugin,
+      DOMExceptionPlugin,
+      EventPlugin,
+      FormDataPlugin,
+      HeadersPlugin,
+      ReadableStreamPlugin,
+      RequestPlugin,
+      ResponsePlugin,
+      URLSearchParamsPlugin,
+      URLPlugin
+    ],
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
@@ -33,15 +89,14 @@ function createSerializer({
   });
 }
 function getLocalHeaderScript(id) {
-  return getCrossReferenceHeader(id) + ';';
+  return getCrossReferenceHeader(id) + ";";
 }
 
-const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
+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)){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)}`;
 function renderToString(code, options = {}) {
-  const {
-    renderId
-  } = options;
+  const { renderId } = options;
   let scripts = "";
   const serializer = createSerializer({
     scopeId: renderId,
@@ -79,9 +134,7 @@ function renderToString(code, options = {}) {
   return html;
 }
 function renderToStringAsync(code, options = {}) {
-  const {
-    timeoutMs = 30000
-  } = options;
+  const { timeoutMs = 30000 } = options;
   let timeoutHandle;
   const timeout = new Promise((_, reject) => {
     timeoutHandle = setTimeout(() => reject("renderToString timed out"), timeoutMs);
@@ -92,13 +145,7 @@ function renderToStringAsync(code, options = {}) {
   });
 }
 function renderToStream(code, options = {}) {
-  let {
-    nonce,
-    onCompleteShell,
-    onCompleteAll,
-    renderId,
-    noScripts
-  } = options;
+  let { nonce, onCompleteShell, onCompleteAll, renderId, noScripts } = options;
   let dispose;
   const blockingPromises = [];
   const pushTask = task => {
@@ -114,11 +161,12 @@ function renderToStream(code, options = {}) {
   const onDone = () => {
     writeTasks();
     doShell();
-    onCompleteAll && onCompleteAll({
-      write(v) {
-        !completed && buffer.write(v);
-      }
-    });
+    onCompleteAll &&
+      onCompleteAll({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
     writable && writable.end();
     completed = true;
     if (firstFlushed) dispose();
@@ -175,17 +223,23 @@ function renderToStream(code, options = {}) {
       const first = html.indexOf(placeholder);
       if (first === -1) return;
       const last = html.indexOf(`<!--!$/${id}-->`, first + placeholder.length);
-      html = html.replace(html.slice(first, last + placeholder.length + 1), resolveSSRNode(payloadFn()));
+      html = html.replace(
+        html.slice(first, last + placeholder.length + 1),
+        resolveSSRNode(payloadFn())
+      );
     },
     serialize(id, p, wait) {
       const serverOnly = sharedConfig.context.noHydrate;
       if (!firstFlushed && wait && typeof p === "object" && "then" in p) {
         blockingPromises.push(p);
-        !serverOnly && p.then(d => {
-          serializer.write(id, d);
-        }).catch(e => {
-          serializer.write(id, e);
-        });
+        !serverOnly &&
+          p
+            .then(d => {
+              serializer.write(id, d);
+            })
+            .catch(e => {
+              serializer.write(id, e);
+            });
       } else if (!serverOnly) serializer.write(id, p);
     },
     roots: 0,
@@ -195,11 +249,15 @@ function renderToStream(code, options = {}) {
     registerFragment(key) {
       if (!registry.has(key)) {
         let resolve, reject;
-        const p = new Promise((r, rej) => (resolve = r, reject = rej));
-        registry.set(key, err => queue(() => queue(() => {
-          err ? reject(err) : resolve(true);
-          queue(flushEnd);
-        })));
+        const p = new Promise((r, rej) => ((resolve = r), (reject = rej)));
+        registry.set(key, err =>
+          queue(() =>
+            queue(() => {
+              err ? reject(err) : resolve(true);
+              queue(flushEnd);
+            })
+          )
+        );
         serializer.write(key, p);
       }
       return (value, error) => {
@@ -212,7 +270,7 @@ function renderToStream(code, options = {}) {
           }
           if (!completed) {
             if (!firstFlushed) {
-              queue(() => html = replacePlaceholder(html, key, value !== undefined ? value : ""));
+              queue(() => (html = replacePlaceholder(html, key, value !== undefined ? value : "")));
               resolve(error);
             } else {
               buffer.write(`<template id="${key}">${value !== undefined ? value : " "}</template>`);
@@ -238,11 +296,12 @@ function renderToStream(code, options = {}) {
     if (tasks.length) html = injectScripts(html, tasks, nonce);
     buffer.write(html);
     tasks = "";
-    onCompleteShell && onCompleteShell({
-      write(v) {
-        !completed && buffer.write(v);
-      }
-    });
+    onCompleteShell &&
+      onCompleteShell({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
     shellCompleted = true;
   }
   return {
@@ -277,7 +336,7 @@ function renderToStream(code, options = {}) {
     pipeTo(w) {
       return allSettled(blockingPromises).then(() => {
         let resolve;
-        const p = new Promise(r => resolve = r);
+        const p = new Promise(r => (resolve = r));
         setTimeout(() => {
           doShell();
           const encoder = new TextEncoder();
@@ -307,13 +366,13 @@ function renderToStream(code, options = {}) {
   };
 }
 function HydrationScript(props) {
-  const {
-    nonce
-  } = sharedConfig.context;
-  return ssr(generateHydrationScript({
-    nonce,
-    ...props
-  }));
+  const { nonce } = sharedConfig.context;
+  return ssr(
+    generateHydrationScript({
+      nonce,
+      ...props
+    })
+  );
 }
 function ssr(t, ...nodes) {
   if (nodes.length) {
@@ -358,7 +417,8 @@ function ssrStyle(value) {
   return result;
 }
 function ssrElement(tag, props, children, needsId) {
-  if (props == null) props = {};else if (typeof props === "function") props = props();
+  if (props == null) props = {};
+  else if (typeof props === "function") props = props();
   const skipChildren = VOID_ELEMENTS.test(tag);
   const keys = Object.keys(props);
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
@@ -366,7 +426,8 @@ function ssrElement(tag, props, children, needsId) {
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
     if (ChildProperties.has(prop)) {
-      if (children === undefined && !skipChildren) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+      if (children === undefined && !skipChildren)
+        children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];
@@ -375,10 +436,14 @@ function ssrElement(tag, props, children, needsId) {
     } else if (prop === "class" || prop === "className" || prop === "classList") {
       if (classResolved) continue;
       let n;
-      result += `class="${escape(((n = props.class) ? n + " " : "") + ((n = props.className) ? n + " " : ""), true) + ssrClassList(props.classList)}"`;
+      result += `class="${
+        escape(((n = props.class) ? n + " " : "") + ((n = props.className) ? n + " " : ""), true) +
+        ssrClassList(props.classList)
+      }"`;
       classResolved = true;
     } else if (BooleanAttributes.has(prop)) {
-      if (value) result += prop;else continue;
+      if (value) result += prop;
+      else continue;
     } else if (value == undefined || prop === "ref" || prop.slice(0, 2) === "on") {
       continue;
     } else {
@@ -386,16 +451,17 @@ function ssrElement(tag, props, children, needsId) {
     }
     if (i !== keys.length - 1) result += " ";
   }
-  if (skipChildren) return {
-    t: result + "/>"
-  };
+  if (skipChildren)
+    return {
+      t: result + "/>"
+    };
   if (typeof children === "function") children = children();
   return {
     t: result + `>${resolveSSRNode(children, true)}</${tag}>`
   };
 }
 function ssrAttribute(key, value, isBoolean) {
-  return isBoolean ? value ? " " + key : "" : value != null ? ` ${key}="${value}"` : "";
+  return isBoolean ? (value ? " " + key : "") : value != null ? ` ${key}="${value}"` : "";
 }
 function ssrHydrationKey() {
   const hk = getHydrationKey();
@@ -439,12 +505,13 @@ function escape(s, attr) {
       left = iDelim + 1;
       iDelim = s.indexOf(delim, left);
     } while (iDelim >= 0);
-  } else while (iAmp >= 0) {
-    if (left < iAmp) out += s.substring(left, iAmp);
-    out += "&amp;";
-    left = iAmp + 1;
-    iAmp = s.indexOf("&", left);
-  }
+  } else
+    while (iAmp >= 0) {
+      if (left < iAmp) out += s.substring(left, iAmp);
+      out += "&amp;";
+      left = iAmp + 1;
+      iAmp = s.indexOf("&", left);
+    }
   return left < s.length ? out + s.substring(left) : out;
 }
 function resolveSSRNode(node, top) {
@@ -456,7 +523,7 @@ function resolveSSRNode(node, top) {
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
       if (!top && typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
-      mapped += resolveSSRNode(prev = node[i]);
+      mapped += resolveSSRNode((prev = node[i]));
     }
     return mapped;
   }
@@ -477,11 +544,12 @@ function getAssets() {
   for (let i = 0, len = assets.length; i < len; i++) out += assets[i]();
   return out;
 }
-function generateHydrationScript({
-  eventNames = ["click", "input"],
-  nonce
-} = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let a=o.composedPath&&o.composedPath()[0]||o.target,s=t(a);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
+function generateHydrationScript({ eventNames = ["click", "input"], nonce } = {}) {
+  return `<script${
+    nonce ? ` nonce="${nonce}"` : ""
+  }>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join(
+    '", "'
+  )}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!sharedConfig.context.noHydrate) return props.children;
@@ -540,16 +608,20 @@ function replacePlaceholder(html, key, value) {
 }
 const RequestContext = Symbol();
 function getRequestEvent() {
-  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || sharedConfig.context && sharedConfig.context.event || console.log("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : undefined;
+  return globalThis[RequestContext]
+    ? globalThis[RequestContext].getStore() ||
+        (sharedConfig.context && sharedConfig.context.event) ||
+        console.log(
+          "RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls."
+        )
+    : undefined;
 }
 function Assets(props) {
   useAssets(() => props.children);
 }
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = ({
-      write
-    }) => {
+    options.onCompleteShell = ({ write }) => {
       options.onReady({
         write,
         startWriting() {
@@ -563,9 +635,7 @@ function pipeToNodeWritable(code, writable, options = {}) {
 }
 function pipeToWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = ({
-      write
-    }) => {
+    options.onCompleteShell = ({ write }) => {
       options.onReady({
         write,
         startWriting() {
@@ -595,11 +665,19 @@ function ssrSpread(props, isSVG, skipChildren) {
     } else if (prop === "class" || prop === "className" || prop === "classList") {
       if (classResolved) continue;
       let n;
-      result += `class="${(n = props.class) ? n + " " : ""}${(n = props.className) ? n + " " : ""}${ssrClassList(props.classList)}"`;
+      result += `class="${(n = props.class) ? n + " " : ""}${
+        (n = props.className) ? n + " " : ""
+      }${ssrClassList(props.classList)}"`;
       classResolved = true;
     } else if (prop !== "value" && Properties.has(prop)) {
-      if (value) result += prop;else continue;
-    } else if (value == undefined || prop === "ref" || prop.slice(0, 2) === "on" || prop.slice(0, 5) === "prop:") {
+      if (value) result += prop;
+      else continue;
+    } else if (
+      value == undefined ||
+      prop === "ref" ||
+      prop.slice(0, 2) === "on" ||
+      prop.slice(0, 5) === "prop:"
+    ) {
       continue;
     } else {
       if (prop.slice(0, 5) === "attr:") prop = prop.slice(5);
@@ -623,7 +701,8 @@ function Dynamic(props) {
   const comp = p.component,
     t = typeof comp;
   if (comp) {
-    if (t === "function") return comp(others);else if (t === "string") {
+    if (t === "function") return comp(others);
+    else if (t === "string") {
       return ssrElement(comp, others, undefined, true);
     }
   }
@@ -632,4 +711,39 @@ function Portal(props) {
   return "";
 }
 
-export { Assets, Dynamic, Hydration, HydrationScript, NoHydration, Portal, RequestContext, addEventListener, delegateEvents, escape, generateHydrationScript, getAssets, getHydrationKey, getRequestEvent, hydrate, insert, isDev, isServer, pipeToNodeWritable, pipeToWritable, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, useAssets };
+export {
+  Assets,
+  Dynamic,
+  Hydration,
+  HydrationScript,
+  NoHydration,
+  Portal,
+  RequestContext,
+  addEventListener,
+  delegateEvents,
+  escape,
+  generateHydrationScript,
+  getAssets,
+  getHydrationKey,
+  getRequestEvent,
+  hydrate,
+  insert,
+  isDev,
+  isServer,
+  pipeToNodeWritable,
+  pipeToWritable,
+  render,
+  renderToStream,
+  renderToString,
+  renderToStringAsync,
+  resolveSSRNode,
+  spread,
+  ssr,
+  ssrAttribute,
+  ssrClassList,
+  ssrElement,
+  ssrHydrationKey,
+  ssrSpread,
+  ssrStyle,
+  useAssets
+};

package/web/dist/web.cjs

@@ -147,19 +147,19 @@ function clearDelegatedEvents(document = window.document) {
   }
 }
 function setProperty(node, name, value) {
-  if (!!solidJs.sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   node[name] = value;
 }
 function setAttribute(node, name, value) {
-  if (!!solidJs.sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   if (value == null) node.removeAttribute(name);else node.setAttribute(name, value);
 }
 function setAttributeNS(node, namespace, name, value) {
-  if (!!solidJs.sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   if (value == null) node.removeAttributeNS(namespace, name);else node.setAttributeNS(namespace, name, value);
 }
 function className(node, value) {
-  if (!!solidJs.sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   if (value == null) node.removeAttribute("class");else node.className = value;
 }
 function addEventListener(node, name, handler, delegate) {
@@ -258,6 +258,7 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}, skipRef = fals
   }
 }
 function hydrate$1(code, element, options = {}) {
+  if (globalThis._$HY.done) return render(code, element, [...element.childNodes], options);
   solidJs.sharedConfig.completed = globalThis._$HY.completed;
   solidJs.sharedConfig.events = globalThis._$HY.events;
   solidJs.sharedConfig.load = id => globalThis._$HY.r[id];
@@ -268,14 +269,18 @@ function hydrate$1(code, element, options = {}) {
     id: options.renderId || "",
     count: 0
   };
-  gatherHydratable(element, options.renderId);
-  const dispose = render(code, element, [...element.childNodes], options);
-  solidJs.sharedConfig.context = null;
-  return dispose;
+  try {
+    gatherHydratable(element, options.renderId);
+    return render(code, element, [...element.childNodes], options);
+  } finally {
+    solidJs.sharedConfig.context = null;
+  }
 }
 function getNextElement(template) {
-  let node, key;
-  if (!solidJs.sharedConfig.context || !(node = solidJs.sharedConfig.registry.get(key = getHydrationKey()))) {
+  let node,
+    key,
+    hydrating = isHydrating();
+  if (!hydrating || !(node = solidJs.sharedConfig.registry.get(key = getHydrationKey()))) {
     return template();
   }
   if (solidJs.sharedConfig.completed) solidJs.sharedConfig.completed.add(node);
@@ -290,7 +295,7 @@ function getNextMarker(start) {
   let end = start,
     count = 0,
     current = [];
-  if (solidJs.sharedConfig.context) {
+  if (isHydrating(start)) {
     while (end) {
       if (end.nodeType === 8) {
         const v = end.nodeValue;
@@ -316,13 +321,20 @@ function runHydrationEvents() {
       while (events.length) {
         const [el, e] = events[0];
         if (!completed.has(el)) return;
-        eventHandler(e);
         events.shift();
+        eventHandler(e);
+      }
+      if (solidJs.sharedConfig.done) {
+        solidJs.sharedConfig.events = _$HY.events = null;
+        solidJs.sharedConfig.completed = _$HY.completed = null;
       }
     });
     solidJs.sharedConfig.events.queued = true;
   }
 }
+function isHydrating(node) {
+  return !!solidJs.sharedConfig.context && !solidJs.sharedConfig.done && (!node || node.isConnected);
+}
 function toPropertyName(name) {
   return name.toLowerCase().replace(/-([a-z])/g, (_, w) => w.toUpperCase());
 }
@@ -362,7 +374,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
     if (forceProp) {
       prop = prop.slice(5);
       isProp = true;
-    } else if (!!solidJs.sharedConfig.context && node.isConnected) return value;
+    } else if (isHydrating(node)) return value;
     if (prop === "class" || prop === "className") className(node, value);else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;else node[propAlias || prop] = value;
   } else {
     const ns = isSVG && prop.indexOf(":") > -1 && SVGNamespace[prop.split(":")[0]];
@@ -371,6 +383,9 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   return value;
 }
 function eventHandler(e) {
+  if (solidJs.sharedConfig.registry && solidJs.sharedConfig.events) {
+    if (solidJs.sharedConfig.events.find(([el, ev]) => ev === e)) return;
+  }
   const key = `$$${e.type}`;
   let node = e.composedPath && e.composedPath()[0] || e.target;
   if (e.target !== node) {
@@ -397,7 +412,7 @@ function eventHandler(e) {
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
-  const hydrating = !!solidJs.sharedConfig.context && parent.isConnected;
+  const hydrating = isHydrating(parent);
   if (hydrating) {
     !current && (current = [...parent.childNodes]);
     let cleaned = [];
@@ -448,9 +463,10 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     if (hydrating) {
       if (!array.length) return current;
-      if (marker === undefined) return [...parent.childNodes];
+      if (marker === undefined) return current = [...parent.childNodes];
       let node = array[0];
-      let nodes = [node];
+      if (node.parentNode !== parent) return current;
+      const nodes = [node];
       while ((node = node.nextSibling) !== marker) nodes.push(node);
       return current = nodes;
     }