diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-10-15 09:48:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-15 09:48:06 +0200 |
commit | 14d2364fc69e0222133115c55a36286986006098 (patch) | |
tree | 9e9b3c41ef742bbe87ca1632b292c67043051957 /.eslintrc.js | |
parent | 5.6.3-nightly.34 [skip ci] (diff) | |
download | ferdium-app-14d2364fc69e0222133115c55a36286986006098.tar.gz ferdium-app-14d2364fc69e0222133115c55a36286986006098.tar.zst ferdium-app-14d2364fc69e0222133115c55a36286986006098.zip |
chore: update eslint setup (#2074)
Diffstat (limited to '.eslintrc.js')
-rw-r--r-- | .eslintrc.js | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/.eslintrc.js b/.eslintrc.js index 491faff37..dd50364d0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js | |||
@@ -9,8 +9,8 @@ module.exports = { | |||
9 | sourceType: 'module', | 9 | sourceType: 'module', |
10 | project: './tsconfig.json', | 10 | project: './tsconfig.json', |
11 | }, | 11 | }, |
12 | extends: ['eslint-config-airbnb', 'plugin:unicorn/recommended'], | 12 | extends: ['airbnb', 'plugin:unicorn/recommended', 'prettier'], |
13 | plugins: ['jest'], | 13 | plugins: ['jest', 'prettier'], |
14 | settings: { | 14 | settings: { |
15 | react: { | 15 | react: { |
16 | pragma: 'React', // Pragma to use, default to "React" | 16 | pragma: 'React', // Pragma to use, default to "React" |
@@ -18,14 +18,8 @@ module.exports = { | |||
18 | }, | 18 | }, |
19 | }, | 19 | }, |
20 | globals: { | 20 | globals: { |
21 | window: true, | 21 | // TODO: can be removed once adonisj migration is done |
22 | document: true, | ||
23 | FormData: true, | ||
24 | localStorage: true, | ||
25 | navigator: true, | ||
26 | Element: true, | ||
27 | use: true, | 22 | use: true, |
28 | FileReader: true, | ||
29 | }, | 23 | }, |
30 | env: { | 24 | env: { |
31 | browser: true, | 25 | browser: true, |
@@ -36,9 +30,9 @@ module.exports = { | |||
36 | overrides: [ | 30 | overrides: [ |
37 | { | 31 | { |
38 | files: ['**/*.ts', '**/*.tsx'], | 32 | files: ['**/*.ts', '**/*.tsx'], |
39 | extends: ['airbnb-typescript', 'plugin:unicorn/recommended'], | 33 | extends: ['airbnb-typescript', 'plugin:unicorn/recommended', 'prettier'], |
40 | parser: '@typescript-eslint/parser', | 34 | parser: '@typescript-eslint/parser', |
41 | plugins: ['@typescript-eslint'], | 35 | plugins: ['@typescript-eslint', 'jest', 'prettier'], |
42 | rules: { | 36 | rules: { |
43 | // eslint | 37 | // eslint |
44 | 'arrow-parens': 0, | 38 | 'arrow-parens': 0, |
@@ -121,6 +115,8 @@ module.exports = { | |||
121 | }, | 115 | }, |
122 | ], | 116 | ], |
123 | 'unicorn/consistent-destructuring': 0, | 117 | 'unicorn/consistent-destructuring': 0, |
118 | // eslint-plugin-prettier | ||
119 | 'prettier/prettier': 1, | ||
124 | }, | 120 | }, |
125 | }, | 121 | }, |
126 | ], | 122 | ], |
@@ -188,5 +184,7 @@ module.exports = { | |||
188 | }, | 184 | }, |
189 | ], | 185 | ], |
190 | 'unicorn/consistent-destructuring': 0, | 186 | 'unicorn/consistent-destructuring': 0, |
187 | // eslint-plugin-prettier | ||
188 | 'prettier/prettier': 1, | ||
191 | }, | 189 | }, |
192 | }; | 190 | }; |