[Fix] Don’t rely on Array#find existing pre node 4.

Fixes #999.
jsx-eslint · Dec 13, 2016 · cc2be3b · cc2be3b
1 parent 466ab7f
commit cc2be3b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,5 +3,10 @@ node_js:
   - '6'
   - '5'
   - '4'
+  - 'iojs'
+  - '0.12'
+  - '0.10'
+before_script:
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "iojs" ] || [ "${TRAVIS_NODE_VERSION}" = "0.12" ] || [ "${TRAVIS_NODE_VERSION}" = "0.10" ]; then npm install eslint@2; fi'
 after_success:
   - npm run coveralls
diff --git a/lib/rules/no-children-prop.js b/lib/rules/no-children-prop.js
@@ -4,6 +4,8 @@
  */
 'use strict';
 
+var find = require('array.prototype.find');
+
 // ------------------------------------------------------------------------------
 // Helpers
 // ------------------------------------------------------------------------------
@@ -53,7 +55,7 @@ module.exports = {
         }
 
         var props = node.arguments[1].properties;
-        var childrenProp = props.find(function(prop) {
+        var childrenProp = find(props, function(prop) {
           return prop.key && prop.key.name === 'children';
         });
 

diff --git a/lib/rules/no-danger-with-children.js b/lib/rules/no-danger-with-children.js
@@ -4,6 +4,7 @@
  */
 'use strict';
 
+var find = require('array.prototype.find');
 var variableUtil = require('../util/variable');
 
 // ------------------------------------------------------------------------------
@@ -20,7 +21,7 @@ module.exports = {
   },
   create: function(context) {
     function findSpreadVariable(name) {
-      return variableUtil.variablesInScope(context).find(function (item) {
+      return find(variableUtil.variablesInScope(context), function (item) {
         return item.name === name;
       });
     }
@@ -33,7 +34,7 @@ module.exports = {
       if (!node.properties) {
         return false;
       }
-      return node.properties.find(function(prop) {
+      return find(node.properties, function(prop) {
         if (prop.type === 'Property') {
           return prop.key.name === propName;
         } else if (prop.type === 'ExperimentalSpreadProperty') {
@@ -53,7 +54,7 @@ module.exports = {
      */
     function findJsxProp(node, propName) {
       var attributes = node.openingElement.attributes;
-      return attributes.find(function (attribute) {
+      return find(attributes, function (attribute) {
         if (attribute.type === 'JSXSpreadAttribute') {
           var variable = findSpreadVariable(attribute.argument.name);
           if (variable && variable.defs.length && variable.defs[0].node.init) {
@@ -94,7 +95,7 @@ module.exports = {
           var props = node.arguments[1];
 
           if (props.type === 'Identifier') {
-            var variable = variableUtil.variablesInScope(context).find(function (item) {
+            var variable = find(variableUtil.variablesInScope(context), function (item) {
               return item.name === props.name;
             });
             if (variable && variable.defs[0].node.init) {

diff --git a/lib/rules/require-default-props.js b/lib/rules/require-default-props.js
@@ -4,6 +4,7 @@
  */
 'use strict';
 
+var find = require('array.prototype.find');
 var Components = require('../util/Components');
 var variableUtil = require('../util/variable');
 var annotations = require('../util/annotations');
@@ -57,7 +58,7 @@ module.exports = {
      * @returns {ASTNode|null} Return null if the variable could not be found, ASTNode otherwise.
      */
     function findVariableByName(name) {
-      var variable = variableUtil.variablesInScope(context).find(function(item) {
+      var variable = find(variableUtil.variablesInScope(context), function(item) {
         return item.name === name;
       });
 
@@ -188,7 +189,7 @@ module.exports = {
      *                                     from this ObjectExpression can't be resolved.
      */
     function getDefaultPropsFromObjectExpression(objectExpression) {
-      var hasSpread = objectExpression.properties.find(function(property) {
+      var hasSpread = find(objectExpression.properties, function(property) {
         return property.type === 'ExperimentalSpreadProperty';
       });
 

diff --git a/lib/rules/style-prop-object.js b/lib/rules/style-prop-object.js
@@ -4,6 +4,7 @@
  */
 'use strict';
 
+var find = require('array.prototype.find');
 var variableUtil = require('../util/variable');
 
 // ------------------------------------------------------------------------------
@@ -25,7 +26,7 @@ module.exports = {
      * @param {object} node A Identifier node
      */
     function checkIdentifiers(node) {
-      var variable = variableUtil.variablesInScope(context).find(function (item) {
+      var variable = find(variableUtil.variablesInScope(context), function (item) {
         return item.name === node.name;
       });
 
@@ -47,7 +48,7 @@ module.exports = {
           && node.arguments.length > 1
         ) {
           if (node.arguments[1].type === 'ObjectExpression') {
-            var style = node.arguments[1].properties.find(function(property) {
+            var style = find(node.arguments[1].properties, function(property) {
               return property.key && property.key.name === 'style' && !property.computed;
             });
             if (style) {

diff --git a/package.json b/package.json
@@ -24,12 +24,13 @@
   "bugs": "https://github.com/yannickcr/eslint-plugin-react/issues",
   "dependencies": {
     "doctrine": "^1.2.2",
-    "jsx-ast-utils": "^1.3.4"
+    "jsx-ast-utils": "^1.3.4",
+    "array.prototype.find": "^2.0.1"
   },
   "devDependencies": {
     "babel-eslint": "7.1.1",
     "coveralls": "2.11.15",
-    "eslint": "3.11.1",
+    "eslint": "^2.0.0 || ^3.0.0",
     "istanbul": "0.4.5",
     "mocha": "3.2.0"
   },