refactor: refine compatible types

apps/website/package.json

@@ -14,12 +14,12 @@
     "@eslint-react/eff": "workspace:*",
     "bsky-react-post": "^0.1.7",
     "clsx": "^2.1.1",
-    "fumadocs-core": "15.7.4",
+    "fumadocs-core": "15.7.7",
     "fumadocs-docgen": "3.0.0",
-    "fumadocs-mdx": "11.8.1",
-    "fumadocs-twoslash": "3.1.6",
+    "fumadocs-mdx": "11.8.2",
+    "fumadocs-twoslash": "3.1.7",
     "fumadocs-typescript": "4.0.6",
-    "fumadocs-ui": "15.7.4",
+    "fumadocs-ui": "15.7.7",
     "lucide-react": "^0.542.0",
     "next": "^15.5.2",
     "next-view-transitions": "^0.3.4",

package.json

@@ -70,7 +70,7 @@
     "@typescript-eslint/rule-tester": "^8.41.0",
     "@typescript-eslint/types": "^8.41.0",
     "ansis": "^4.1.0",
-    "cspell": "^9.2.0",
+    "cspell": "^9.2.1",
     "dedent": "^1.6.0",
     "dprint": "^0.50.1",
     "effect": "^3.17.9",

packages/plugins/eslint-plugin-react-debug/src/configs/all.ts

@@ -1,4 +1,4 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
 
 export const name = "react-debug/all";
