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

package/frames/dist/client.cjs

@@ -7,7 +7,7 @@ var client = require('@solidjs/web/server-functions/client');
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -17,7 +17,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -845,7 +845,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1300,9 +1300,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1311,7 +1311,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1457,7 +1457,7 @@ function createServerComponentHandler({
   }
 }
 
-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()

package/frames/dist/client.dev.cjs

@@ -7,7 +7,7 @@ var client = require('@solidjs/web/server-functions/client');
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -17,7 +17,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -855,7 +855,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1320,9 +1320,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1331,7 +1331,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1477,7 +1477,7 @@ function createServerComponentHandler({
   }
 }
 
-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()

package/frames/dist/client.dev.js

@@ -5,7 +5,7 @@ import { ChunkReader, frameAddress, SINGLE_FLIGHT_HEADER, deserializeStream, get
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -15,7 +15,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -853,7 +853,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1318,9 +1318,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1329,7 +1329,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1475,7 +1475,7 @@ function createServerComponentHandler({
   }
 }
 
-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()

package/frames/dist/client.js

@@ -5,7 +5,7 @@ import { ChunkReader, frameAddress, SINGLE_FLIGHT_HEADER, deserializeStream, get
 const ELEMENT_NODE = 1;
 const TEXT_NODE = 3;
 const COMMENT_NODE = 8;
-const CLAIM_SEAM = Symbol.for("dom-expressions.element-claims");
+const CLAIM_SEAM = Symbol.for("solid.element-claims");
 const CLAIMED_ELEMENTS = "a[href], form[action]";
 function claimHandlers() {
   const handlers = globalThis[CLAIM_SEAM];
@@ -15,7 +15,7 @@ function claimNode(handlers, el) {
   for (let i = 0; i < handlers.length; i++) handlers[i](el);
 }
 const claimedAttr = name => name === "href" || name === "action";
-const BOUND_SEAM = Symbol.for("dx.bnd");
+const BOUND_SEAM = Symbol.for("solid.bnd");
 const boundSeam = globalThis[BOUND_SEAM] || (globalThis[BOUND_SEAM] = {});
 const BND_ATTR = "_bnd";
 const BND_SELECTOR = "[_bnd]";
@@ -843,7 +843,7 @@ class FrameImpl {
 function createFrame(boundary, options) {
   return new FrameImpl(boundary, null, null, options);
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function createFrameElement(options) {
   const el = makeFrameElement(options.id);
@@ -1298,9 +1298,9 @@ async function applyFrameResponse(response, host, options = {}) {
   }
   return as !== undefined ? as : rootId;
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
-const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("dom-expressions.component-binding");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
+const COMPONENT_BINDING = /*#__PURE__*/Symbol.for("solid.component-binding");
 let resolveServerComponent;
 function parseServerComponent(value, ctx) {
   return {
@@ -1309,7 +1309,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -1455,7 +1455,7 @@ function createServerComponentHandler({
   }
 }
 
-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()

package/frames/dist/server.cjs

@@ -4,7 +4,7 @@ var solidJs = require('solid-js');
 var seroval = require('seroval');
 var web = require('seroval-plugins/web');
 
-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()
@@ -19,7 +19,7 @@ function isContainerTraced(value) {
   const resolve = state.resolveTrace;
   return !!(resolve && value && typeof value === "object" && resolve(value));
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+const TRACE = Symbol.for("solid.container-trace");
 function envelopeContainerTraces(value) {
   if (!state.resolveTrace || value == null || typeof value !== "object") return value;
   const trace = state.resolveTrace(value);
@@ -70,7 +70,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;
   },
@@ -101,13 +101,6 @@ const ContainerTracePlugin = {
   }
 };
 
-const runWithHydrationScope = (id, fn) => solidJs.runWithOwner(solidJs.createOwner({
-  id
-}), fn);
-const ssrAsyncValue = value => solidJs.createMemo(() => value, {
-  serialize: false
-});
-
 setContainerTraceStreamMint(iterable => {
   const stream = seroval.createStream();
   (async () => {
@@ -1818,6 +1811,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: [""],
@@ -1883,6 +1885,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: [],
@@ -1896,7 +1899,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);
@@ -2004,6 +2007,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -2039,7 +2043,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;
@@ -2299,7 +2303,7 @@ function ssr(t) {
   };
   return result;
 }
-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;
 function resolveSSRSelectValues(html) {
@@ -2670,9 +2674,9 @@ const FRAME_STREAM_HEADER = "X-Frame-Stream";
 function isFrameStreamResponse(response) {
   return response.headers.has(FRAME_STREAM_HEADER);
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_SOURCE = /*#__PURE__*/Symbol.for("dom-expressions.server-component-source");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_SOURCE = /*#__PURE__*/Symbol.for("solid.server-component-source");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
 let serverComponentRegistryExpr;
 function setServerComponentBootstrap(resolve) {
   serverComponentRegistryExpr = resolve;
@@ -2684,7 +2688,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -2717,6 +2721,12 @@ function flightCodec(codec) {
   };
 }
 
+const runWithHydrationScope = (id, fn) => solidJs.runWithOwner(solidJs.createOwner({
+  id
+}), fn);
+const ssrAsyncValue = value => solidJs.createMemo(() => value, {
+  serialize: false
+});
 const scopeStamp = typeof solidJs.creationStamp === "function" ? solidJs.creationStamp : () => 0;
 function serverOwned(render) {
   return solidJs.NoHydration ? solidJs.NoHydration({
@@ -3295,7 +3305,7 @@ function createDocumentSlotProps(clientProps, frameId) {
     }
   });
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function frameElementOpen(id) {
   const escaped = solidJs.sharedConfig.context ? solidJs.sharedConfig.context.escape(String(id), true) : String(id);

package/frames/dist/server.js

@@ -1,8 +1,8 @@
-import { createMemo, runWithOwner, createOwner, sharedConfig, createRoot, ssrHandleError, getOwner, inServerComponentScope, creationStamp, NoHydration, runInServerComponentScope, Hydration, getProjectionTrace } from 'solid-js';
+import { sharedConfig, createRoot, ssrHandleError, getOwner, runWithOwner, inServerComponentScope, creationStamp, NoHydration, runInServerComponentScope, createMemo, Hydration, createOwner, getProjectionTrace } from 'solid-js';
 import { Feature, createStream, toCrossJSONStream, Serializer, getCrossReferenceHeader } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
-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()
@@ -17,7 +17,7 @@ function isContainerTraced(value) {
   const resolve = state.resolveTrace;
   return !!(resolve && value && typeof value === "object" && resolve(value));
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+const TRACE = Symbol.for("solid.container-trace");
 function envelopeContainerTraces(value) {
   if (!state.resolveTrace || value == null || typeof value !== "object") return value;
   const trace = state.resolveTrace(value);
@@ -68,7 +68,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;
   },
@@ -99,13 +99,6 @@ const ContainerTracePlugin = {
   }
 };
 
-const runWithHydrationScope = (id, fn) => runWithOwner(createOwner({
-  id
-}), fn);
-const ssrAsyncValue = value => createMemo(() => value, {
-  serialize: false
-});
-
 setContainerTraceStreamMint(iterable => {
   const stream = createStream();
   (async () => {
@@ -1816,6 +1809,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: [""],
@@ -1881,6 +1883,7 @@ function createLiveHoles(sink, scoped) {
       const recordsBefore = engine.recordStamp;
       const ownersBefore = stamp();
       const owner = getOwner();
+      const holeCtx = sharedConfig.context;
       const b = {
         key: null,
         children: [],
@@ -1894,7 +1897,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);
@@ -2002,6 +2005,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = getOwner();
+      const holeCtx = sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -2037,7 +2041,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;
@@ -2297,7 +2301,7 @@ function ssr(t) {
   };
   return result;
 }
-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;
 function resolveSSRSelectValues(html) {
@@ -2668,9 +2672,9 @@ const FRAME_STREAM_HEADER = "X-Frame-Stream";
 function isFrameStreamResponse(response) {
   return response.headers.has(FRAME_STREAM_HEADER);
 }
-const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("dom-expressions.server-component");
-const SERVER_COMPONENT_SOURCE = /*#__PURE__*/Symbol.for("dom-expressions.server-component-source");
-const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("dom-expressions.server-component-address");
+const SERVER_COMPONENT = /*#__PURE__*/Symbol.for("solid.server-component");
+const SERVER_COMPONENT_SOURCE = /*#__PURE__*/Symbol.for("solid.server-component-source");
+const SERVER_COMPONENT_ADDRESS = /*#__PURE__*/Symbol.for("solid.server-component-address");
 let serverComponentRegistryExpr;
 function setServerComponentBootstrap(resolve) {
   serverComponentRegistryExpr = resolve;
@@ -2682,7 +2686,7 @@ function parseServerComponent(value, ctx) {
   };
 }
 const ServerComponentPlugin = {
-  tag: "dom-expressions/server-component",
+  tag: "solid/server-component",
   test(value) {
     return typeof value === "function" && SERVER_COMPONENT in value;
   },
@@ -2715,6 +2719,12 @@ function flightCodec(codec) {
   };
 }
 
+const runWithHydrationScope = (id, fn) => runWithOwner(createOwner({
+  id
+}), fn);
+const ssrAsyncValue = value => createMemo(() => value, {
+  serialize: false
+});
 const scopeStamp = typeof creationStamp === "function" ? creationStamp : () => 0;
 function serverOwned(render) {
   return NoHydration ? NoHydration({
@@ -3293,7 +3303,7 @@ function createDocumentSlotProps(clientProps, frameId) {
     }
   });
 }
-const FRAME_TAG = "dx-frame";
+const FRAME_TAG = "solid-frame";
 const FRAME_ID_ATTR = "data-fid";
 function frameElementOpen(id) {
   const escaped = sharedConfig.context ? sharedConfig.context.escape(String(id), true) : String(id);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@solidjs/web",
   "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/solidjs/solid.git",
-    "directory": "packages/solid-web"
+    "directory": "packages/web"
   },
   "publishConfig": {
     "access": "public"
@@ -373,32 +373,18 @@
     },
     "./types/*": "./types/*"
   },
-  "dependencies": {
-    "seroval": "~1.5.4",
-    "seroval-plugins": "~1.5.4"
-  },
-  "peerDependencies": {
-    "solid-js": "^2.0.0-rc.2"
-  },
-  "devDependencies": {
-    "@codspeed/vitest-plugin": "^5.4.0",
-    "solid-js": "2.0.0-rc.2"
-  },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy-jsx build:js",
     "build:clean": "rimraf dist/",
     "build:js": "rollup -c",
     "link": "symlink-dir . node_modules/@solidjs/web",
-    "types": "npm-run-all -nl types:clean types:copy-jsx types:web types:copy-web types:web-storage types:copy-server-functions types:copy-serialization types:web-frames types:copy-frames types:cjs",
-    "types:clean": "rimraf types/ types-cjs/ storage/types/ storage/types-cjs/ serialization/types/ serialization/types-cjs/ frames/types/",
-    "types:copy-jsx": "ncp ../../node_modules/@dom-expressions/runtime/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/jsx-properties.d.ts ./src/jsx-properties.d.ts && dom-expressions-jsx-types --input ./src/jsx.d.ts --element \"SolidElement | Node | ArrayElement\" --import 'import type { Element as SolidElement } from \"solid-js\";'",
+    "types": "npm-run-all -nl types:clean types:copy-jsx types:web types:copy-web types:web-storage types:cjs",
+    "types:clean": "rimraf types/ types-cjs/ storage/types/ storage/types-cjs/ serialization/types/ serialization/types-cjs/ frames/types/ .types-build/",
+    "jsx-sync": "node ./scripts/jsx-sync.mjs --compile --element \"SolidElement | Node | ArrayElement\" --import \"import type { Element as SolidElement } from \\\"solid-js\\\";\"",
+    "types:copy-jsx": "pnpm run jsx-sync",
     "types:web": "tsc --project ./tsconfig.build.json",
-    "types:copy-web": "node -e \"const src = fs.readFileSync('../../node_modules/@dom-expressions/runtime/src/client.d.ts', 'utf8'); const marker = 'export type { RequestEventLocals } from'; if (!src.includes(marker)) throw new Error('client.d.ts drift: the type-only RequestEventLocals re-export was not found — revisit the augmentation-identity rewrite'); fs.writeFileSync('./types/client.d.ts', src.replace(marker, 'export { RequestEventLocals } from'));\" && ncp ../../node_modules/@dom-expressions/runtime/src/server.d.ts ./types/server.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/serializer.d.ts ./types/serializer.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/serializer-decode.d.ts ./types/serializer-decode.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/response.d.ts ./types/response.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/cookies.d.ts ./types/cookies.d.ts && ncp ./src/jsx.d.ts ./types/jsx.d.ts && ncp ./src/jsx-properties.d.ts ./types/jsx-properties.d.ts",
+    "types:copy-web": "node ./scripts/copy-types.mjs",
     "types:web-storage": "tsc --project ./storage/tsconfig.build.json",
-    "types:web-frames": "tsc --project ./frames/tsconfig.build.json",
-    "types:copy-serialization": "node -e \"fs.mkdirSync('./serialization/types', { recursive: true }); fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/serializer.d.ts', './serialization/types/index.d.ts'); fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/serializer-decode.d.ts', './serialization/types/serializer-decode.d.ts');\"",
-    "types:copy-server-functions": "node -e \"fs.mkdirSync('./types/server-functions', { recursive: true }); for (const f of ['shared', 'flash', 'client', 'server', 'rich-args']) fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/server-functions/' + f + '.d.ts', './types/server-functions/' + f + '.d.ts');\"",
-    "types:copy-frames": "node -e \"fs.mkdirSync('./types/frames', { recursive: true }); for (const f of ['frame-client', 'frame-transport', 'frame-sink', 'serializer']) fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/' + f + '.d.ts', './types/frames/' + f + '.d.ts'); for (const f of ['client', 'server']) fs.writeFileSync('./types/frames/' + f + '.d.ts', fs.readFileSync('./frames/types/' + f + '.d.ts', 'utf8').replaceAll('@dom-expressions/runtime/src/', './'));\"",
     "types:cjs": "node ../../scripts/sync-dual-types.mjs ./types ./types-cjs ./storage/types ./storage/types-cjs ./serialization/types ./serialization/types-cjs",
     "test": "vitest run && vitest run --config vite.config.server.mjs && vitest run --config vite.config.hydrate.mjs",
     "test:server": "vitest run --config vite.config.server.mjs",
@@ -406,5 +392,17 @@
     "bench": "vitest bench --run",
     "bench:server": "vitest bench --run --config vite.config.server-bench.mjs",
     "test-types": "tsc --project tsconfig.test.json"
+  },
+  "dependencies": {
+    "seroval": "~1.5.4",
+    "seroval-plugins": "~1.5.4"
+  },
+  "peerDependencies": {
+    "solid-js": "^2.0.0-rc.4"
+  },
+  "devDependencies": {
+    "@codspeed/vitest-plugin": "^5.4.0",
+    "@solidjs/signals": "workspace:*",
+    "solid-js": "workspace:*"
   }
-}
+}

package/serialization/dist/decode.cjs

@@ -3,7 +3,7 @@
 var seroval = require('seroval');
 var web = require('seroval-plugins/web');
 
-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()
@@ -11,7 +11,7 @@ const state = globalThis[STATE] || (globalThis[STATE] = {
 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) {
@@ -30,7 +30,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;
   },

package/serialization/dist/decode.js

@@ -1,7 +1,7 @@
 import { Feature, fromCrossJSON, createStream } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
-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()
@@ -9,7 +9,7 @@ const state = globalThis[STATE] || (globalThis[STATE] = {
 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) {
@@ -28,7 +28,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;
   },