babel-plugin-jsx-dom-expressions 0.34.0 → 0.34.5

package/index.js

@@ -1416,9 +1416,18 @@ function registerTemplate(path, results) {
             templateId ? [templateId] : []
           )
         : results.hasCustomElement
-        ? t__namespace.callExpression(t__namespace.memberExpression(t__namespace.identifier("document"), t__namespace.identifier("importNode")), [
-            templateId, t__namespace.booleanLiteral(true)
-          ])
+        ? t__namespace.callExpression(
+            registerImportMethod(path, "untrack", getRendererConfig(path, "dom").moduleName),
+            [
+              t__namespace.arrowFunctionExpression(
+                [],
+                t__namespace.callExpression(
+                  t__namespace.memberExpression(t__namespace.identifier("document"), t__namespace.identifier("importNode")),
+                  [templateId, t__namespace.booleanLiteral(true)]
+                )
+              )
+            ]
+          )
         : t__namespace.callExpression(t__namespace.memberExpression(templateId, t__namespace.identifier("cloneNode")), [
             t__namespace.booleanLiteral(true)
           ])
@@ -1439,9 +1448,14 @@ function wrapDynamics$1(path, dynamics) {
       dynamics[0].key === "classList" || dynamics[0].key === "style"
         ? t__namespace.identifier("_$p")
         : undefined;
-    if (dynamics[0].key.startsWith("class:") && !t__namespace.isBooleanLiteral(dynamics[0].value) && !t__namespace.isUnaryExpression(dynamics[0].value)) {
+    if (
+      dynamics[0].key.startsWith("class:") &&
+      !t__namespace.isBooleanLiteral(dynamics[0].value) &&
+      !t__namespace.isUnaryExpression(dynamics[0].value)
+    ) {
       dynamics[0].value = t__namespace.unaryExpression("!", t__namespace.unaryExpression("!", dynamics[0].value));
     }
+
     return t__namespace.expressionStatement(
       t__namespace.callExpression(effectWrapperId, [
         t__namespace.arrowFunctionExpression(
@@ -1464,7 +1478,8 @@ function wrapDynamics$1(path, dynamics) {
     const identifier = path.scope.generateUidIdentifier("v$");
     if (key.startsWith("class:") && !t__namespace.isBooleanLiteral(value) && !t__namespace.isUnaryExpression(value)) {
       value = t__namespace.unaryExpression("!", t__namespace.unaryExpression("!", value));
-    }    identifiers.push(identifier);
+    }
+    identifiers.push(identifier);
     decls.push(t__namespace.variableDeclarator(identifier, value));
     if (key === "classList" || key === "style") {
       const prev = t__namespace.memberExpression(prevId, identifier);
@@ -1570,12 +1585,12 @@ function appendToTemplate(template, value) {
 }
 
 function transformElement$2(path, info) {
+  const config = getConfig(path);
   // contains spread attributes
   if (path.node.openingElement.attributes.some(a => t__namespace.isJSXSpreadAttribute(a)))
-    return createElement(path, info);
+    return createElement(path, { ...info, ...config });
 
   const tagName = getTagName(path.node),
-    config = getConfig(path),
     voidTag = VoidElements.indexOf(tagName) > -1,
     results = {
       template: [`<${tagName}`],
@@ -1593,7 +1608,7 @@ function transformElement$2(path, info) {
       t__namespace.callExpression(registerImportMethod(path, "ssrHydrationKey"), [])
     );
   }
-  transformAttributes$1(path, results);
+  transformAttributes$1(path, results, { ...config, ...info });
   appendToTemplate(results.template, ">");
   if (!voidTag) {
     transformChildren$1(path, results, { ...config, ...info });
@@ -1761,7 +1776,7 @@ function normalizeAttributes(path) {
   return attributes;
 }
 
-function transformAttributes$1(path, results) {
+function transformAttributes$1(path, results, info) {
   const tagName = getTagName(path.node),
     isSVG = SVGElements.has(tagName),
     hasChildren = path.node.children.length > 0,
@@ -1798,8 +1813,11 @@ function transformAttributes$1(path, results) {
       )
         return;
       else if (ChildProperties.has(key)) {
-        children = value;
+        if (info.hydratable && key === "textContent" && value && value.expression) {
+          value.expression = t__namespace.logicalExpression("||", value.expression, t__namespace.stringLiteral(" "));
+        }
         if (key === "innerHTML") path.doNotEscape = true;
+        children = value;
       } else {
         let doEscape = true;
         if (BooleanAttributes.has(key)) {
@@ -1926,6 +1944,8 @@ function transformClasslistObject(path, expr, values, quasis) {
 function transformChildren$1(path, results, { hydratable }) {
   const doNotEscape = path.doNotEscape;
   const filteredChildren = filterChildren(path.get("children"));
+  const multi = checkLength(filteredChildren),
+    markers = hydratable && multi;
   filteredChildren.forEach(node => {
     if (t__namespace.isJSXElement(node.node) && getTagName(node.node) === "head") {
       const child = transformNode(node, { doNotEscape, hydratable: false });
@@ -1950,9 +1970,6 @@ function transformChildren$1(path, results, { hydratable }) {
     appendToTemplate(results.template, child.template);
     results.templateValues.push.apply(results.templateValues, child.templateValues || []);
     if (child.exprs.length) {
-      const multi = checkLength(filteredChildren),
-        markers = hydratable && multi;
-
       if (!doNotEscape) child.exprs[0] = escapeExpression(path, child.exprs[0]);
 
       // boxed by textNodes
@@ -1969,19 +1986,24 @@ function transformChildren$1(path, results, { hydratable }) {
   });
 }
 
-function createElement(path, { topLevel }) {
+function createElement(path, { topLevel, hydratable }) {
   const tagName = getTagName(path.node),
     config = getConfig(path),
     attributes = normalizeAttributes(path);
 
   const filteredChildren = filterChildren(path.get("children")),
+    multi = checkLength(filteredChildren),
+    markers = hydratable && multi,
     childNodes = filteredChildren.reduce((memo, path) => {
       if (t__namespace.isJSXText(path.node)) {
         const v = htmlEntities.decode(trimWhitespace(path.node.extra.raw));
         if (v.length) memo.push(t__namespace.stringLiteral(v));
       } else {
         const child = transformNode(path);
+        if (markers && child.exprs.length) memo.push(t__namespace.stringLiteral("<!--#-->"));
+        if (hydratable && child.exprs.length) child.exprs[0] = t__namespace.arrowFunctionExpression([], child.exprs[0]);
         memo.push(getCreateTemplate(config, path, child)(path, child, true));
+        if (markers && child.exprs.length) memo.push(t__namespace.stringLiteral("<!--/-->"));
       }
       return memo;
     }, []);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-plugin-jsx-dom-expressions",
   "description": "A JSX to DOM plugin that wraps expressions for fine grained change detection",
-  "version": "0.34.0",
+  "version": "0.34.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -27,5 +27,5 @@
   "peerDependencies": {
     "@babel/core": "^7.0.0"
   },
-  "gitHead": "4a2f5a8af46437c71b0c30a5242213fc87669515"
+  "gitHead": "cf98663093139bb1d6847359732b2f7235d30b61"
 }