From 281f4e6b51fd732eda515392287d991abb9cc35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20=C3=85berg?= Date: Fri, 12 Dec 2025 16:16:46 +0100 Subject: [PATCH] Added eslint-plugin-eslint to disable eslint rules covered by oxlint --- .github/renovate.json5 | 1 + eslint.config.mjs | 6 +++++- package-lock.json | 11 +++++++++++ package.json | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d0f117e78ce..b5df4d50aa8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -66,6 +66,7 @@ "eslint-config-prettier", "eslint-import-resolver-typescript", "eslint-plugin-import", + "eslint-plugin-oxlint", "eslint-plugin-rxjs-angular", "eslint-plugin-rxjs", "eslint-plugin-storybook", diff --git a/eslint.config.mjs b/eslint.config.mjs index e8f43d4a9ea..a16794ae3b8 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -10,6 +10,7 @@ import eslintPluginTailwindCSS from "eslint-plugin-tailwindcss"; import rxjs from "eslint-plugin-rxjs"; import angularRxjs from "eslint-plugin-rxjs-angular"; import storybook from "eslint-plugin-storybook"; +import oxlint from "eslint-plugin-oxlint"; import platformPlugins from "./libs/eslint/platform/index.mjs"; import componentPlugins from "./libs/eslint/components/index.mjs"; @@ -29,7 +30,7 @@ export default tseslint.config( eslintConfigPrettier, // Disables rules that conflict with Prettier ], linterOptions: { - reportUnusedDisableDirectives: "error", + reportUnusedDisableDirectives: "off", // TODO: Re-enable after cleaning up unused directives from oxlint migration }, plugins: { rxjs: fixupPluginRules(rxjs), @@ -684,6 +685,9 @@ export default tseslint.config( "jest.preset.js", ], }, + + // Disable ESLint rules that are already covered by oxlint + ...oxlint.buildFromOxlintConfigFile("./.oxlintrc.json"), ); /** diff --git a/package-lock.json b/package-lock.json index d1ec9c173fb..6990e66fdd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -141,6 +141,7 @@ "eslint-config-prettier": "10.1.2", "eslint-import-resolver-typescript": "4.3.4", "eslint-plugin-import": "2.31.0", + "eslint-plugin-oxlint": "1.32.0", "eslint-plugin-rxjs": "5.0.3", "eslint-plugin-rxjs-angular": "2.0.1", "eslint-plugin-storybook": "9.1.16", @@ -23200,6 +23201,16 @@ "semver": "bin/semver.js" } }, + "node_modules/eslint-plugin-oxlint": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-oxlint/-/eslint-plugin-oxlint-1.32.0.tgz", + "integrity": "sha512-CodKgz/9q3euGbCYrXVRyFxHfnrxn9Q4EywqE4V/VYegry2pJ9/hPQ0OUDTRzbl3/pPbVndkrUUm5tK8NTSgeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "jsonc-parser": "^3.3.1" + } + }, "node_modules/eslint-plugin-rxjs": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/eslint-plugin-rxjs/-/eslint-plugin-rxjs-5.0.3.tgz", diff --git a/package.json b/package.json index ae8069bf20c..b553a5f330e 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "eslint-config-prettier": "10.1.2", "eslint-import-resolver-typescript": "4.3.4", "eslint-plugin-import": "2.31.0", + "eslint-plugin-oxlint": "1.32.0", "eslint-plugin-rxjs": "5.0.3", "eslint-plugin-rxjs-angular": "2.0.1", "eslint-plugin-storybook": "9.1.16",