Skip to content

Commit cdcc76a

Browse files
ljharbljharb
committed
[eslint] consolidate configs
1 parent 332d3c8 commit cdcc76a

18 files changed

+71
-65
lines changed

‎.eslintrc‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,31 @@
1818
"ecmaVersion": 2020,
1919
},
2020
"rules": {
21-
"comma-dangle": [2, "always-multiline"],
21+
"comma-dangle": ["error", {
22+
"arrays": "always-multiline",
23+
"objects": "always-multiline",
24+
"imports": "always-multiline",
25+
"exports": "always-multiline",
26+
"functions": "always-multiline",
27+
}],
2228
"comma-style": [2, "last"],
2329
"curly": [2, "multi-line"],
2430
"eol-last": [2, "always"],
2531
"eqeqeq": [2, "allow-null"],
2632
"func-call-spacing": 2,
2733
"indent": [2, 2],
2834
"keyword-spacing": ["error", {
29-
before: true,
30-
after: true,
31-
overrides: {
32-
return: { after: true },
33-
throw: { after: true },
34-
case: { after: true }
35+
"before": true,
36+
"after": true,
37+
"overrides": {
38+
"return": { "after": true },
39+
"throw": { "after": true },
40+
"case": { "after": true }
3541
}
3642
}],
37-
"max-len": [1, 99, 2],
43+
"max-len": 0,
3844
"no-cond-assign": [2, "always"],
3945
"no-return-assign": [2, "always"],
40-
"no-shadow": 1,
4146
"no-var": 2,
4247
"object-curly-spacing": [2, "always"],
4348
"object-shorthand": ["error", "always", {
@@ -91,6 +96,12 @@
9196
"no-console": "off",
9297
},
9398
},
99+
{
100+
"files": "resolvers/**",
101+
"env": {
102+
"es6": false,
103+
},
104+
},
94105
{
95106
"files": [
96107
"resolvers/*/test/**/*",
@@ -99,6 +110,22 @@
99110
"mocha": true,
100111
"es6": false
101112
},
102-
}
113+
},
114+
{
115+
"files": "utils/**",
116+
"parserOptions": {
117+
"ecmaVersion": 6,
118+
},
119+
"rules": {
120+
"comma-dangle": ["error", {
121+
"arrays": "always-multiline",
122+
"objects": "always-multiline",
123+
"imports": "always-multiline",
124+
"exports": "always-multiline",
125+
"functions": "never"
126+
}],
127+
"no-console": 1,
128+
},
129+
},
103130
],
104131
}

