Skip to content

Commit

Permalink
Simplify all config (#1722)
Browse files Browse the repository at this point in the history
  • Loading branch information
fisker committed Feb 9, 2022
1 parent e7b8335 commit f32e3a7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 36 deletions.
18 changes: 5 additions & 13 deletions configs/all.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
'use strict';
const conflictingRules = require('./conflicting-rules.js');
const {rules, ...baseConfigs} = require('./recommended.js');

module.exports = {
...require('./base.js'),
rules: {
...Object.fromEntries(
Object.entries(require('./recommended.js').rules)
.filter(
ruleEntry =>
!Object.keys(conflictingRules.rules).includes(ruleEntry[0]),
)
.map(ruleEntry => [ruleEntry[0], 'error']),
),
...conflictingRules.rules,
},
...baseConfigs,
rules: Object.fromEntries(Object.entries(rules).map(
([ruleId, severity]) => [ruleId, ruleId.startsWith('unicorn/') ? 'error' : severity],
)),
};
13 changes: 0 additions & 13 deletions configs/base.js

This file was deleted.

6 changes: 0 additions & 6 deletions configs/conflicting-rules.js

This file was deleted.

12 changes: 10 additions & 2 deletions configs/recommended.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
'use strict';
module.exports = {
...require('./base.js'),
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
},
plugins: [
'unicorn',
],
rules: {
'unicorn/better-regex': 'error',
'unicorn/catch-error-name': 'error',
Expand Down Expand Up @@ -106,6 +115,5 @@ module.exports = {
'unicorn/string-content': 'off',
'unicorn/template-indent': 'warn',
'unicorn/throw-new-error': 'error',
...require('./conflicting-rules.js').rules,
},
};
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const createDeprecatedRules = require('./rules/utils/create-deprecated-rules.js');
const {loadRules} = require('./rules/utils/rule.js');
const recommendedConfig = require('./configs/recommended.js');
const all = require('./configs/all.js');
const allRulesEnabledConfig = require('./configs/all.js');

const deprecatedRules = createDeprecatedRules({
// {ruleId: ReplacementRuleId | ReplacementRuleId[]}, if no replacement, use `{ruleId: []}`
Expand Down Expand Up @@ -30,6 +30,6 @@ module.exports = {
},
configs: {
recommended: recommendedConfig,
all,
all: allRulesEnabledConfig,
},
};

0 comments on commit f32e3a7

Please sign in to comment.