diff --git a/apps/website/content/docs/presets.mdx b/apps/website/content/docs/presets.mdx index 74ac101db..dd6ac3d07 100644 --- a/apps/website/content/docs/presets.mdx +++ b/apps/website/content/docs/presets.mdx @@ -4,11 +4,6 @@ title: Presets The following presets are available in `@eslint-react/eslint-plugin`: - - For ESLint Legacy Config (`.eslintrc.*`), add a `-legacy` suffix to the preset - name (e.g. `recommended-legacy`). - - ## Bare Bones - `x`\ diff --git a/packages/plugins/eslint-plugin-react-debug/src/index.ts b/packages/plugins/eslint-plugin-react-debug/src/index.ts index 05d4a4423..3a6fade4a 100644 --- a/packages/plugins/eslint-plugin-react-debug/src/index.ts +++ b/packages/plugins/eslint-plugin-react-debug/src/index.ts @@ -3,12 +3,11 @@ import { getConfigAdapters } from "@eslint-react/shared"; import * as allConfig from "./configs/all"; import { plugin } from "./plugin"; -const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-debug", plugin); +const { toFlatConfig } = getConfigAdapters("react-debug", plugin); export default { ...plugin, configs: { ["all"]: toFlatConfig(allConfig), - ["all-legacy"]: toLegacyConfig(allConfig), }, }; diff --git a/packages/plugins/eslint-plugin-react-dom/src/index.ts b/packages/plugins/eslint-plugin-react-dom/src/index.ts index a237809bf..07d7f4678 100644 --- a/packages/plugins/eslint-plugin-react-dom/src/index.ts +++ b/packages/plugins/eslint-plugin-react-dom/src/index.ts @@ -3,12 +3,11 @@ import { getConfigAdapters } from "@eslint-react/shared"; import * as recommendedConfig from "./configs/recommended"; import { plugin } from "./plugin"; -const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-dom", plugin); +const { toFlatConfig } = getConfigAdapters("react-dom", plugin); export default { ...plugin, configs: { ["recommended"]: toFlatConfig(recommendedConfig), - ["recommended-legacy"]: toLegacyConfig(recommendedConfig), }, }; diff --git a/packages/plugins/eslint-plugin-react-hooks-extra/src/index.ts b/packages/plugins/eslint-plugin-react-hooks-extra/src/index.ts index 0fc669868..c388b695a 100644 --- a/packages/plugins/eslint-plugin-react-hooks-extra/src/index.ts +++ b/packages/plugins/eslint-plugin-react-hooks-extra/src/index.ts @@ -3,12 +3,11 @@ import { getConfigAdapters } from "@eslint-react/shared"; import * as recommendedConfig from "./configs/recommended"; import { plugin } from "./plugin"; -const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-hooks-extra", plugin); +const { toFlatConfig } = getConfigAdapters("react-hooks-extra", plugin); export default { ...plugin, configs: { ["recommended"]: toFlatConfig(recommendedConfig), - ["recommended-legacy"]: toLegacyConfig(recommendedConfig), }, }; diff --git a/packages/plugins/eslint-plugin-react-naming-convention/src/index.ts b/packages/plugins/eslint-plugin-react-naming-convention/src/index.ts index 288943c2d..ffd624ca3 100644 --- a/packages/plugins/eslint-plugin-react-naming-convention/src/index.ts +++ b/packages/plugins/eslint-plugin-react-naming-convention/src/index.ts @@ -3,12 +3,11 @@ import { getConfigAdapters } from "@eslint-react/shared"; import * as recommendedConfig from "./configs/recommended"; import { plugin } from "./plugin"; -const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-naming-convention", plugin); +const { toFlatConfig } = getConfigAdapters("react-naming-convention", plugin); export default { ...plugin, configs: { ["recommended"]: toFlatConfig(recommendedConfig), - ["recommended-legacy"]: toLegacyConfig(recommendedConfig), }, }; diff --git a/packages/plugins/eslint-plugin-react-web-api/src/index.ts b/packages/plugins/eslint-plugin-react-web-api/src/index.ts index 6892523fa..c50a635da 100644 --- a/packages/plugins/eslint-plugin-react-web-api/src/index.ts +++ b/packages/plugins/eslint-plugin-react-web-api/src/index.ts @@ -3,12 +3,11 @@ import { getConfigAdapters } from "@eslint-react/shared"; import * as recommendedConfig from "./configs/recommended"; import { plugin } from "./plugin"; -const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-web-api", plugin); +const { toFlatConfig } = getConfigAdapters("react-web-api", plugin); export default { ...plugin, configs: { ["recommended"]: toFlatConfig(recommendedConfig), - ["recommended-legacy"]: toLegacyConfig(recommendedConfig), }, }; diff --git a/packages/plugins/eslint-plugin-react-x/src/index.ts b/packages/plugins/eslint-plugin-react-x/src/index.ts index a999ff689..baa65c137 100644 --- a/packages/plugins/eslint-plugin-react-x/src/index.ts +++ b/packages/plugins/eslint-plugin-react-x/src/index.ts @@ -5,16 +5,13 @@ import * as recommendedTypeCheckedConfig from "./configs/recommended-type-checke import * as recommendedTypeScriptConfig from "./configs/recommended-typescript"; import { plugin } from "./plugin"; -const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-x", plugin); +const { toFlatConfig } = getConfigAdapters("react-x", plugin); export default { ...plugin, configs: { ["recommended"]: toFlatConfig(recommendedConfig), - ["recommended-legacy"]: toLegacyConfig(recommendedConfig), ["recommended-type-checked"]: toFlatConfig(recommendedTypeCheckedConfig), - ["recommended-type-checked-legacy"]: toLegacyConfig(recommendedTypeCheckedConfig), ["recommended-typescript"]: toFlatConfig(recommendedTypeScriptConfig), - ["recommended-typescript-legacy"]: toLegacyConfig(recommendedTypeScriptConfig), }, }; diff --git a/packages/plugins/eslint-plugin/src/index.ts b/packages/plugins/eslint-plugin/src/index.ts index cf3e31d02..79224d25a 100644 --- a/packages/plugins/eslint-plugin/src/index.ts +++ b/packages/plugins/eslint-plugin/src/index.ts @@ -1,4 +1,4 @@ -import type { CompatibleConfig, CompatiblePlugin } from "@eslint-react/kit"; +import type { CompatiblePlugin } from "@eslint-react/kit"; import reactDebug from "eslint-plugin-react-debug"; import reactDom from "eslint-plugin-react-dom"; import reactHooksExtra from "eslint-plugin-react-hooks-extra"; @@ -22,13 +22,6 @@ import * as recommendedTypeScriptConfig from "./configs/recommended-typescript"; import * as xConfig from "./configs/x"; import { padKeysLeft } from "./utils"; -function toLegacyConfig({ rules }: CompatibleConfig) { - return { - plugins: ["@eslint-react"], - rules, - }; -} - const plugin: CompatiblePlugin = { meta: { name, @@ -48,30 +41,17 @@ export default { ...plugin, configs: { ["all"]: allConfig, - ["all-legacy"]: toLegacyConfig(allConfig), ["debug"]: debugConfig, - ["debug-legacy"]: toLegacyConfig(debugConfig), ["disable-conflict-eslint-plugin-react"]: disableConflictEslintPluginReact, - ["disable-conflict-eslint-plugin-react-legacy"]: toLegacyConfig(disableConflictEslintPluginReact), ["disable-debug"]: disableDebugConfig, - ["disable-debug-legacy"]: toLegacyConfig(disableDebugConfig), ["disable-dom"]: disableDomConfig, - ["disable-dom-legacy"]: toLegacyConfig(disableDomConfig), ["disable-type-checked"]: disableTypeCheckedConfig, - ["disable-type-checked-legacy"]: toLegacyConfig(disableTypeCheckedConfig), ["disable-web-api"]: disableWebApiConfig, - ["disable-web-api-legacy"]: toLegacyConfig(disableWebApiConfig), ["dom"]: domConfig, - ["dom-legacy"]: toLegacyConfig(domConfig), ["off"]: offConfig, - ["off-legacy"]: toLegacyConfig(offConfig), ["recommended"]: recommendedConfig, - ["recommended-legacy"]: toLegacyConfig(recommendedConfig), ["recommended-type-checked"]: recommendedTypeCheckedConfig, - ["recommended-type-checked-legacy"]: toLegacyConfig(recommendedTypeCheckedConfig), ["recommended-typescript"]: recommendedTypeScriptConfig, - ["recommended-typescript-legacy"]: toLegacyConfig(recommendedTypeScriptConfig), ["x"]: xConfig, - ["x-legacy"]: toLegacyConfig(xConfig), }, };