Skip to content

Commit 095968c

Browse files
pfhayesyannickcr
authored andcommitted
Don't include deprecated rules in all config
1 parent 0b2dcc6 commit 095968c

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

index.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
'use strict';
22

3+
var deprecatedRules = {
4+
'no-comment-textnodes': require('./lib/rules/no-comment-textnodes'),
5+
'require-extension': require('./lib/rules/require-extension'),
6+
'wrap-multilines': require('./lib/rules/wrap-multilines')
7+
};
8+
39
var rules = {
410
'jsx-uses-react': require('./lib/rules/jsx-uses-react'),
511
'no-multi-comp': require('./lib/rules/no-multi-comp'),
612
'prop-types': require('./lib/rules/prop-types'),
713
'display-name': require('./lib/rules/display-name'),
8-
'wrap-multilines': require('./lib/rules/wrap-multilines'),
914
'jsx-wrap-multilines': require('./lib/rules/jsx-wrap-multilines'),
1015
'self-closing-comp': require('./lib/rules/self-closing-comp'),
11-
'no-comment-textnodes': require('./lib/rules/no-comment-textnodes'),
1216
'jsx-no-comment-textnodes': require('./lib/rules/jsx-no-comment-textnodes'),
1317
'no-danger': require('./lib/rules/no-danger'),
1418
'no-set-state': require('./lib/rules/no-set-state'),
@@ -30,7 +34,6 @@ var rules = {
3034
'sort-prop-types': require('./lib/rules/sort-prop-types'),
3135
'jsx-boolean-value': require('./lib/rules/jsx-boolean-value'),
3236
'sort-comp': require('./lib/rules/sort-comp'),
33-
'require-extension': require('./lib/rules/require-extension'),
3437
'jsx-require-extension': require('./lib/rules/jsx-require-extension'),
3538
'jsx-no-duplicate-props': require('./lib/rules/jsx-no-duplicate-props'),
3639
'jsx-max-props-per-line': require('./lib/rules/jsx-max-props-per-line'),
@@ -60,7 +63,8 @@ for (var i = 0; i < ruleNames.length; i++) {
6063
}
6164

6265
module.exports = {
63-
rules: rules,
66+
deprecatedRules: deprecatedRules,
67+
rules: Object.assign({}, rules, deprecatedRules),
6468
configs: {
6569
recommended: {
6670
parserOptions: {

tests/index.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ var assert = require('assert');
77
var fs = require('fs');
88
var path = require('path');
99

10-
var rules = fs.readdirSync(path.resolve(__dirname, '../lib/rules/'))
10+
var ruleFiles = fs.readdirSync(path.resolve(__dirname, '../lib/rules/'))
1111
.map(function(f) {
1212
return path.basename(f, '.js');
1313
});
1414

1515
describe('all rule files should be exported by the plugin', function() {
16-
rules.forEach(function(ruleName) {
16+
ruleFiles.forEach(function(ruleName) {
1717
it('should export ' + ruleName, function() {
1818
assert.equal(
1919
plugin.rules[ruleName],
@@ -38,8 +38,10 @@ describe('configurations', function() {
3838
assert.equal(configName.indexOf('react/'), 0);
3939
assert.equal(plugin.configs.all.rules[configName], 2);
4040
});
41-
rules.forEach(function(ruleName) {
42-
assert(plugin.configs.all.rules['react/' + ruleName]);
41+
ruleFiles.forEach(function(ruleName) {
42+
var inDeprecatedRules = Boolean(plugin.deprecatedRules[ruleName]);
43+
var inAllConfig = Boolean(plugin.configs.all.rules['react/' + ruleName]);
44+
assert(inDeprecatedRules ^ inAllConfig);
4345
});
4446
});
4547
});

0 commit comments

Comments
 (0)