babel-plugin-jsx-dom-expressions 0.30.6 → 0.31.0-beta.0

package/index.js

@@ -319,12 +319,13 @@ function isDynamic(path, { checkMember, checkTags, checkCallExpressions = true,
 
 function getStaticExpression(path) {
   const node = path.node;
-  let value;
+  let value, type;
   return (
     t__namespace.isJSXExpressionContainer(node) &&
     t__namespace.isJSXElement(path.parent) &&
     !isComponent(getTagName(path.parent)) &&
     (value = path.get("expression").evaluate().value) !== undefined &&
+    ((type = typeof value) === "string" || type === "number") &&
     value
   );
 }
@@ -447,9 +448,7 @@ function transformCondition(path, inline, deep) {
       nextPath.node.left = t__namespace.callExpression(id, []);
     }
   }
-  if (dTest) {
-    if (inline) return t__namespace.arrowFunctionExpression([], expr);
-
+  if (dTest && !inline) {
     const statements = [
       t__namespace.variableDeclaration("const", [
         t__namespace.variableDeclarator(
@@ -1099,6 +1098,7 @@ function transformChildren$2(path, results, config) {
     if (!child) return;
     results.template += child.template;
     if (child.id) {
+      if (child.tagName === "head") return;
       if (config.hydratable && tagName === "html") {
         registerImportMethod(path, "getNextMatch");
       }
@@ -1450,6 +1450,52 @@ function wrapDynamics$1(path, dynamics) {
   );
 }
 
+function createTemplate$1(path, result) {
+  if (!result.template) {
+    return result.exprs[0];
+  }
+
+  let template, id;
+
+  registerImportMethod(path, "ssr");
+  if (!Array.isArray(result.template)) {
+    template = t__namespace.stringLiteral(result.template);
+  } else if (result.template.length === 1) {
+    template = t__namespace.stringLiteral(result.template[0]);
+  } else {
+    const strings = result.template.map(tmpl => t__namespace.stringLiteral(tmpl));
+    template = t__namespace.arrayExpression(strings);
+  }
+
+  const templates =
+      path.scope.getProgramParent().data.templates ||
+      (path.scope.getProgramParent().data.templates = []);
+  const found = templates.find(tmp => {
+    if (t__namespace.isArrayExpression(tmp[1]) && t__namespace.isArrayExpression(template)) {
+      return tmp[1].elements.every(
+        (el, i) => template.elements[i] && el.value === template.elements[i].value
+      );
+    }
+    return tmp[1].value === template.value;
+  });
+  if (!found) {
+    id = path.scope.generateUidIdentifier("tmpl$");
+    templates.push([id, template]);
+  } else id = found[0];
+
+  return t__namespace.callExpression(
+    t__namespace.identifier(`_$ssr`),
+    result.template.length > 1 ? [id, ...result.templateValues] : [id]
+  );
+}
+
+function appendTemplates(path, templates) {
+  const declarators = templates.map(template => {
+    return t__namespace.variableDeclarator(template[0], template[1]);
+  });
+  path.node.body.unshift(t__namespace.variableDeclaration("const", declarators));
+}
+
 function appendToTemplate(template, value) {
   let array;
   if (Array.isArray(value)) {
@@ -1468,7 +1514,8 @@ function transformElement$1(path, info) {
       templateValues: [],
       decl: [],
       exprs: [],
-      dynamics: []
+      dynamics: [],
+      tagName
     };
   if (info.topLevel && config.hydratable) {
     registerImportMethod(path, "ssrHydrationKey");
@@ -1478,7 +1525,7 @@ function transformElement$1(path, info) {
   transformAttributes$1(path, results);
   appendToTemplate(results.template, ">");
   if (!voidTag) {
-    transformChildren$1(path, results, config);
+    transformChildren$1(path, results, {...config, ...info});
     appendToTemplate(results.template, `</${tagName}>`);
   }
   return results;
@@ -1815,6 +1862,24 @@ function transformChildren$1(path, results, { hydratable }) {
   const doNotEscape = path.doNotEscape;
   const filteredChildren = filterChildren(path.get("children"));
   filteredChildren.forEach(node => {
+    if (t__namespace.isJSXElement(node.node) && (getTagName(node.node) === "head")) {
+      const child = transformNode(node, { doNotEscape, hydratable: false });
+      registerImportMethod(path, "NoHydration");
+      results.template.push("");
+      results.templateValues.push(
+        t__namespace.callExpression(t__namespace.identifier("_$NoHydration"), [
+          t__namespace.objectExpression([
+            t__namespace.objectMethod(
+              "get",
+              t__namespace.identifier("children"),
+              [],
+              t__namespace.blockStatement([t__namespace.returnStatement(createTemplate$1(path, child))])
+            )
+          ])
+        ])
+      );
+      return;
+    }
     const child = transformNode(node, { doNotEscape });
     appendToTemplate(results.template, child.template);
     results.templateValues.push.apply(results.templateValues, child.templateValues || []);
@@ -1838,52 +1903,6 @@ function transformChildren$1(path, results, { hydratable }) {
   });
 }
 
-function createTemplate$1(path, result) {
-  if (!result.template) {
-    return result.exprs[0];
-  }
-
-  let template, id;
-
-  registerImportMethod(path, "ssr");
-  if (!Array.isArray(result.template)) {
-    template = t__namespace.stringLiteral(result.template);
-  } else if (result.template.length === 1) {
-    template = t__namespace.stringLiteral(result.template[0]);
-  } else {
-    const strings = result.template.map(tmpl => t__namespace.stringLiteral(tmpl));
-    template = t__namespace.arrayExpression(strings);
-  }
-
-  const templates =
-      path.scope.getProgramParent().data.templates ||
-      (path.scope.getProgramParent().data.templates = []);
-  const found = templates.find(tmp => {
-    if (t__namespace.isArrayExpression(tmp[1]) && t__namespace.isArrayExpression(template)) {
-      return tmp[1].elements.every(
-        (el, i) => template.elements[i] && el.value === template.elements[i].value
-      );
-    }
-    return tmp[1].value === template.value;
-  });
-  if (!found) {
-    id = path.scope.generateUidIdentifier("tmpl$");
-    templates.push([id, template]);
-  } else id = found[0];
-
-  return t__namespace.callExpression(
-    t__namespace.identifier(`_$ssr`),
-    result.template.length > 1 ? [id, ...result.templateValues] : [id]
-  );
-}
-
-function appendTemplates(path, templates) {
-  const declarators = templates.map(template => {
-    return t__namespace.variableDeclarator(template[0], template[1]);
-  });
-  path.node.body.unshift(t__namespace.variableDeclaration("const", declarators));
-}
-
 function transformElement(path, info) {
   let tagName = getTagName(path.node),
     results = {
@@ -2451,7 +2470,7 @@ function transformFragmentChildren(children, results, config) {
         if (v.length) memo.push(t__namespace.stringLiteral(v));
       } else {
         const child = transformNode(path, { topLevel: true, fragmentChild: true });
-        memo.push(createTemplate$3(path, child, !singleChild));
+        memo.push(createTemplate$3(path, child, true));
       }
       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.30.6",
+  "version": "0.31.0-beta.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,5 +23,5 @@
     "@babel/types": "^7.11.5",
     "html-entities": "2.3.2"
   },
-  "gitHead": "a2cc48a877bd4edff32f398c6c84d0b7bf6d584e"
+  "gitHead": "bdb5b31867eb9002d0f87738a23d912ed025211b"
 }