sort-comp #1858 PR amendments

jsx-eslint · Jul 4, 2018 · 76a4120 · 76a4120
1 parent 98ce807
commit 76a4120
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/rules/sort-comp.js b/lib/rules/sort-comp.js
@@ -8,6 +8,7 @@ const has = require('has');
 const util = require('util');
 
 const Components = require('../util/Components');
+const arrayIncludes = require('array-includes');
 const astUtil = require('../util/ast');
 const docsUrl = require('../util/docsUrl');
 
@@ -158,7 +159,7 @@ module.exports = {
           if (method.instanceMethod) {
             methodGroupIndexes.push(groupIndex);
           }
-        } else if ([
+        } else if (arrayIncludes([
           'displayName',
           'propTypes',
           'contextTypes',
@@ -185,7 +186,7 @@ module.exports = {
           'componentDidCatch',
           'componentWillUnmount',
           'render'
-        ].includes(currentGroup)) {
+        ], currentGroup)) {
           if (currentGroup === method.name) {
             methodGroupIndexes.push(groupIndex);
           }

diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/yannickcr/eslint-plugin-react",
   "bugs": "https://github.com/yannickcr/eslint-plugin-react/issues",
   "dependencies": {
+    "array-includes": "^3.0.3",
     "doctrine": "^2.1.0",
     "has": "^1.0.3",
     "jsx-ast-utils": "^2.0.1",