[Fix] support JSXText nodes alongside Literal nodes

jsx-eslint · Jun 25, 2018 · dc59667 · dc59667
1 parent 2889e89
commit dc59667
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/lib/rules/forbid-foreign-prop-types.js b/lib/rules/forbid-foreign-prop-types.js
@@ -81,7 +81,7 @@ module.exports = {
             !isLeftSideOfAssignment(node) &&
             !isAllowedAssignment(node)
           ) || (
-            node.property.type === 'Literal' &&
+            (node.property.type === 'Literal' || node.property.type === 'JSXText') &&
             node.property.value === 'propTypes' &&
             !isLeftSideOfAssignment(node) &&
             !isAllowedAssignment(node)

diff --git a/lib/rules/jsx-curly-brace-presence.js b/lib/rules/jsx-curly-brace-presence.js
@@ -171,7 +171,7 @@ module.exports = {
       const parentType = JSXExpressionNode.parent.type;
 
       if (
-        expressionType === 'Literal' &&
+        (expressionType === 'Literal' || expressionType === 'JSXText') &&
           typeof expression.value === 'string' &&
           !needToEscapeCharacterForJSX(expression.raw) && (
           parentType === 'JSXElement' ||
@@ -246,13 +246,7 @@ module.exports = {
         }
       },
 
-      Literal: node => {
-        if (shouldCheckForMissingCurly(node.parent, userConfig)) {
-          reportMissingCurly(node);
-        }
-      },
-
-      JSXText: node => {
+      'Literal, JSXText': node => {
         if (shouldCheckForMissingCurly(node.parent, userConfig)) {
           reportMissingCurly(node);
         }

diff --git a/lib/rules/no-unescaped-entities.js b/lib/rules/no-unescaped-entities.js
@@ -71,13 +71,7 @@ module.exports = {
     }
 
     return {
-      Literal: function(node) {
-        if (node.parent.type === 'JSXElement') {
-          reportInvalidEntity(node);
-        }
-      },
-
-      JSXText: function(node) {
+      'Literal, JSXText': function(node) {
         if (node.parent.type === 'JSXElement') {
           reportInvalidEntity(node);
         }