babel-plugin-jsx-dom-expressions 0.40.10 → 0.40.11

package/index.js

@@ -409,6 +409,25 @@ function isComponent(tagName) {
 
 }
 
+// <script> and <style> are only raw text in HTML. Inside SVG the parser decodes
+// entities and treats `<` as markup, so their children still need escaping.
+function isRawTextElement(path) {
+  const tagName = getTagName(path.node);
+  if (tagName !== "script" && tagName !== "style") return false;
+  let parent = path.parentPath,
+    rootTag;
+  while (t__namespace.isJSXElement(parent.node)) {
+    const parentTag = getTagName(parent.node);
+    if (isComponent(parentTag)) break;
+    if (parentTag === "foreignObject") return true;
+    if (parentTag === "svg") return false;
+    rootTag = parentTag;
+    parent = parent.parentPath;
+  }
+  // a top-level SVG element is parsed inside an <svg> wrapper
+  return !rootTag || !SVGElements.has(rootTag);
+}
+
 function hasStaticMarker(object, path) {
   if (!object) return false;
   if (
@@ -1901,6 +1920,7 @@ function findLastElement(children, hydratable) {
 function transformChildren$2(path, results, config) {
   let tempPath = results.id && results.id.name,
     tagName = getTagName(path.node),
+    doNotEscape = isRawTextElement(path),
     nextPlaceholder,
     childPostExprs = [],
     i = 0;
@@ -1913,6 +1933,7 @@ function transformChildren$2(path, results, config) {
 
       }
       const transformed = transformNode(child, {
+        doNotEscape,
         toBeClosed: results.toBeClosed,
         lastElement: index === lastElement,
         skipId: !results.id || !detectExpressions(filteredChildren, index, config)
@@ -2542,7 +2563,7 @@ function transformElement$2(path, info) {
 
   const config = getConfig(path);
   const tagName = getTagName(path.node);
-  if (tagName === "script" || tagName === "style") path.doNotEscape = true;
+  if (isRawTextElement(path)) path.doNotEscape = true;
 
   // contains spread attributes
   if (path.node.openingElement.attributes.some((a) => t__namespace.isJSXSpreadAttribute(a)))
@@ -2841,8 +2862,11 @@ function transformAttributes$1(path, results, info) {
         let doEscape = true;
 
         if (key.startsWith("attr:")) key = key.replace("attr:", "");
-        if (BooleanAttributes.has(key) || key.startsWith("bool:")) {
-          key = key.replace("bool:", "");
+        // preservesPitch is a boolean property, but not an HTML boolean attribute.
+        const isBooleanAttribute =
+        key !== "preservesPitch" && BooleanAttributes.has(toAttribute(key, isSVG));
+        if (isBooleanAttribute || key.startsWith("bool:")) {
+          key = toAttribute(key.replace("bool:", ""), isSVG);
           results.template.push("");
           const fn = t__namespace.callExpression(registerImportMethod(attribute, "ssrAttribute"), [
           t__namespace.stringLiteral(key),
@@ -4068,7 +4092,7 @@ function transformNode(path, info = {}) {
     info.doNotEscape ?
     staticValue.toString() :
     escapeHTML(staticValue.toString()) :
-    trimWhitespace(node.extra.raw);
+    trimWhitespace(info.doNotEscape ? node.value : node.extra.raw);
     if (!text.length) return null;
     const results = {
       template: text,

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.40.10",
+  "version": "0.40.11",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -33,5 +33,5 @@
     "@rollup/plugin-babel": "6.0.3",
     "@types/babel__core": "^7.20.5"
   },
-  "gitHead": "727298ff79a54ef5299d3649ab7f4105a326e9b3"
+  "gitHead": "3eba17b37754abaae2346c0237a4a65de802a316"
 }