‎resolvers/.eslintrc.yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/.eslintrc.yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/rules/default.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
function checkDefault(specifierType, node) {
1616

1717
const defaultSpecifier = node.specifiers.find(
18-
specifier => specifier.type === specifierType
18+
specifier => specifier.type === specifierType,
1919
);
2020

2121
if (!defaultSpecifier) return;

‎src/rules/export.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ module.exports = {
9090
'ExportSpecifier': (node) => addNamed(
9191
node.exported.name,
9292
node.exported,
93-
getParent(node.parent)
93+
getParent(node.parent),
9494
),
9595

9696
'ExportNamedDeclaration': function (node) {
@@ -146,7 +146,7 @@ module.exports = {
146146
if (!any) {
147147
context.report(
148148
node.source,
149-
`No named exports found in module '${node.source.value}'.`
149+
`No named exports found in module '${node.source.value}'.`,
150150
);
151151
}
152152
},
@@ -164,7 +164,7 @@ module.exports = {
164164
} else {
165165
context.report(
166166
node,
167-
`Multiple exports of name '${name.replace(tsTypePrefix, '')}'.`
167+
`Multiple exports of name '${name.replace(tsTypePrefix, '')}'.`,
168168
);
169169
}
170170
}

‎src/rules/first.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ module.exports = {
105105
const range = [0, removeFixers[removeFixers.length - 1].range[1]];
106106
let insertSourceCode = sortNodes.map(function (_errorInfo) {
107107
const nodeSourceCode = String.prototype.slice.apply(
108-
originSourceCode, _errorInfo.range
108+
originSourceCode, _errorInfo.range,
109109
);
110110
if (/\S/.test(nodeSourceCode[0])) {
111111
return '\n' + nodeSourceCode;
@@ -124,7 +124,7 @@ module.exports = {
124124
const fixers = [insertFixer].concat(removeFixers);
125125
fixers.forEach(function (computedFixer, i) {
126126
replaceSourceCode += (originSourceCode.slice(
127-
fixers[i - 1] ? fixers[i - 1].range[1] : 0, computedFixer.range[0]
127+
fixers[i - 1] ? fixers[i - 1].range[1] : 0, computedFixer.range[0],
128128
) + computedFixer.text);
129129
});
130130
return fixer.replaceTextRange(range, replaceSourceCode);

‎src/rules/newline-after-import.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module.exports = {
107107
after ${type} statement not followed by another ${type}.`,
108108
fix: fixer => fixer.insertTextAfter(
109109
node,
110-
'\n'.repeat(EXPECTED_LINE_DIFFERENCE - lineDifference)
110+
'\n'.repeat(EXPECTED_LINE_DIFFERENCE - lineDifference),
111111
),
112112
});
113113
}

‎src/rules/no-cycle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646
name,
4747
context.settings,
4848
resolve(name, context),
49-
context
49+
context,
5050
);
5151

5252
function checkSourceValue(sourceNode, importer) {
@@ -88,7 +88,7 @@ module.exports = {
8888
const toTraverse = [...declarations].filter(({ source, isOnlyImportingTypes }) =>
8989
!ignoreModule(source.value) &&
9090
// Ignore only type imports
91-
!isOnlyImportingTypes
91+
!isOnlyImportingTypes,
9292
);
9393
/*
9494
Only report as a cycle if there are any import declarations that are considered by

‎src/rules/no-duplicates.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function getFix(first, rest, sourceCode) {
4545
}
4646

4747
const defaultImportNames = new Set(
48-
[first, ...rest].map(getDefaultImportName).filter(Boolean)
48+
[first, ...rest].map(getDefaultImportName).filter(Boolean),
4949
);
5050

5151
// Bail if there are multiple different default import names – it's up to the
@@ -83,7 +83,7 @@ function getFix(first, rest, sourceCode) {
8383
const unnecessaryImports = restWithoutComments.filter(node =>
8484
!hasSpecifiers(node) &&
8585
!hasNamespace(node) &&
86-
!specifiers.some(specifier => specifier.importNode === node)
86+
!specifiers.some(specifier => specifier.importNode === node),
8787
);
8888

8989
const shouldAddDefault = getDefaultImportName(first) == null && defaultImportNames.size === 1;
@@ -115,15 +115,15 @@ function getFix(first, rest, sourceCode) {
115115
specifier.isEmpty ? needsComma : true,
116116
];
117117
},
118-
['', !firstHasTrailingComma && !firstIsEmpty]
118+
['', !firstHasTrailingComma && !firstIsEmpty],
119119
);
120120

121121
const fixes = [];
122122

123123
if (shouldAddDefault && openBrace == null && shouldAddSpecifiers) {
124124
// `import './foo'` → `import def, {...} from './foo'`
125125
fixes.push(
126-
fixer.insertTextAfter(firstToken, ` ${defaultImportName}, {${specifiersText}} from`)
126+
fixer.insertTextAfter(firstToken, ` ${defaultImportName}, {${specifiersText}} from`),
127127
);
128128
} else if (shouldAddDefault && openBrace == null && !shouldAddSpecifiers) {
129129
// `import './foo'` → `import def from './foo'`

‎src/rules/no-extraneous-dependencies.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ function getDependencies(context, packageDir) {
5555
const packageJsonPath = path.join(dir, 'package.json');
5656
if (!depFieldCache.has(packageJsonPath)) {
5757
const depFields = extractDepFields(
58-
JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
58+
JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')),
5959
);
6060
depFieldCache.set(packageJsonPath, depFields);
6161
}
6262
const _packageContent = depFieldCache.get(packageJsonPath);
6363
Object.keys(packageContent).forEach(depsKey =>
64-
Object.assign(packageContent[depsKey], _packageContent[depsKey])
64+
Object.assign(packageContent[depsKey], _packageContent[depsKey]),
6565
);
6666
});
6767
} else {
6868
// use closest package.json
6969
Object.assign(
7070
packageContent,
7171
extractDepFields(
72-
readPkgUp({ cwd: context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename(), normalize: false }).pkg
73-
)
72+
readPkgUp({ cwd: context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename(), normalize: false }).pkg,
73+
),
7474
);
7575
}
7676

0 commit comments

Comments
 (0)