babel-plugin-jsx-dom-expressions 0.35.17 → 0.35.19

package/index.js

@@ -2,8 +2,8 @@
 
 var SyntaxJSX = require('@babel/plugin-syntax-jsx');
 var t = require('@babel/types');
-var htmlEntities = require('html-entities');
 var helperModuleImports = require('@babel/helper-module-imports');
+var htmlEntities = require('html-entities');
 
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
@@ -1181,7 +1181,7 @@ function transformAttributes$2(path, results) {
         } else {
           !isSVG && (key = key.toLowerCase());
           results.template += ` ${key}`;
-          results.template += value ? `="${escapeBackticks(escapeHTML(htmlEntities.decode(value.value), true))}"` : "";
+          results.template += value ? `="${escapeBackticks(escapeHTML(value.value, true))}"` : "";
         }
       }
     });
@@ -2126,7 +2126,7 @@ function transformAttributes$1(path, results, info) {
       if (t__namespace.isJSXExpressionContainer(value)) value = value.expression;
       key = toAttribute(key, isSVG);
       appendToTemplate(results.template, ` ${key}`);
-      appendToTemplate(results.template, value ? `="${escapeHTML(htmlEntities.decode(value.value), true)}"` : "");
+      appendToTemplate(results.template, value ? `="${escapeHTML(value.value, true)}"` : "");
     }
   });
   if (!hasChildren && children) {
@@ -2310,57 +2310,6 @@ function createElement(path, { topLevel, hydratable }) {
     if (props.length > 1 || dynamicSpread) {
       props = [t__namespace.callExpression(registerImportMethod(path, "mergeProps"), props)];
     }
-
-    // transformed = t.arrowFunctionExpression(
-    //   [],
-    //   t.objectExpression(
-    //     attributes.reduce((memo, attribute) => {
-    //       const node = attribute.node;
-
-    //       if (t.isJSXSpreadAttribute(node)) {
-    //         const expr = node.argument;
-    //         memo.push(t.spreadElement(expr));
-    //         return memo;
-    //       }
-    //       let value = node.value,
-    //         key = t.isJSXNamespacedName(node.name)
-    //           ? `${node.name.namespace.name}:${node.name.name.name}`
-    //           : node.name.name,
-    //         reservedNameSpace =
-    //           t.isJSXNamespacedName(node.name) && reservedNameSpaces.has(node.name.namespace.name);
-    //       if (
-    //         ((t.isJSXNamespacedName(node.name) && reservedNameSpace) || ChildProperties.has(key)) &&
-    //         !t.isJSXExpressionContainer(value)
-    //       ) {
-    //         node.value = value = t.JSXExpressionContainer(value || t.JSXEmptyExpression());
-    //       }
-
-    //       if (
-    //         t.isJSXExpressionContainer(value) &&
-    //         (reservedNameSpace ||
-    //           ChildProperties.has(key) ||
-    //           !(t.isStringLiteral(value.expression) || t.isNumericLiteral(value.expression)))
-    //       ) {
-    //         if (
-    //           key === "ref" ||
-    //           key.startsWith("use:") ||
-    //           key.startsWith("prop:") ||
-    //           key.startsWith("on")
-    //         )
-    //           return memo;
-
-    //         memo.push(t.objectProperty(t.stringLiteral(key), value.expression));
-    //       } else {
-    //         if (key === "$ServerOnly") return memo;
-    //         if (t.isJSXExpressionContainer(value)) value = value.expression;
-    //         memo.push(
-    //           t.objectProperty(t.stringLiteral(key), value ? value : t.booleanLiteral(true))
-    //         );
-    //       }
-    //       return memo;
-    //     }, [])
-    //   )
-    // );
   }
 
   const exprs = [
@@ -2890,7 +2839,8 @@ function transformComponent(path) {
             : node.argument
         );
       } else {
-        const value = node.value || t__namespace.booleanLiteral(true),
+        // handle weird babel bug around HTML entities
+        const value = (t__namespace.isStringLiteral(node.value) ? t__namespace.stringLiteral(node.value.value): node.value) || t__namespace.booleanLiteral(true),
           id = convertJSXIdentifier(node.name),
           key = id.name;
         if (hasChildren && key === "children") return;
@@ -3083,15 +3033,43 @@ function transformComponentChildren(children, config) {
   return [transformedChildren, dynamic];
 }
 
+function insertMarker(path, config, result) {
+  if (config.generate === "ssr") {
+    const open = { template: "<!---->", exprs: [] };
+    result.push(getCreateTemplate(config, path, open)(path, open, true));
+  } else {
+    result.push(t__namespace.stringLiteral("<!>"));
+  }
+}
+
 function transformFragmentChildren(children, results, config) {
+  let prevResult;
   const filteredChildren = filterChildren(children),
     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));
+        if (v.length) {
+          if (config.hydratable &&
+            prevResult &&
+            !prevResult.tagName &&
+            !prevResult.component &&
+            prevResult.exprs.length &&
+            !prevResult.spreadElement) insertMarker(path, config, memo);
+          memo.push(t__namespace.stringLiteral(v));
+          prevResult = v;
+        }
       } else {
         const child = transformNode(path, { topLevel: true, fragmentChild: true });
+        const insertMarkers =
+          config.hydratable &&
+          !child.component &&
+          child.exprs.length &&
+          !child.spreadElement &&
+          prevResult &&
+          (typeof prevResult !== "object" || !(prevResult.tagName || prevResult.component));
+        if (insertMarkers) insertMarker(path, config, memo);
         memo.push(getCreateTemplate(config, path, child)(path, child, true));
+        prevResult = child;
       }
       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.35.17",
+  "version": "0.35.19",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -31,5 +31,5 @@
   "devDependencies": {
     "@babel/core": "^7.20.12"
   },
-  "gitHead": "fbbe545542d31315282b78accbba552b686085b5"
+  "gitHead": "cd607bb1bc035812f1b8bfae3c75d60c5c52143c"
 }