Skip to content

Commit c4000b9

Browse files
ljharbljharb
committed
[eslint config] [fix] whitespace: udpate to support eslint 8
Fixes #2517
1 parent 31c6f21 commit c4000b9

File tree

3 files changed

+158
-95
lines changed

3 files changed

+158
-95
lines changed

‎packages/eslint-config-airbnb/whitespace-async.js‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env node
2+
3+
const assign = require('object.assign');
4+
const entries = require('object.entries');
5+
const { ESLint } = require('eslint');
6+
7+
const baseConfig = require('.');
8+
const whitespaceRules = require('./whitespaceRules');
9+
10+
const severities = ['off', 'warn', 'error'];
11+
12+
function getSeverity(ruleConfig) {
13+
if (Array.isArray(ruleConfig)) {
14+
return getSeverity(ruleConfig[0]);
15+
}
16+
if (typeof ruleConfig === 'number') {
17+
return severities[ruleConfig];
18+
}
19+
return ruleConfig;
20+
}
21+
22+
async function onlyErrorOnRules(rulesToError, config) {
23+
const errorsOnly = assign({}, config);
24+
const cli = new ESLint({
25+
useEslintrc: false,
26+
baseConfig: config
27+
});
28+
const baseRules = (await cli.calculateConfigForFile(require.resolve('./'))).rules;
29+
30+
entries(baseRules).forEach((rule) => {
31+
const ruleName = rule[0];
32+
const ruleConfig = rule[1];
33+
const severity = getSeverity(ruleConfig);
34+
35+
if (rulesToError.indexOf(ruleName) === -1 && severity === 'error') {
36+
if (Array.isArray(ruleConfig)) {
37+
errorsOnly.rules[ruleName] = ['warn'].concat(ruleConfig.slice(1));
38+
} else if (typeof ruleConfig === 'number') {
39+
errorsOnly.rules[ruleName] = 1;
40+
} else {
41+
errorsOnly.rules[ruleName] = 'warn';
42+
}
43+
}
44+
});
45+
46+
return errorsOnly;
47+
}
48+
49+
onlyErrorOnRules(whitespaceRules, baseConfig).then((config) => console.log(JSON.stringify(config)));

‎packages/eslint-config-airbnb/whitespace.js‎

Lines changed: 45 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,55 @@
1-
const assign = require('object.assign');
2-
const entries = require('object.entries');
1+
/* eslint global-require: 0 */
2+
33
const { CLIEngine } = require('eslint');
44

