diff --git a/eslint.config.mjs b/eslint.config.mjs index 36c3d3571..f3f5a8429 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -4,24 +4,14 @@ import jest from "eslint-plugin-jest"; import typescriptEslint from "@typescript-eslint/eslint-plugin"; import globals from "globals"; import tsParser from "@typescript-eslint/parser"; -import path from "node:path"; -import { fileURLToPath } from "node:url"; import js from "@eslint/js"; -import { FlatCompat } from "@eslint/eslintrc"; - -const __filename = fileURLToPath(import.meta.url); -const __dirname = path.dirname(__filename); -const compat = new FlatCompat({ - baseDirectory: __dirname, - recommendedConfig: js.configs.recommended, - allConfig: js.configs.all -}); +import eslintConfigPrettier from "eslint-config-prettier/flat"; const githubConfigs = github.getFlatConfigs(); export default defineConfig([ js.configs.recommended, - ...compat.extends("prettier"), + eslintConfigPrettier, githubConfigs.recommended, githubConfigs.typescript, { diff --git a/package-lock.json b/package-lock.json index 57601bc3e..ccac1d3fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,6 @@ "tar-stream": "^3.2.0" }, "devDependencies": { - "@eslint/eslintrc": "^3.3.6", "@eslint/js": "^10.0.1", "@types/dockerode": "^4.0.1", "@types/jest": "^30.0.0", diff --git a/package.json b/package.json index 857e22466..128a89441 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "tar-stream": "^3.2.0" }, "devDependencies": { - "@eslint/eslintrc": "^3.3.6", "@eslint/js": "^10.0.1", "@types/dockerode": "^4.0.1", "@types/jest": "^30.0.0",