@solidjs/web 2.0.0-beta.33 → 2.0.0-beta.34

package/dist/dev.cjs

@@ -1177,13 +1177,19 @@ function hydrate$1(code, element, options = {}) {
       }
     };
   }
-  const rootMapping = globalThis._$HY.r && globalThis._$HY.r["_assets"];
+  const hyr = globalThis._$HY.r;
+  const rootMapping = hyr && (hyr[options.renderId + "_assets"] || hyr["_assets"]);
   if (rootMapping && typeof rootMapping === "object") {
     const p = loadModuleAssets(rootMapping);
     if (p) {
       gatherHydratable(element, options.renderId);
+      const registry = solidJs.sharedConfig.registry;
+      const gather = solidJs.sharedConfig.gather;
       let disposer;
       p.then(() => {
+        solidJs.sharedConfig.registry = registry;
+        solidJs.sharedConfig.gather = gather;
+        solidJs.sharedConfig.hydrating = true;
         try {
           disposer = render$1(code, element, [...element.childNodes], options);
         } finally {

package/dist/dev.js

@@ -1176,13 +1176,19 @@ function hydrate$1(code, element, options = {}) {
       }
     };
   }
-  const rootMapping = globalThis._$HY.r && globalThis._$HY.r["_assets"];
+  const hyr = globalThis._$HY.r;
+  const rootMapping = hyr && (hyr[options.renderId + "_assets"] || hyr["_assets"]);
   if (rootMapping && typeof rootMapping === "object") {
     const p = loadModuleAssets(rootMapping);
     if (p) {
       gatherHydratable(element, options.renderId);
+      const registry = sharedConfig.registry;
+      const gather = sharedConfig.gather;
       let disposer;
       p.then(() => {
+        sharedConfig.registry = registry;
+        sharedConfig.gather = gather;
+        sharedConfig.hydrating = true;
         try {
           disposer = render$1(code, element, [...element.childNodes], options);
         } finally {

package/dist/server.cjs

@@ -965,7 +965,7 @@ function renderToString(code, options = {}) {
   }, {
     id: renderId
   });
-  serializeFragmentAssets("", tracking.boundaryModules, solidJs.sharedConfig.context);
+  serializeFragmentAssets("", tracking.boundaryModules, solidJs.sharedConfig.context, renderId);
   solidJs.sharedConfig.context.noHydrate = true;
   serializer.close();
   const head = renderShellHead(headRegistry, nonce, null);
@@ -1101,7 +1101,7 @@ function renderToStream(code, options = {}) {
   const serializeRootAssets = () => {
     if (rootAssetsSerialized) return;
     rootAssetsSerialized = true;
-    serializeFragmentAssets("", tracking.boundaryModules, context);
+    serializeFragmentAssets("", tracking.boundaryModules, context, renderId);
   };
   let holds = 0;
   const flushEnd = () => {
@@ -2420,10 +2420,10 @@ function renderHeadAssets(emittedAssets, inlineStyles, nonce) {
   }
   return head;
 }
-function serializeFragmentAssets(key, boundaryModules, context) {
+function serializeFragmentAssets(key, boundaryModules, context, name = key) {
   const map = boundaryModules.get(key);
   if (!map || !Object.keys(map).length) return;
-  context.serialize(key + "_assets", map);
+  context.serialize(name + "_assets", map);
 }
 function propagateBoundaryStyles(childKey, parentKey, tracking) {
   const childStyles = tracking.getBoundaryStyles(childKey);

package/dist/server.js

@@ -964,7 +964,7 @@ function renderToString(code, options = {}) {
   }, {
     id: renderId
   });
-  serializeFragmentAssets("", tracking.boundaryModules, sharedConfig.context);
+  serializeFragmentAssets("", tracking.boundaryModules, sharedConfig.context, renderId);
   sharedConfig.context.noHydrate = true;
   serializer.close();
   const head = renderShellHead(headRegistry, nonce, null);
@@ -1100,7 +1100,7 @@ function renderToStream(code, options = {}) {
   const serializeRootAssets = () => {
     if (rootAssetsSerialized) return;
     rootAssetsSerialized = true;
-    serializeFragmentAssets("", tracking.boundaryModules, context);
+    serializeFragmentAssets("", tracking.boundaryModules, context, renderId);
   };
   let holds = 0;
   const flushEnd = () => {
@@ -2419,10 +2419,10 @@ function renderHeadAssets(emittedAssets, inlineStyles, nonce) {
   }
   return head;
 }
-function serializeFragmentAssets(key, boundaryModules, context) {
+function serializeFragmentAssets(key, boundaryModules, context, name = key) {
   const map = boundaryModules.get(key);
   if (!map || !Object.keys(map).length) return;
-  context.serialize(key + "_assets", map);
+  context.serialize(name + "_assets", map);
 }
 function propagateBoundaryStyles(childKey, parentKey, tracking) {
   const childStyles = tracking.getBoundaryStyles(childKey);

package/dist/web.cjs

@@ -1158,13 +1158,19 @@ function hydrate$1(code, element, options = {}) {
     });
   };
   solidJs.sharedConfig.hydrating = true;
-  const rootMapping = globalThis._$HY.r && globalThis._$HY.r["_assets"];
+  const hyr = globalThis._$HY.r;
+  const rootMapping = hyr && (hyr[options.renderId + "_assets"] || hyr["_assets"]);
   if (rootMapping && typeof rootMapping === "object") {
     const p = loadModuleAssets(rootMapping);
     if (p) {
       gatherHydratable(element, options.renderId);
+      const registry = solidJs.sharedConfig.registry;
+      const gather = solidJs.sharedConfig.gather;
       let disposer;
       p.then(() => {
+        solidJs.sharedConfig.registry = registry;
+        solidJs.sharedConfig.gather = gather;
+        solidJs.sharedConfig.hydrating = true;
         try {
           disposer = render$1(code, element, [...element.childNodes], options);
         } finally {

package/dist/web.js

@@ -1157,13 +1157,19 @@ function hydrate$1(code, element, options = {}) {
     });
   };
   sharedConfig.hydrating = true;
-  const rootMapping = globalThis._$HY.r && globalThis._$HY.r["_assets"];
+  const hyr = globalThis._$HY.r;
+  const rootMapping = hyr && (hyr[options.renderId + "_assets"] || hyr["_assets"]);
   if (rootMapping && typeof rootMapping === "object") {
     const p = loadModuleAssets(rootMapping);
     if (p) {
       gatherHydratable(element, options.renderId);
+      const registry = sharedConfig.registry;
+      const gather = sharedConfig.gather;
       let disposer;
       p.then(() => {
+        sharedConfig.registry = registry;
+        sharedConfig.gather = gather;
+        sharedConfig.hydrating = true;
         try {
           disposer = render$1(code, element, [...element.childNodes], options);
         } finally {

package/frames/dist/server.cjs

@@ -1065,7 +1065,7 @@ function renderToStream(code, options = {}) {
   const serializeRootAssets = () => {
     if (rootAssetsSerialized) return;
     rootAssetsSerialized = true;
-    serializeFragmentAssets("", tracking.boundaryModules, context);
+    serializeFragmentAssets("", tracking.boundaryModules, context, renderId);
   };
   let holds = 0;
   const flushEnd = () => {
@@ -2282,10 +2282,10 @@ function renderHeadAssets(emittedAssets, inlineStyles, nonce) {
   }
   return head;
 }
-function serializeFragmentAssets(key, boundaryModules, context) {
+function serializeFragmentAssets(key, boundaryModules, context, name = key) {
   const map = boundaryModules.get(key);
   if (!map || !Object.keys(map).length) return;
-  context.serialize(key + "_assets", map);
+  context.serialize(name + "_assets", map);
 }
 function propagateBoundaryStyles(childKey, parentKey, tracking) {
   const childStyles = tracking.getBoundaryStyles(childKey);

package/frames/dist/server.js

@@ -1063,7 +1063,7 @@ function renderToStream(code, options = {}) {
   const serializeRootAssets = () => {
     if (rootAssetsSerialized) return;
     rootAssetsSerialized = true;
-    serializeFragmentAssets("", tracking.boundaryModules, context);
+    serializeFragmentAssets("", tracking.boundaryModules, context, renderId);
   };
   let holds = 0;
   const flushEnd = () => {
@@ -2280,10 +2280,10 @@ function renderHeadAssets(emittedAssets, inlineStyles, nonce) {
   }
   return head;
 }
-function serializeFragmentAssets(key, boundaryModules, context) {
+function serializeFragmentAssets(key, boundaryModules, context, name = key) {
   const map = boundaryModules.get(key);
   if (!map || !Object.keys(map).length) return;
-  context.serialize(key + "_assets", map);
+  context.serialize(name + "_assets", map);
 }
 function propagateBoundaryStyles(childKey, parentKey, tracking) {
   const childStyles = tracking.getBoundaryStyles(childKey);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/web",
   "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
-  "version": "2.0.0-beta.33",
+  "version": "2.0.0-beta.34",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -378,10 +378,10 @@
     "seroval-plugins": "~1.5.4"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.33"
+    "solid-js": "^2.0.0-beta.34"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.33"
+    "solid-js": "2.0.0-beta.34"
   },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy-jsx build:js",