@solidjs/web 2.0.0-rc.2 → 2.0.0-rc.3

package/dist/server.cjs

@@ -57,14 +57,18 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => solidJs.createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => solidJs.createMemo(() => fn(), syncOptions);
+function effect(fn, effectFn, options) {
+  solidJs.createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return solidJs.createMemo(() => fn(), syncOptions);
+}
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()
@@ -75,7 +79,7 @@ function setContainerTraceResolver(fn) {
 function setContainerTraceStreamMint(fn) {
   state.streamOf = fn;
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+const TRACE = Symbol.for("solid.container-trace");
 function materialize(marker) {
   let value = state.materialized.get(marker.$tr);
   if (value === undefined) {
@@ -94,7 +98,7 @@ function parseTrace(value, ctx) {
   };
 }
 const ContainerTracePlugin = {
-  tag: "dom-expressions/container-trace",
+  tag: "solid/container-trace",
   test(value) {
     return value != null && typeof value === "object" && TRACE in value;
   },
@@ -210,11 +214,14 @@ function isSafeError(value) {
   return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
 }
 const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
+function initWithRevalidate(init = {}) {
+  const resolved = typeof init === "number" ? {
+    status: init
+  } : init;
   const {
     revalidate,
     ...responseInit
-  } = init;
+  } = resolved;
   let headers;
   if (responseInit.headers && responseInit.headers.getSetCookie) {
     headers = new Headers();
@@ -240,9 +247,7 @@ function redirect(url, init = 302) {
   const {
     responseInit,
     headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
+  } = initWithRevalidate(init);
   if (responseInit.status === undefined) {
     responseInit.status = 302;
   }
@@ -1877,6 +1882,15 @@ function createLiveHoles(sink, scoped) {
   const stamp = typeof solidJs.creationStamp === "function" ? solidJs.creationStamp : () => 0;
   const inScope = scoped && typeof solidJs.inServerComponentScope === "function" ? solidJs.inServerComponentScope : null;
   const stripMarkers = html => html.replace(/<!--lh:\/?\d+-->/g, "");
+  const swept = (owner, ctx, fn) => {
+    const prev = solidJs.sharedConfig.context;
+    solidJs.sharedConfig.context = ctx;
+    try {
+      return owner ? solidJs.runWithOwner(owner, fn) : fn();
+    } finally {
+      solidJs.sharedConfig.context = prev;
+    }
+  };
   function resolveHoleValue(hole) {
     const result = {
       t: [""],
@@ -1942,6 +1956,7 @@ function createLiveHoles(sink, scoped) {
       const recordsBefore = engine.recordStamp;
       const ownersBefore = stamp();
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: null,
         children: [],
@@ -1955,7 +1970,7 @@ function createLiveHoles(sink, scoped) {
           const sweepOwnersBefore = stamp();
           let res;
           try {
-            res = owner ? solidJs.runWithOwner(owner, () => resolveHoleValue(hole)) : resolveHoleValue(hole);
+            res = swept(owner, holeCtx, () => resolveHoleValue(hole));
           } catch (err) {
             b.closed = true;
             sink.closeBinding(b.key);
@@ -2063,6 +2078,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -2098,7 +2114,7 @@ function createLiveHoles(sink, scoped) {
                 if (vt === "string" || vt === "number") html += v;
               }
             };
-            owner ? solidJs.runWithOwner(owner, run) : run();
+            swept(owner, holeCtx, run);
           } catch (err) {
             if (solidJs.ssrHandleError(err, true)) return;
             b.closed = true;
@@ -2434,7 +2450,7 @@ function ssrHydrationKey() {
   const hk = getHydrationKey();
   return hk ? ` _hk=${hk}` : "";
 }
-const CLAIM_PROP = /*#__PURE__*/Symbol.for("dom-expressions.claim-prop");
+const CLAIM_PROP = /*#__PURE__*/Symbol.for("solid.claim-prop");
 const CLAIMS_STREAM = 1;
 const CLAIMS_DOCUMENT = 2;
 const CLAIM_UNSAFE = /[^A-Za-z0-9_.!~*'()-]/g;
@@ -3451,6 +3467,7 @@ exports.reload = reload;
 exports.render = notSup;
 exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;
+exports.resolveSSRNode = resolveSSRNode;
 exports.resolveSSRSelectValues = resolveSSRSelectValues;
 exports.respond = respond;
 exports.runHydrationEvents = notSup;

package/dist/server.js

@@ -1,4 +1,4 @@
-import { createRenderEffect, createMemo, sharedConfig, createRoot, inServerComponentScope, getOwner, ssrHandleError, runWithOwner, creationStamp, createComponent, omit, getNextChildId, onCleanup, getProjectionTrace } from 'solid-js';
+import { createRenderEffect, createMemo, sharedConfig, createRoot, inServerComponentScope, getOwner, ssrHandleError, creationStamp, runWithOwner, createComponent, omit, getNextChildId, onCleanup, getProjectionTrace } from 'solid-js';
 export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, merge as mergeProps, ssrScope as scope, sharedConfig, untrack } from 'solid-js';
 import { Feature, createStream, Serializer, getCrossReferenceHeader } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
@@ -56,14 +56,18 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => createMemo(() => fn(), syncOptions);
+function effect(fn, effectFn, options) {
+  createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return createMemo(() => fn(), syncOptions);
+}
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()
@@ -74,7 +78,7 @@ function setContainerTraceResolver(fn) {
 function setContainerTraceStreamMint(fn) {
   state.streamOf = fn;
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+const TRACE = Symbol.for("solid.container-trace");
 function materialize(marker) {
   let value = state.materialized.get(marker.$tr);
   if (value === undefined) {
@@ -93,7 +97,7 @@ function parseTrace(value, ctx) {
   };
 }
 const ContainerTracePlugin = {
-  tag: "dom-expressions/container-trace",
+  tag: "solid/container-trace",
   test(value) {
     return value != null && typeof value === "object" && TRACE in value;
   },
@@ -209,11 +213,14 @@ function isSafeError(value) {
   return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
 }
 const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
+function initWithRevalidate(init = {}) {
+  const resolved = typeof init === "number" ? {
+    status: init
+  } : init;
   const {
     revalidate,
     ...responseInit
-  } = init;
+  } = resolved;
   let headers;
   if (responseInit.headers && responseInit.headers.getSetCookie) {
     headers = new Headers();
@@ -239,9 +246,7 @@ function redirect(url, init = 302) {
   const {
     responseInit,
     headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
+  } = initWithRevalidate(init);
   if (responseInit.status === undefined) {
     responseInit.status = 302;
   }
@@ -1876,6 +1881,15 @@ function createLiveHoles(sink, scoped) {
   const stamp = typeof creationStamp === "function" ? creationStamp : () => 0;
   const inScope = scoped && typeof inServerComponentScope === "function" ? inServerComponentScope : null;
   const stripMarkers = html => html.replace(/<!--lh:\/?\d+-->/g, "");
+  const swept = (owner, ctx, fn) => {
+    const prev = sharedConfig.context;
+    sharedConfig.context = ctx;
+    try {
+      return owner ? runWithOwner(owner, fn) : fn();
+    } finally {
+      sharedConfig.context = prev;
+    }
+  };
   function resolveHoleValue(hole) {
     const result = {
       t: [""],
@@ -1941,6 +1955,7 @@ function createLiveHoles(sink, scoped) {
       const recordsBefore = engine.recordStamp;
       const ownersBefore = stamp();
       const owner = getOwner();
+      const holeCtx = sharedConfig.context;
       const b = {
         key: null,
         children: [],
@@ -1954,7 +1969,7 @@ function createLiveHoles(sink, scoped) {
           const sweepOwnersBefore = stamp();
           let res;
           try {
-            res = owner ? runWithOwner(owner, () => resolveHoleValue(hole)) : resolveHoleValue(hole);
+            res = swept(owner, holeCtx, () => resolveHoleValue(hole));
           } catch (err) {
             b.closed = true;
             sink.closeBinding(b.key);
@@ -2062,6 +2077,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = getOwner();
+      const holeCtx = sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -2097,7 +2113,7 @@ function createLiveHoles(sink, scoped) {
                 if (vt === "string" || vt === "number") html += v;
               }
             };
-            owner ? runWithOwner(owner, run) : run();
+            swept(owner, holeCtx, run);
           } catch (err) {
             if (ssrHandleError(err, true)) return;
             b.closed = true;
@@ -2433,7 +2449,7 @@ function ssrHydrationKey() {
   const hk = getHydrationKey();
   return hk ? ` _hk=${hk}` : "";
 }
-const CLAIM_PROP = /*#__PURE__*/Symbol.for("dom-expressions.claim-prop");
+const CLAIM_PROP = /*#__PURE__*/Symbol.for("solid.claim-prop");
 const CLAIMS_STREAM = 1;
 const CLAIMS_DOCUMENT = 2;
 const CLAIM_UNSAFE = /[^A-Za-z0-9_.!~*'()-]/g;
@@ -3312,4 +3328,4 @@ function httpHeader(name, value, options) {
   }
 }
 
-export { CLAIMS_DOCUMENT, CLAIMS_STREAM, CLAIM_PROP, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, notSup as acquireAsset, notSup as addEvent, applyRef, notSup as assign, claimElement, claimElementTree, notSup as className, clearFlashCookie, clientOnly, commitEventResponse, commitResponseStub, composeMiddleware, createLiveHoles, createRequestEvent, createResponseStub, createSSRResponse, notSup as delegateEvents, dynamic, notSup as dynamicProperty, effect, escape, generateHydrationScript, notSup as getDelegatedRoot, getExpectedRedirectStatus, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, notSup as hydrate, notSup as insert, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, markSafeError, memo, parseCookieHeader, redirect, notSup as ref, notSup as registerDelegatedContainer, notSup as registerDelegatedRoot, registerElementClaim, reload, notSup as render, renderToStream, renderToString, resolveSSRSelectValues, respond, notSup as runHydrationEvents, scriptNonce, serializeCookie, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClaim, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrSelectValues, ssrStyle, ssrStyleProperty, notSup as style, styleNonce, notSup as template, notSup as unregisterDelegatedContainer, notSup as unregisterDelegatedRoot, useHead };
+export { CLAIMS_DOCUMENT, CLAIMS_STREAM, CLAIM_PROP, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, notSup as acquireAsset, notSup as addEvent, applyRef, notSup as assign, claimElement, claimElementTree, notSup as className, clearFlashCookie, clientOnly, commitEventResponse, commitResponseStub, composeMiddleware, createLiveHoles, createRequestEvent, createResponseStub, createSSRResponse, notSup as delegateEvents, dynamic, notSup as dynamicProperty, effect, escape, generateHydrationScript, notSup as getDelegatedRoot, getExpectedRedirectStatus, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, notSup as hydrate, notSup as insert, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, markSafeError, memo, parseCookieHeader, redirect, notSup as ref, notSup as registerDelegatedContainer, notSup as registerDelegatedRoot, registerElementClaim, reload, notSup as render, renderToStream, renderToString, resolveSSRNode, resolveSSRSelectValues, respond, notSup as runHydrationEvents, scriptNonce, serializeCookie, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClaim, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrSelectValues, ssrStyle, ssrStyleProperty, notSup as style, styleNonce, notSup as template, notSup as unregisterDelegatedContainer, notSup as unregisterDelegatedRoot, useHead };

package/dist/web.cjs

@@ -57,23 +57,16 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => solidJs.createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => solidJs.createMemo(() => fn(), syncOptions);
-const assetGates = new WeakMap();
-const waitAsset = promise => {
-  let gate = assetGates.get(promise);
-  if (!gate) {
-    solidJs.runWithOwner(null, () => {
-      gate = solidJs.createMemo(() => promise);
-    });
-    assetGates.set(promise, gate);
-  }
-  gate();
-};
+function effect(fn, effectFn, options) {
+  solidJs.createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return solidJs.createMemo(() => fn(), syncOptions);
+}
 
 function reconcileArrays(parentNode, a, b, marker) {
   let bLength = b.length,
@@ -329,11 +322,30 @@ function getServerFunctionRPC() {
   return globalThis[SERVER_FUNCTION_RPC];
 }
 
-const $$EVENT_OWNER = "_$DX_EVENT_OWNER";
+const assetGates = new WeakMap();
+const waitAsset = promise => {
+  let gate = assetGates.get(promise);
+  if (!gate) {
+    solidJs.runWithOwner(null, () => {
+      gate = solidJs.createMemo(() => promise);
+    });
+    assetGates.set(promise, gate);
+  }
+  gate();
+};
+const $$EVENT_OWNER = "_$SOLID_EVENT_OWNER";
 const INNER_OWNED = {};
 const delegatedEvents = new Set();
 const delegatedContainers = new Map();
-function render$1(code, element, init, options = {}) {
+function voidFn() {}
+function generateHydrationScript(_options) {
+  return "";
+}
+function HydrationScript(_props) {
+  return null;
+}
+const getRequestEvent = voidFn;
+function render(code, element, init, options = {}) {
   let disposer;
   registerDelegatedRoot(element);
   try {
@@ -344,15 +356,20 @@ function render$1(code, element, init, options = {}) {
         effect(() => solidJs.flatten(tree), () => {});
       } else {
         const tree = code();
-        insert(element, () => tree, element.firstChild ? null : undefined, init, options.insertOptions);
+        insert(element, () => tree, element.firstChild ? null : undefined, init, {
+          ...options.insertOptions,
+          schedule: true
+        });
       }
     }, {
       id: options.renderId
     });
+    solidJs.flush();
   } catch (err) {
     if (disposer) disposer();
     unregisterDelegatedRoot(element);
     throw err;
+  } finally {
   }
   return () => {
     disposer();
@@ -437,7 +454,7 @@ function setProperty(node, name, value) {
   node[name] = value;
 }
 let claimHandlers = null;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 function registerElementClaim(handler) {
   (claimHandlers || (claimHandlers = globalThis[CLAIM_SEAM] = [])).push(handler);
   return () => {
@@ -1140,9 +1157,10 @@ function loadModuleAssets(mapping) {
   }
   return pending.length ? Promise.all(pending).then(() => {}) : undefined;
 }
-function hydrate$1(code, element, options = {}) {
+function hydrate(code, element, options = {}) {
+  solidJs.enableHydration();
   installHydrationRuntime();
-  if (globalThis._$HY.done) return render$1(code, element, [...element.childNodes], options);
+  if (globalThis._$HY.done) return render(code, element, [...element.childNodes], options);
   options.renderId ||= "";
   if (!globalThis._$HY.modules) globalThis._$HY.modules = {};
   if (!globalThis._$HY.loading) globalThis._$HY.loading = {};
@@ -1191,7 +1209,7 @@ function hydrate$1(code, element, options = {}) {
         solidJs.sharedConfig.gather = gather;
         solidJs.sharedConfig.hydrating = true;
         try {
-          disposer = render$1(code, element, [...element.childNodes], options);
+          disposer = render(code, element, [...element.childNodes], options);
         } finally {
           solidJs.sharedConfig.hydrating = false;
         }
@@ -1199,14 +1217,14 @@ function hydrate$1(code, element, options = {}) {
         console.error("Hydration module preload failed, falling back to client render:", err);
         solidJs.sharedConfig.hydrating = false;
         solidJs.sharedConfig.registry = undefined;
-        disposer = render$1(code, element, [...element.childNodes], options);
+        disposer = render(code, element, [...element.childNodes], options);
       });
       return () => disposer && disposer();
     }
   }
   try {
     gatherHydratable(element, options.renderId);
-    return render$1(code, element, [...element.childNodes], options);
+    return render(code, element, [...element.childNodes], options);
   } finally {
     solidJs.sharedConfig.hydrating = false;
   }
@@ -1393,7 +1411,7 @@ function eventHandler(e, container, state) {
   const handleNode = () => {
     let handler = node[key];
     if (handler === undefined && node.hasAttribute && node.hasAttribute("_bnd")) {
-      const seam = globalThis[Symbol.for("dx.bnd")];
+      const seam = globalThis[Symbol.for("solid.bnd")];
       if (seam) handler = seam.resolve(node, e.type);
     }
     if (handler && !node.disabled) {
@@ -1442,7 +1460,16 @@ function eventHandler(e, container, state) {
 }
 function insertExpression(parent, value, current, marker) {
   if (hydrationRt !== null && isHydrating(parent)) {
-    if (value && value !== current) for (const n of Array.isArray(value) ? value : [value]) if (n && n.nodeType && !isHydrating(n)) return current;
+    if (value && value !== current) {
+      const arr = Array.isArray(value);
+      for (const n of arr ? value : [value]) {
+        if (n && n.nodeType) {
+          if (!isHydrating(n)) return current;
+        } else if (arr && (typeof n === "string" || typeof n === "number")) {
+          return current;
+        }
+      }
+    }
     return value;
   }
   if (value === current) return value;
@@ -1473,6 +1500,17 @@ function insertExpression(parent, value, current, marker) {
     if (marker) value[$$SLOT] = marker;
   } else if (Array.isArray(value)) {
     const currentArray = current && Array.isArray(current);
+    for (let i = 0, len = value.length; i < len; i++) {
+      const item = value[i],
+        t = typeof item;
+      if (t === "string" || t === "number") {
+        const prev = currentArray ? current[i] : undefined;
+        if (prev && prev.nodeType === 3) {
+          if (prev.data !== "" + item) prev.data = item;
+          value[i] = prev;
+        } else value[i] = document.createTextNode(item);
+      }
+    }
     if (value.length === 0) {
       cleanChildren(parent, current, marker);
     } else if (currentArray) {
@@ -1493,12 +1531,12 @@ function normalize(value, current, multi, doNotUnwrap) {
   });
   if (doNotUnwrap && typeof value === "function") return value;
   if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
-  if (Array.isArray(value)) {
+  if (solidJs.sharedConfig.hydrating && Array.isArray(value)) {
     for (let i = 0, len = value.length; i < len; i++) {
       const item = value[i],
         prev = current && current[i],
         t = typeof item;
-      if (t === "string" || t === "number") value[i] = prev && prev.nodeType === 3 && (solidJs.sharedConfig.hydrating || prev.data === "" + item) ? prev : document.createTextNode(item);
+      if ((t === "string" || t === "number") && prev && prev.nodeType === 3) value[i] = prev;
     }
   }
   return value;
@@ -1579,7 +1617,6 @@ function gatherHydratable(element, root) {
 function getHydrationKey() {
   return solidJs.sharedConfig.getNextContextId();
 }
-const voidFn = () => undefined;
 const RequestContext = Symbol();
 
 function throwInBrowser(func) {
@@ -1655,11 +1692,14 @@ function isSafeError(value) {
   return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
 }
 const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
+function initWithRevalidate(init = {}) {
+  const resolved = typeof init === "number" ? {
+    status: init
+  } : init;
   const {
     revalidate,
     ...responseInit
-  } = init;
+  } = resolved;
   let headers;
   if (responseInit.headers && responseInit.headers.getSetCookie) {
     headers = new Headers();
@@ -1685,9 +1725,7 @@ function redirect(url, init = 302) {
   const {
     responseInit,
     headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
+  } = initWithRevalidate(init);
   if (responseInit.status === undefined) {
     responseInit.status = 302;
   }
@@ -1719,26 +1757,8 @@ function respond(value, init = {}) {
   }), value);
 }
 
-const mergeProps = solidJs.merge;
 const isServer = false;
 const isDev = false;
-function render(code, element, init, options = {}) {
-  try {
-    const dispose = render$1(code, element, init, {
-      ...options,
-      insertOptions: {
-        schedule: true
-      }
-    });
-    solidJs.flush();
-    return dispose;
-  } finally {
-  }
-}
-const hydrate = (...args) => {
-  solidJs.enableHydration();
-  return hydrate$1(...args);
-};
 function Portal(props) {
   return solidJs.runWithOwner(solidJs.createOwner(), () => portalImpl(props));
 }
@@ -1791,7 +1811,7 @@ function portalImpl(props) {
   });
   return treeMarker;
 }
-const COMPONENT_BINDING = Symbol.for("dom-expressions.component-binding");
+const COMPONENT_BINDING = Symbol.for("solid.component-binding");
 function bindingOf(value) {
   return value !== null && (typeof value === "function" || typeof value === "object") && value[COMPONENT_BINDING] || undefined;
 }
@@ -1928,6 +1948,10 @@ Object.defineProperty(exports, "getOwner", {
   enumerable: true,
   get: function () { return solidJs.getOwner; }
 });
+Object.defineProperty(exports, "mergeProps", {
+  enumerable: true,
+  get: function () { return solidJs.merge; }
+});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return solidJs.untrack; }
@@ -1938,7 +1962,7 @@ exports.DOMWithState = DOMWithState;
 exports.DelegatedEvents = DelegatedEvents;
 exports.Dynamic = Dynamic;
 exports.HREF = HREF;
-exports.HydrationScript = voidFn;
+exports.HydrationScript = HydrationScript;
 exports.MathMLElements = MathMLElements;
 exports.Namespaces = Namespaces;
 exports.Portal = Portal;
@@ -1968,7 +1992,7 @@ exports.dynamic = dynamic;
 exports.dynamicProperty = dynamicProperty;
 exports.effect = effect;
 exports.escape = escape;
-exports.generateHydrationScript = voidFn;
+exports.generateHydrationScript = generateHydrationScript;
 exports.getDelegatedRoot = getDelegatedRoot;
 exports.getExpectedRedirectStatus = getExpectedRedirectStatus;
 exports.getFirstChild = getFirstChild;
@@ -1977,7 +2001,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.getNextSibling = getNextSibling;
-exports.getRequestEvent = voidFn;
+exports.getRequestEvent = getRequestEvent;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;
 exports.getServerFunctionRPC = getServerFunctionRPC;
 exports.hasFlashCookie = hasFlashCookie;
@@ -1994,7 +2018,6 @@ exports.isServer = isServer;
 exports.isServerFunction = isServerFunction;
 exports.markSafeError = markSafeError;
 exports.memo = memo;
-exports.mergeProps = mergeProps;
 exports.parseCookieHeader = parseCookieHeader;
 exports.patchDriver = patchDriver;
 exports.redirect = redirect;
@@ -2030,4 +2053,5 @@ exports.template = template;
 exports.unregisterDelegatedContainer = unregisterDelegatedContainer;
 exports.unregisterDelegatedRoot = unregisterDelegatedRoot;
 exports.useHead = useHead;
+exports.waitAsset = waitAsset;
 exports.warmAsset = warmAsset;