babel-plugin-jsx-dom-expressions 0.35.16 → 0.36.0-beta.1

package/index.js

@@ -2,8 +2,8 @@
 
 var SyntaxJSX = require('@babel/plugin-syntax-jsx');
 var t = require('@babel/types');
-var helperModuleImports = require('@babel/helper-module-imports');
 var htmlEntities = require('html-entities');
+var helperModuleImports = require('@babel/helper-module-imports');
 
 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(value.value, true))}"` : "";
+          results.template += value ? `="${escapeBackticks(escapeHTML(htmlEntities.decode(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(value.value, true)}"` : "");
+      appendToTemplate(results.template, value ? `="${escapeHTML(htmlEntities.decode(value.value), true)}"` : "");
     }
   });
   if (!hasChildren && children) {
@@ -3032,11 +3032,15 @@ function transformComponentChildren(children, config) {
   const filteredChildren = filterChildren(children);
   if (!filteredChildren.length) return;
   let dynamic = false;
+  let pathNodes = [];
 
   let transformedChildren = 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) {
+        pathNodes.push(path.node);
+        memo.push(t__namespace.stringLiteral(v));
+      }
     } else {
       const child = transformNode(path, {
         topLevel: true,
@@ -3051,6 +3055,7 @@ function transformComponentChildren(children, config) {
       ) {
         child.exprs[0] = child.exprs[0].body;
       }
+      pathNodes.push(path.node);
       memo.push(getCreateTemplate(config, path, child)(path, child, filteredChildren.length > 1));
     }
     return memo;
@@ -3059,9 +3064,9 @@ function transformComponentChildren(children, config) {
   if (transformedChildren.length === 1) {
     transformedChildren = transformedChildren[0];
     if (
-      !t__namespace.isJSXExpressionContainer(filteredChildren[0]) &&
-      !t__namespace.isJSXSpreadChild(filteredChildren[0]) &&
-      !t__namespace.isJSXText(filteredChildren[0])
+      !t__namespace.isJSXExpressionContainer(pathNodes[0]) &&
+      !t__namespace.isJSXSpreadChild(pathNodes[0]) &&
+      !t__namespace.isJSXText(pathNodes[0])
     ) {
       transformedChildren =
         t__namespace.isCallExpression(transformedChildren) &&

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.16",
+  "version": "0.36.0-beta.1",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -31,5 +31,5 @@
   "devDependencies": {
     "@babel/core": "^7.20.12"
   },
-  "gitHead": "764c717918d199a630bb0c7f85c7b8f772ef9e07"
+  "gitHead": "4078ad633c680e06c87ae5e7749c4f6e027f61e8"
 }