Merge branch 'master' of github.com:poolifier/poolifier

[poolifier.git] / eslint.config.js

diff --git a/eslint.config.js b/eslint.config.js
index 19a2957d2af4edc5bdb9dea8e7a8306d0227e365..517ded5d66352a4a4eedd25072fc88b6efd824b8 100644 (file)
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -5,9 +5,6 @@ import jsdoc from 'eslint-plugin-jsdoc'
 import simpleImportSort from 'eslint-plugin-simple-import-sort'
 import globals from 'globals'
 import neostandard, { plugins } from 'neostandard'
-// FIXME: https://github.com/neostandard/neostandard/pull/88
-// eslint-disable-next-line n/no-extraneous-import
-import tseslint from 'typescript-eslint'
 
 export default defineFlatConfig([
   {
@@ -29,25 +26,24 @@ export default defineFlatConfig([
       ],
     },
   },
-  // ...tseslint.config(
-  //   ...tseslint.configs.strictTypeChecked,
-  //   ...tseslint.configs.stylisticTypeChecked
-  // ),
-  ...neostandard({
-    ts: true,
-    globals: {
-      ...globals.node,
-      ...globals.mocha,
-    },
-  }),
-  {
-    languageOptions: {
-      parserOptions: {
-        project: true,
-        tsconfigRootDir: import.meta.dirname,
+  ...plugins['typescript-eslint'].config(
+    {
+      extends: [
+        ...plugins['typescript-eslint'].configs.strictTypeChecked,
+        ...plugins['typescript-eslint'].configs.stylisticTypeChecked,
+      ],
+      languageOptions: {
+        parserOptions: {
+          projectService: true,
+          tsconfigRootDir: import.meta.dirname,
+        },
       },
     },
-  },
+    {
+      files: ['**/*.js', '**/*.mjs', '**/*.cjs'],
+      ...plugins['typescript-eslint'].configs.disableTypeChecked,
+    }
+  ),
   {
     plugins: {
       'simple-import-sort': simpleImportSort,
@@ -66,7 +62,6 @@ export default defineFlatConfig([
               'Quadflieg',
               'neostandard',
               'poolifier',
-              'tseslint',
             ],
           },
         },
@@ -75,6 +70,12 @@ export default defineFlatConfig([
       'simple-import-sort/exports': 'error',
     },
   },
+  ...neostandard({
+    ts: true,
+    globals: {
+      ...globals.mocha,
+    },
+  }),
   {
     files: [
       'src/pools/selection-strategies/fair-share-worker-choice-strategy.ts',
@@ -83,10 +84,6 @@ export default defineFlatConfig([
       '@stylistic/operator-linebreak': 'off',
     },
   },
-  {
-    files: ['**/*.js', '**/*.mjs', '**/*.cjs'],
-    ...tseslint.configs.disableTypeChecked,
-  },
   // examples specific configuration
   {
     files: ['examples/**/*.ts'],
@@ -98,6 +95,8 @@ export default defineFlatConfig([
       '@typescript-eslint/no-unsafe-member-access': 'off',
       '@typescript-eslint/no-unnecessary-type-assertion': 'off',
       '@typescript-eslint/no-redundant-type-constituents': 'off',
+      '@typescript-eslint/return-await': 'off',
+      '@typescript-eslint/restrict-template-expressions': 'off',
     },
   },
   {