Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions apps/website/content/docs/presets.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ title: Presets

The following presets are available in `@eslint-react/eslint-plugin`:

<Callout type="info">
For ESLint Legacy Config (`.eslintrc.*`), add a `-legacy` suffix to the preset
name (e.g. `recommended-legacy`).
</Callout>

## Bare Bones

- `x`\
Expand Down
3 changes: 1 addition & 2 deletions packages/plugins/eslint-plugin-react-debug/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
};
3 changes: 1 addition & 2 deletions packages/plugins/eslint-plugin-react-dom/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
};
3 changes: 1 addition & 2 deletions packages/plugins/eslint-plugin-react-web-api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
};
5 changes: 1 addition & 4 deletions packages/plugins/eslint-plugin-react-x/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
};
22 changes: 1 addition & 21 deletions packages/plugins/eslint-plugin/src/index.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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,
Expand All @@ -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),
},
};