Skip to content

Commit b22bacd

Browse files
committed
Remove unneeded compatibility
1 parent 430ac0d commit b22bacd

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

eslint.config.mjs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { defineConfig, globalIgnores } from 'eslint/config';
2-
import { fixupConfigRules } from '@eslint/compat';
2+
import importPlugin from 'eslint-plugin-import';
33
import jest from 'eslint-plugin-jest';
4-
import prettier from 'eslint-plugin-prettier';
4+
import prettierRecommended from 'eslint-plugin-prettier/recommended';
55
import globals from 'globals';
6-
import typescriptEslint from '@typescript-eslint/eslint-plugin';
7-
import tsParser from '@typescript-eslint/parser';
6+
import typescriptEslint from 'typescript-eslint';
87
import js from '@eslint/js';
98
import { FlatCompat } from '@eslint/eslintrc';
109

@@ -38,14 +37,13 @@ export default defineConfig([
3837
'**/.yalc/',
3938
]),
4039
{
41-
files: ['**/*.[jt]s', '**/*.m[jt]s', '**/*.[jt]sx'],
42-
extends: fixupConfigRules(
43-
compat.extends('eslint:recommended', 'plugin:import/typescript', 'eslint-config-shakacode', 'prettier'),
44-
),
45-
40+
files: ['**/*.[jt]s', '**/*.[cm][jt]s', '**/*.[jt]sx'],
41+
},
42+
js.configs.recommended,
43+
compat.extends('eslint-config-shakacode'),
44+
{
4645
plugins: {
4746
jest,
48-
prettier,
4947
},
5048

5149
languageOptions: {
@@ -106,14 +104,9 @@ export default defineConfig([
106104
},
107105
{
108106
files: ['**/*.ts{x,}'],
109-
extends: compat.extends('plugin:@typescript-eslint/strict-type-checked'),
110-
111-
plugins: {
112-
'@typescript-eslint': typescriptEslint,
113-
},
107+
extends: [importPlugin.flatConfigs.typescript, typescriptEslint.configs.strictTypeChecked],
114108

115109
languageOptions: {
116-
parser: tsParser,
117110
ecmaVersion: 5,
118111
sourceType: 'script',
119112

@@ -174,4 +167,7 @@ export default defineConfig([
174167
],
175168
},
176169
},
170+
// must be the last config in the array
171+
// https://github.com/prettier/eslint-plugin-prettier?tab=readme-ov-file#configuration-new-eslintconfigjs
172+
prettierRecommended,
177173
]);

0 commit comments

Comments
 (0)