@@ -9,7 +9,7 @@ export const rules = {
   "react-debug/hook": "warn",
   "react-debug/is-from-react": "warn",
   "react-debug/jsx": "warn",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;
 
 export const settings = {
   "react-x": DEFAULT_ESLINT_REACT_SETTINGS,

packages/plugins/eslint-plugin-react-debug/src/index.ts

@@ -1,24 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
-import type { CompatibleConfig } from "@eslint-react/shared";
+import { getConfigAdapters } from "@eslint-react/shared";
 
 import * as allConfig from "./configs/all";
 import { plugin } from "./plugin";
 
-function toFlatConfig(config: CompatibleConfig) {
-  return {
-    ...config,
-    plugins: {
-      "react-debug": plugin,
-    },
-  };
-}
-
-function toLegacyConfig({ rules }: { rules: RulePreset }) {
-  return {
-    plugins: ["react-debug"],
-    rules,
-  };
-}
+const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-debug", plugin);
 
 export default {
   ...plugin,

packages/plugins/eslint-plugin-react-debug/src/plugin.ts

@@ -1,4 +1,4 @@
-import type { CompatiblePlugin } from "@eslint-react/shared";
+import type { CompatiblePlugin } from "@eslint-react/kit";
 
 import { name, version } from "../package.json";
 

packages/plugins/eslint-plugin-react-dom/src/configs/recommended.ts

@@ -1,4 +1,4 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
 
 export const name = "react-dom/recommended";
@@ -19,7 +19,7 @@ export const rules = {
   "react-dom/no-unsafe-target-blank": "warn",
   "react-dom/no-use-form-state": "error",
   "react-dom/no-void-elements-with-children": "error",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;
 
 export const settings = {
   "react-x": DEFAULT_ESLINT_REACT_SETTINGS,

packages/plugins/eslint-plugin-react-dom/src/index.ts

@@ -1,24 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
-import type { CompatibleConfig } from "@eslint-react/shared";
+import { getConfigAdapters } from "@eslint-react/shared";
 
 import * as recommendedConfig from "./configs/recommended";
 import { plugin } from "./plugin";
 
-function toFlatConfig(config: CompatibleConfig) {
-  return {
-    ...config,
-    plugins: {
-      "react-dom": plugin,
-    },
-  };
-}
-
-function toLegacyConfig({ rules }: { rules: RulePreset }) {
-  return {
-    plugins: ["react-dom"],
-    rules,
-  };
-}
+const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-dom", plugin);
 
 export default {
   ...plugin,

packages/plugins/eslint-plugin-react-dom/src/plugin.ts

@@ -1,4 +1,4 @@
-import type { CompatiblePlugin } from "@eslint-react/shared";
+import type { CompatiblePlugin } from "@eslint-react/kit";
 
 import { name, version } from "../package.json";
 

packages/plugins/eslint-plugin-react-hooks-extra/src/configs/recommended.ts

@@ -1,9 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 
 export const name = "react-hooks-extra/recommended";
 
 export const rules = {
   "react-hooks-extra/no-direct-set-state-in-use-effect": "warn",
   "react-hooks-extra/no-unnecessary-use-prefix": "warn",
   "react-hooks-extra/prefer-use-state-lazy-initialization": "warn",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;

packages/plugins/eslint-plugin-react-hooks-extra/src/index.ts

@@ -1,24 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
-import type { CompatibleConfig } from "@eslint-react/shared";
+import { getConfigAdapters } from "@eslint-react/shared";
 
 import * as recommendedConfig from "./configs/recommended";
 import { plugin } from "./plugin";
 
-function toFlatConfig(config: CompatibleConfig) {
-  return {
-    ...config,
-    plugins: {
-      "react-hooks-extra": plugin,
-    },
-  };
-}
-
-function toLegacyConfig({ rules }: { rules: RulePreset }) {
-  return {
-    plugins: ["react-hooks-extra"],
-    rules,
-  };
-}
+const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-hooks-extra", plugin);
 
 export default {
   ...plugin,

packages/plugins/eslint-plugin-react-hooks-extra/src/plugin.ts

@@ -1,4 +1,4 @@
-import type { CompatiblePlugin } from "@eslint-react/shared";
+import type { CompatiblePlugin } from "@eslint-react/kit";
 
 import { name, version } from "../package.json";
 import noDirectSetStateInUseEffect from "./rules/no-direct-set-state-in-use-effect";

packages/plugins/eslint-plugin-react-naming-convention/src/configs/recommended.ts

@@ -1,8 +1,8 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 
 export const name = "react-naming-convention/recommended";
 
 export const rules = {
   "react-naming-convention/context-name": "warn",
   // "react-naming-convention/use-state": "warn",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;

packages/plugins/eslint-plugin-react-naming-convention/src/index.ts

@@ -1,24 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
-import type { CompatibleConfig } from "@eslint-react/shared";
+import { getConfigAdapters } from "@eslint-react/shared";
 
 import * as recommendedConfig from "./configs/recommended";
 import { plugin } from "./plugin";
 
-function toFlatConfig(config: CompatibleConfig) {
-  return {
-    ...config,
-    plugins: {
-      "react-naming-convention": plugin,
-    },
-  };
-}
-
-function toLegacyConfig({ rules }: { rules: RulePreset }) {
-  return {
-    plugins: ["react-naming-convention"],
-    rules,
-  };
-}
+const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-naming-convention", plugin);
 
 export default {
   ...plugin,

packages/plugins/eslint-plugin-react-naming-convention/src/plugin.ts

@@ -1,4 +1,4 @@
-import type { CompatiblePlugin } from "@eslint-react/shared";
+import type { CompatiblePlugin } from "@eslint-react/kit";
 
 import { name, version } from "../package.json";
 

packages/plugins/eslint-plugin-react-web-api/src/configs/recommended.ts

@@ -1,4 +1,4 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
 
 export const name = "react-web-api/recommended";
@@ -8,7 +8,7 @@ export const rules = {
   "react-web-api/no-leaked-interval": "warn",
   "react-web-api/no-leaked-resize-observer": "warn",
   "react-web-api/no-leaked-timeout": "warn",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;
 
 export const settings = {
   "react-x": DEFAULT_ESLINT_REACT_SETTINGS,

packages/plugins/eslint-plugin-react-web-api/src/index.ts

@@ -1,24 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
-import type { CompatibleConfig } from "@eslint-react/shared";
+import { getConfigAdapters } from "@eslint-react/shared";
 
 import * as recommendedConfig from "./configs/recommended";
 import { plugin } from "./plugin";
 
-function toFlatConfig(config: CompatibleConfig) {
-  return {
-    ...config,
-    plugins: {
-      "react-web-api": plugin,
-    },
-  };
-}
-
-function toLegacyConfig({ rules }: { rules: RulePreset }) {
-  return {
-    plugins: ["react-web-api"],
-    rules,
-  };
-}
+const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-web-api", plugin);
 
 export default {
   ...plugin,

packages/plugins/eslint-plugin-react-web-api/src/plugin.ts

@@ -1,4 +1,4 @@
-import type { CompatiblePlugin } from "@eslint-react/shared";
+import type { CompatiblePlugin } from "@eslint-react/kit";
 
 import { name, version } from "../package.json";
 

packages/plugins/eslint-plugin-react-x/src/configs/recommended-type-checked.ts

@@ -1,4 +1,4 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 
 import * as recommendedTypeScript from "./recommended-typescript";
 
@@ -8,7 +8,7 @@ export const rules = {
   ...recommendedTypeScript.rules,
   "react-x/no-leaked-conditional-rendering": "warn",
   // "react-x/prefer-read-only-props": "warn",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;
 
 export const settings = {
   ...recommendedTypeScript.settings,

packages/plugins/eslint-plugin-react-x/src/configs/recommended-typescript.ts

@@ -1,4 +1,4 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 
 import * as recommended from "./recommended";
 
@@ -10,7 +10,7 @@ export const rules = {
   "react-x/jsx-no-undef": "off",
   "react-x/jsx-uses-react": "off",
   "react-x/jsx-uses-vars": "off",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;
 
 export const settings = {
   ...recommended.settings,

packages/plugins/eslint-plugin-react-x/src/configs/recommended.ts

@@ -1,4 +1,4 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 import { DEFAULT_ESLINT_REACT_SETTINGS } from "@eslint-react/shared";
 
 export const name = "react-x/recommended";
@@ -46,7 +46,7 @@ export const rules = {
   "react-x/no-unused-state": "warn",
   "react-x/no-use-context": "warn",
   "react-x/no-useless-forward-ref": "warn",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;
 
 export const settings = {
   "react-x": DEFAULT_ESLINT_REACT_SETTINGS,

packages/plugins/eslint-plugin-react-x/src/index.ts

@@ -1,26 +1,11 @@
-import type { RulePreset } from "@eslint-react/kit";
-import type { CompatibleConfig } from "@eslint-react/shared";
+import { getConfigAdapters } from "@eslint-react/shared";
 
 import * as recommendedConfig from "./configs/recommended";
 import * as recommendedTypeCheckedConfig from "./configs/recommended-type-checked";
 import * as recommendedTypeScriptConfig from "./configs/recommended-typescript";
 import { plugin } from "./plugin";
 
-function toFlatConfig(config: CompatibleConfig) {
-  return {
-    ...config,
-    plugins: {
-      "react-x": plugin,
-    },
-  };
-}
-
-function toLegacyConfig({ rules }: { rules: RulePreset }) {
-  return {
-    plugins: ["react-x"],
-    rules,
-  };
-}
+const { toFlatConfig, toLegacyConfig } = getConfigAdapters("react-x", plugin);
 
 export default {
   ...plugin,

packages/plugins/eslint-plugin-react-x/src/plugin.ts

@@ -1,4 +1,4 @@
-import type { CompatiblePlugin } from "@eslint-react/shared";
+import type { CompatiblePlugin } from "@eslint-react/kit";
 
 import { name, version } from "../package.json";
 import avoidShorthandBoolean from "./rules/avoid-shorthand-boolean";

packages/plugins/eslint-plugin/src/configs/all.ts

@@ -1,4 +1,4 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 import reactDebug from "eslint-plugin-react-debug";
 import reactHooksExtra from "eslint-plugin-react-hooks-extra";
 import reactNamingConvention from "eslint-plugin-react-naming-convention";
@@ -103,7 +103,7 @@ export const rules = {
   "@eslint-react/naming-convention/filename": "warn",
   "@eslint-react/naming-convention/filename-extension": "warn",
   "@eslint-react/naming-convention/use-state": "warn",
-} as const satisfies RulePreset;
+} as const satisfies Record<string, RuleConfig>;
 
 export const plugins = {
   ...x.plugins,

packages/plugins/eslint-plugin/src/configs/disable-debug.ts

@@ -1,7 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 
 import { rules as debugRules } from "./debug";
 
 export const name = "@eslint-react/disable-debug";
 
-export const rules: RulePreset = Object.fromEntries(Object.entries(debugRules).map(([rule]) => [rule, "off"]));
+export const rules: Record<string, RuleConfig> = Object.fromEntries(
+  Object.entries(debugRules).map(([rule]) => [rule, "off"]),
+);

packages/plugins/eslint-plugin/src/configs/disable-dom.ts

@@ -1,7 +1,9 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 
 import { rules as domRules } from "./dom";
 
 export const name = "@eslint-react/disable-dom";
 
-export const rules: RulePreset = Object.fromEntries(Object.entries(domRules).map(([key]) => [key, "off"] as const));
+export const rules: Record<string, RuleConfig> = Object.fromEntries(
+  Object.entries(domRules).map(([key]) => [key, "off"] as const),
+);

packages/plugins/eslint-plugin/src/configs/disable-type-checked.ts

@@ -1,8 +1,8 @@
-import type { RulePreset } from "@eslint-react/kit";
+import type { RuleConfig } from "@eslint-react/kit";
 
 export const name = "@eslint-react/disable-type-checked";
 
-export const rules: RulePreset = {
+export const rules: Record<string, RuleConfig> = {
   "@eslint-react/no-leaked-conditional-rendering": "off",
   "@eslint-react/prefer-read-only-props": "off",
 };