Move propWrapperFunctions into settings

docs/rules/no-unused-prop-types.md

@@ -47,14 +47,13 @@ This rule can take one argument to ignore some specific props during validation.
 
 ```js
 ...
-"react/no-unused-prop-types": [<enabled>, { customValidators: <customValidator>, skipShapeProps: <skipShapeProps>, propWrapperFunctions: <propWrapperFunctions> }]
+"react/no-unused-prop-types": [<enabled>, { customValidators: <customValidator>, skipShapeProps: <skipShapeProps> }]
 ...
 ```
 
 * `enabled`: for enabling the rule. 0=off, 1=warn, 2=error. Defaults to 0.
 * `customValidators`: optional array of validators used for propTypes validation.
 * `skipShapeProps`: In some cases it is impossible to accurately detect whether or not a `PropTypes.shape`'s values are being used. Setting this option to `true` will skip validation of `PropTypes.shape` (`true` by default).
-* `propWrapperFunctions`: The names of any functions used to wrap the propTypes object, such as `forbidExtraProps`. If this isn't set, any propTypes wrapped in a function will be skipped.
 
 ## Caveats
 

lib/rules/no-unused-prop-types.js

@@ -44,13 +44,6 @@ module.exports = {
         },
         skipShapeProps: {
           type: 'boolean'
-        },
-        propWrapperFunctions: {
-          type: 'array',
-          items: {
-            type: 'string'
-          },
-          uniqueItems: true
         }
       },
       additionalProperties: false
@@ -63,7 +56,7 @@ module.exports = {
     var configuration = Object.assign({}, defaults, context.options[0] || {});
     var skipShapeProps = configuration.skipShapeProps;
     var customValidators = configuration.customValidators || [];
-    var propWrapperFunctions = new Set(configuration.propWrapperFunctions || []);
+    var propWrapperFunctions = new Set(context.settings.propWrapperFunctions || []);
 
     // Used to track the type annotations in scope.
     // Necessary because babel's scopes do not track type annotations.

lib/rules/require-default-props.js

@@ -22,25 +22,12 @@ module.exports = {
       category: 'Best Practices'
     },
 
-    schema: [{
-      type: 'object',
-      properties: {
-        propWrapperFunctions: {
-          type: 'array',
-          items: {
-            type: 'string'
-          },
-          uniqueItems: true
-        }
-      },
-      additionalProperties: false
-    }]
+    schema: []
   },
 
   create: Components.detect(function(context, components, utils) {
     var sourceCode = context.getSourceCode();
-    var configuration = context.options[0] || {};
-    var propWrapperFunctions = new Set(configuration.propWrapperFunctions || []);
+    var propWrapperFunctions = new Set(context.settings.propWrapperFunctions || []);
 
     /**
      * Get properties name

tests/lib/rules/no-unused-prop-types.js

@@ -2798,7 +2798,9 @@ ruleTester.run('no-unused-prop-types', rule, {
         line: 10,
         column: 8
       }],
-      options: [{propWrapperFunctions: ['forbidExtraProps']}]
+      settings: {
+        propWrapperFunctions: ['forbidExtraProps']
+      }
     }, {
       code: [
         'class Hello extends Component {',
@@ -2819,7 +2821,9 @@ ruleTester.run('no-unused-prop-types', rule, {
         line: 4,
         column: 10
       }],
-      options: [{propWrapperFunctions: ['forbidExtraProps']}]
+      settings: {
+        propWrapperFunctions: ['forbidExtraProps']
+      }
     }
     /* , {
       // Enable this when the following issue is fixed

tests/lib/rules/require-default-props.js

@@ -772,7 +772,9 @@ ruleTester.run('require-default-props', rule, {
         line: 5,
         column: 3
       }],
-      options: [{propWrapperFunctions: ['forbidExtraProps']}]
+      settings: {
+        propWrapperFunctions: ['forbidExtraProps']
+      }
     },
     {
       code: [