dom-expressions 0.35.18 → 0.35.19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dom-expressions",
   "description": "A Fine-Grained Runtime for Performant DOM Rendering",
-  "version": "0.35.18",
+  "version": "0.35.19",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,8 +23,8 @@
     "csstype": "^3.0"
   },
   "devDependencies": {
-    "babel-plugin-jsx-dom-expressions": "^0.35.18",
+    "babel-plugin-jsx-dom-expressions": "^0.35.19",
     "csstype": "^3.1"
   },
-  "gitHead": "5e21b8cb58fbccc1f635bfdfd8904094e46edfea"
+  "gitHead": "cd607bb1bc035812f1b8bfae3c75d60c5c52143c"
 }

package/src/client.js

@@ -357,7 +357,7 @@ function eventHandler(e) {
   if (sharedConfig.registry && !sharedConfig.done) {
     sharedConfig.done = true;
     document.querySelectorAll("[id^=pl-]").forEach(elem => {
-      while(elem && elem.nodeType !== 8 && elem.nodeValue !== "pl-"+e) {
+      while (elem && elem.nodeType !== 8 && elem.nodeValue !== "pl-" + e) {
         let x = elem.nextSibling;
         elem.remove();
         elem = x;
@@ -477,7 +477,10 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else {
       // NOTE: is String better than `item + ''`, ``${item}``, `item.toString()` and `item.valueOf()`?
       const value = String(item);
-      if (prev && prev.nodeType === 3 && prev.data === value) {
+      if (value === "<!>") {
+        if (prev && prev.nodeType === 8) normalized.push(prev);
+      } else if (prev && prev.nodeType === 3) {
+        prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));
     }
@@ -523,7 +526,7 @@ export function getHydrationKey() {
 }
 
 export function NoHydration(props) {
-  return sharedConfig.context ? undefined : props.children
+  return sharedConfig.context ? undefined : props.children;
 }
 
 export function Hydration(props) {

package/src/server.js

@@ -1,5 +1,5 @@
 import { Aliases, BooleanAttributes, ChildProperties } from "./constants";
-import { sharedConfig } from "rxcore";
+import { sharedConfig, root } from "rxcore";
 import stringify from "./serializer";
 export { stringify };
 export { createComponent } from "rxcore";
@@ -23,7 +23,11 @@ export function renderToString(code, options = {}) {
       scripts += `_$HY.set("${id}", ${stringify(p)});`;
     }
   };
-  let html = resolveSSRNode(escape(code()));
+  let html = root((d) => {
+    resolveSSRNode(escape(code()))
+    d();
+    return r;
+  });
   sharedConfig.context.noHydrate = true;
   html = injectAssets(sharedConfig.context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
@@ -44,6 +48,7 @@ export function renderToStringAsync(code, options = {}) {
 
 export function renderToStream(code, options = {}) {
   let { nonce, onCompleteShell, onCompleteAll, renderId } = options;
+  let dispose;
   const blockingResources = [];
   const registry = new Map();
   const dedupe = new WeakMap();
@@ -58,6 +63,7 @@ export function renderToStream(code, options = {}) {
         });
       writable && writable.end();
       completed = true;
+      dispose();
     }
   };
   const pushTask = task => {
@@ -160,7 +166,10 @@ export function renderToStream(code, options = {}) {
     }
   };
 
-  let html = resolveSSRNode(escape(code()));
+  let html = root((d) => {
+    dispose = d;
+    return resolveSSRNode(escape(code()))
+  });
   function doShell() {
     sharedConfig.context = context;
     context.noHydrate = true;