5-
const baseConfig = require('.');
5+
if (CLIEngine) {
6+
/* eslint no-inner-declarations: 0 */
7+
const assign = require('object.assign');
8+
const entries = require('object.entries');
9+
const whitespaceRules = require('./whitespaceRules');
610

7-
const severities = ['off', 'warn', 'error'];
11+
const baseConfig = require('.');
812

9-
function getSeverity(ruleConfig) {
10-
if (Array.isArray(ruleConfig)) {
11-
return getSeverity(ruleConfig[0]);
12-
}
13-
if (typeof ruleConfig === 'number') {
14-
return severities[ruleConfig];
13+
const severities = ['off', 'warn', 'error'];
14+
15+
function getSeverity(ruleConfig) {
16+
if (Array.isArray(ruleConfig)) {
17+
return getSeverity(ruleConfig[0]);
18+
}
19+
if (typeof ruleConfig === 'number') {
20+
return severities[ruleConfig];
21+
}
22+
return ruleConfig;
1523
}
16-
return ruleConfig;
17-
}
1824

19-
function onlyErrorOnRules(rulesToError, config) {
20-
const errorsOnly = assign({}, config);
21-
const cli = new CLIEngine({ baseConfig: config, useEslintrc: false });
22-
const baseRules = cli.getConfigForFile(require.resolve('./')).rules;
25+
function onlyErrorOnRules(rulesToError, config) {
26+
const errorsOnly = assign({}, config);
27+
const cli = new CLIEngine({ baseConfig: config, useEslintrc: false });
28+
const baseRules = cli.getConfigForFile(require.resolve('./')).rules;
29+
30+
entries(baseRules).forEach((rule) => {
31+
const ruleName = rule[0];
32+
const ruleConfig = rule[1];
33+
const severity = getSeverity(ruleConfig);
34+
35+
if (rulesToError.indexOf(ruleName) === -1 && severity === 'error') {
36+
if (Array.isArray(ruleConfig)) {
37+
errorsOnly.rules[ruleName] = ['warn'].concat(ruleConfig.slice(1));
38+
} else if (typeof ruleConfig === 'number') {
39+
errorsOnly.rules[ruleName] = 1;
40+
} else {
41+
errorsOnly.rules[ruleName] = 'warn';
42+
}
43+
}
44+
});
2345

24-
entries(baseRules).forEach((rule) => {
25-
const ruleName = rule[0];
26-
const ruleConfig = rule[1];
27-
const severity = getSeverity(ruleConfig);
46+
return errorsOnly;
47+
}
2848

29-
if (rulesToError.indexOf(ruleName) === -1 && severity === 'error') {
30-
if (Array.isArray(ruleConfig)) {
31-
errorsOnly.rules[ruleName] = ['warn'].concat(ruleConfig.slice(1));
32-
} else if (typeof ruleConfig === 'number') {
33-
errorsOnly.rules[ruleName] = 1;
34-
} else {
35-
errorsOnly.rules[ruleName] = 'warn';
36-
}
37-
}
38-
});
49+
module.exports = onlyErrorOnRules(whitespaceRules, baseConfig);
50+
} else {
51+
const path = require('path');
52+
const { execSync } = require('child_process');
3953

40-
return errorsOnly;
54+
module.exports = JSON.parse(String(execSync(path.join(__dirname, 'whitespace-async.js'))));
4155
}
42-
43-
module.exports = onlyErrorOnRules([
44-
'array-bracket-newline',
45-
'array-bracket-spacing',
46-
'array-element-newline',
47-
'arrow-spacing',
48-
'block-spacing',
49-
'comma-spacing',
50-
'computed-property-spacing',
51-
'dot-location',
52-
'eol-last',
53-
'func-call-spacing',
54-
'function-paren-newline',
55-
'generator-star-spacing',
56-
'implicit-arrow-linebreak',
57-
'indent',
58-
'key-spacing',
59-
'keyword-spacing',
60-
'line-comment-position',
61-
'linebreak-style',
62-
'multiline-ternary',
63-
'newline-per-chained-call',
64-
'no-irregular-whitespace',
65-
'no-mixed-spaces-and-tabs',
66-
'no-multi-spaces',
67-
'no-regex-spaces',
68-
'no-spaced-func',
69-
'no-trailing-spaces',
70-
'no-whitespace-before-property',
71-
'nonblock-statement-body-position',
72-
'object-curly-newline',
73-
'object-curly-spacing',
74-
'object-property-newline',
75-
'one-var-declaration-per-line',
76-
'operator-linebreak',
77-
'padded-blocks',
78-
'padding-line-between-statements',
79-
'rest-spread-spacing',
80-
'semi-spacing',
81-
'semi-style',
82-
'space-before-blocks',
83-
'space-before-function-paren',
84-
'space-in-parens',
85-
'space-infix-ops',
86-
'space-unary-ops',
87-
'spaced-comment',
88-
'switch-colon-spacing',
89-
'template-tag-spacing',
90-
'import/newline-after-import',
91-
// eslint-plugin-react rules
92-
'react/jsx-child-element-spacing',
93-
'react/jsx-closing-bracket-location',
94-
'react/jsx-closing-tag-location',
95-
'react/jsx-curly-spacing',
96-
'react/jsx-equals-spacing',
97-
'react/jsx-first-prop-newline',
98-
'react/jsx-indent',
99-
'react/jsx-indent-props',
100-
'react/jsx-max-props-per-line',
101-
'react/jsx-one-expression-per-line',
102-
'react/jsx-space-before-closing',
103-
'react/jsx-tag-spacing',
104-
'react/jsx-wrap-multilines',
105-
], baseConfig);

‎packages/eslint-config-airbnb/whitespaceRules.js‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
module.exports = [
2+
'array-bracket-newline',
3+
'array-bracket-spacing',
4+
'array-element-newline',
5+
'arrow-spacing',
6+
'block-spacing',
7+
'comma-spacing',
8+
'computed-property-spacing',
9+
'dot-location',
10+
'eol-last',
11+
'func-call-spacing',
12+
'function-paren-newline',
13+
'generator-star-spacing',
14+
'implicit-arrow-linebreak',
15+
'indent',
16+
'key-spacing',
17+
'keyword-spacing',
18+
'line-comment-position',
19+
'linebreak-style',
20+
'multiline-ternary',
21+
'newline-per-chained-call',
22+
'no-irregular-whitespace',
23+
'no-mixed-spaces-and-tabs',
24+
'no-multi-spaces',
25+
'no-regex-spaces',
26+
'no-spaced-func',
27+
'no-trailing-spaces',
28+
'no-whitespace-before-property',
29+
'nonblock-statement-body-position',
30+
'object-curly-newline',
31+
'object-curly-spacing',
32+
'object-property-newline',
33+
'one-var-declaration-per-line',
34+
'operator-linebreak',
35+
'padded-blocks',
36+
'padding-line-between-statements',
37+
'rest-spread-spacing',
38+
'semi-spacing',
39+
'semi-style',
40+
'space-before-blocks',
41+
'space-before-function-paren',
42+
'space-in-parens',
43+
'space-infix-ops',
44+
'space-unary-ops',
45+
'spaced-comment',
46+
'switch-colon-spacing',
47+
'template-tag-spacing',
48+
'import/newline-after-import',
49+
50+
// eslint-plugin-react rules
51+
'react/jsx-child-element-spacing',
52+
'react/jsx-closing-bracket-location',
53+
'react/jsx-closing-tag-location',
54+
'react/jsx-curly-spacing',
55+
'react/jsx-equals-spacing',
56+
'react/jsx-first-prop-newline',
57+
'react/jsx-indent',
58+
'react/jsx-indent-props',
59+
'react/jsx-max-props-per-line',
60+
'react/jsx-one-expression-per-line',
61+
'react/jsx-space-before-closing',
62+
'react/jsx-tag-spacing',
63+
'react/jsx-wrap-multilines',
64+
];

0 commit comments

Comments
 (0)