Skip to content

Commit 12a7b9b

Browse files
viceicerarkins
andauthored
chore: update eslint config (#13237)
Co-authored-by: Rhys Arkins <[email protected]>
1 parent 6c953ea commit 12a7b9b

8 files changed

+35
-24
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ coverage
1111
**/*.d.ts
1212
/config.js
1313
.clinic/
14+
.cache/
1415

1516
# generated code
1617
**/*.generated.ts

.eslintrc.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ module.exports = {
2828
* checks done by typescript.
2929
*
3030
* https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/FAQ.md#eslint-plugin-import
31+
* required for esm check
3132
*/
32-
'import/default': 0,
33-
'import/named': 0,
34-
'import/namespace': 0,
33+
'import/default': 2,
34+
'import/named': 2,
35+
'import/namespace': 2,
3536
'import/no-named-as-default-member': 0,
3637
'import/prefer-default-export': 0, // no benefit
3738

@@ -120,6 +121,10 @@ module.exports = {
120121
},
121122
},
122123
overrides: [
124+
{
125+
// files to check, so no `--ext` is required
126+
files: ['**/*.{js,mjs,cjs,ts}'],
127+
},
123128
{
124129
files: ['**/*.spec.ts', 'test/**'],
125130
env: {
@@ -143,7 +148,7 @@ module.exports = {
143148
},
144149
},
145150
{
146-
files: ['**/*.{js,mjs}'],
151+
files: ['**/*.{js,mjs,cjs}'],
147152

148153
rules: {
149154
'@typescript-eslint/explicit-function-return-type': 0,
@@ -152,7 +157,7 @@ module.exports = {
152157
},
153158
},
154159
{
155-
files: ['tools/**/*.{ts,js,mjs}'],
160+
files: ['tools/**/*.{ts,js,mjs,cjs}'],
156161
env: {
157162
node: true,
158163
},
@@ -164,7 +169,7 @@ module.exports = {
164169
},
165170
},
166171
{
167-
files: ['tools/**/*.js'],
172+
files: ['tools/**/*.{js,cjs}', 'bin/*.{js,cjs}'],
168173
rules: {
169174
// need commonjs
170175
'@typescript-eslint/no-var-requires': 'off',

bin/clean-cache.js

-10
This file was deleted.

bin/clean-cache.mjs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { tmpdir } from 'os';
2+
import { join } from 'path';
3+
import { remove } from 'fs-extra';
4+
5+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
6+
(async () => {
7+
const tmpDir = process.env.RENOVATE_TMPDIR || tmpdir();
8+
const renovateDir = join(tmpDir, 'renovate');
9+
// eslint-disable-next-line no-console
10+
console.log('Removing ' + renovateDir);
11+
await remove(renovateDir);
12+
})();

bin/create-json-schema.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ const schema = {
1010
};
1111
const options = getOptions();
1212
options.sort((a, b) => {
13-
if (a.name < b.name) return -1;
14-
if (a.name > b.name) return 1;
13+
if (a.name < b.name) {
14+
return -1;
15+
}
16+
if (a.name > b.name) {
17+
return 1;
18+
}
1519
return 0;
1620
});
1721
const properties = {};
@@ -34,7 +38,7 @@ function createSingleConfig(option) {
3438
temp.items.enum = option.allowedValues;
3539
}
3640
}
37-
if (option.subType == 'string' && option.allowString === true) {
41+
if (option.subType === 'string' && option.allowString === true) {
3842
const items = temp.items;
3943
delete temp.items;
4044
delete temp.type;

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"build": "run-s clean generate:* compile:*",
1111
"build:docs": "run-s \"release:prepare {@}\"",
1212
"clean": "rimraf dist tmp",
13-
"clean-cache": "node bin/clean-cache.js",
13+
"clean-cache": "node bin/clean-cache.mjs",
1414
"compile:ts": "tsc -p tsconfig.app.json",
1515
"config-validator": "node -r ts-node/register/transpile-only -- lib/config-validator.ts",
1616
"create-json-schema": "node -r ts-node/register/transpile-only -- bin/create-json-schema.js && prettier --write \"renovate-schema.json\"",
1717
"debug": "node --inspect-brk -r ts-node/register/transpile-only -- lib/renovate.ts",
1818
"doc-fix": "run-s markdown-lint-fix prettier-fix",
1919
"doc-fence-check": "node tools/check-fenced-code.mjs",
20-
"eslint": "eslint --ext .js,.mjs,.ts lib/ test/ tools/ --report-unused-disable-directives",
21-
"eslint-fix": "eslint --ext .js,.mjs,.ts --fix lib/ test/ tools/ --report-unused-disable-directives",
20+
"eslint": "eslint . --report-unused-disable-directives",
21+
"eslint-fix": "eslint --fix . --report-unused-disable-directives",
2222
"generate": "run-s generate:*",
2323
"generate:imports": "node tools/generate-imports.mjs",
2424
"git-check": "node tools/check-git-version.mjs",

tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"./.cache",
2727
"./dist",
2828
"**/__mocks__/*",
29-
"bin",
3029
"coverage",
3130
"config.js",
3231
"tmp"

tsconfig.lint.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"extends": "./tsconfig",
3-
"include": [".eslintrc.js", "**/*.ts", "**/*.js", "**/*.mjs"]
3+
"include": [".eslintrc.js", "**/*.ts", "**/*.js", "**/*.mjs", "**/*.cjs"]
44
}

0 commit comments

Comments
 (0)