Remove flow version and decide the Props argument location based on the number of TypedArguments

Author: jseminck

lib/rules/prop-types.js

@@ -11,7 +11,6 @@ const has = require('has');
 const Components = require('../util/Components');
 const variable = require('../util/variable');
 const annotations = require('../util/annotations');
-const flowVersionUtil = require('../util/flowVersion');
 
 // ------------------------------------------------------------------------------
 // Constants
@@ -859,7 +858,10 @@ module.exports = {
      */
     function resolveSuperParameterPropsType(node) {
       let annotation;
-      if (flowVersionUtil.test(context, '0.53.0')) {
+
+      // Flow <=0.52 had 3 required TypedParameters of which the second one is the Props.
+      // Flow >=0.53 has 2 optional TypedParameters of which the first one is the Props.
+      if (node.superTypeParameters.params.length <= 2) {
         annotation = node.superTypeParameters.params[0];
       } else {
         annotation = node.superTypeParameters.params[1];

lib/util/flowVersion.js

@@ -1486,7 +1486,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1500,7 +1499,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1516,7 +1514,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1537,7 +1534,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1550,7 +1546,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1561,7 +1556,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     },
     {
@@ -1576,7 +1570,6 @@ ruleTester.run('prop-types', rule, {
           }
         }
       `,
-      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
     }, {
       code: `
@@ -1590,7 +1583,6 @@ ruleTester.run('prop-types', rule, {
           }
         }
       `,
-      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
     },
     // issue #1288
@@ -2872,7 +2864,6 @@ ruleTester.run('prop-types', rule, {
         column: 35,
         type: 'Identifier'
       }],
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2892,7 +2883,6 @@ ruleTester.run('prop-types', rule, {
         column: 13,
         type: 'Property'
       }],
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2914,7 +2904,6 @@ ruleTester.run('prop-types', rule, {
         column: 7,
         type: 'Property'
       }],
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2931,7 +2920,6 @@ ruleTester.run('prop-types', rule, {
         column: 40,
         type: 'Identifier'
       }],
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2948,7 +2936,6 @@ ruleTester.run('prop-types', rule, {
         column: 42,
         type: 'Identifier'
       }],
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2967,7 +2954,6 @@ ruleTester.run('prop-types', rule, {
         column: 42,
         type: 'Identifier'
       }],
-      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: `
@@ -2987,7 +2973,6 @@ ruleTester.run('prop-types', rule, {
         column: 37,
         type: 'Identifier'
       }],
-      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
     }, {
       code: `
@@ -3007,7 +2992,6 @@ ruleTester.run('prop-types', rule, {
         column: 37,
         type: 'Identifier'
       }],
-      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
     }
   ]