fix: fix ts types

Author: Rel1cx

apps/website/app/base.css

@@ -2,7 +2,8 @@
 @import "fumadocs-ui/css/neutral.css";
 @import "fumadocs-ui/css/preset.css";
 
+@source "../components/fumadocs-ui/**/*.js";
+
 @source ".";
 @source "../components";
 @source "../content";
-@source "../components/fumadocs-ui/dist/**/*.js";

package.json

@@ -115,18 +115,18 @@
   },
   "pnpm": {
     "overrides": {
-      "is-core-module": "npm:@socketregistry/is-core-module@^1.0.7",
-      "safe-buffer": "npm:@socketregistry/safe-buffer@^1.0.6",
-      "safer-buffer": "npm:@socketregistry/safer-buffer@^1.0.6",
-      "typedarray": "npm:@socketregistry/typedarray@^1.0.5",
       "@types/react": "^19.0.10",
       "@types/react-dom": "^19.0.4",
       "cross-spawn": "^7.0.6",
       "esbuild": "^0.25.0",
+      "is-core-module": "npm:@socketregistry/is-core-module@^1.0.7",
       "next": "^15.1.7",
       "react": "^19.0.0",
       "react-dom": "^19.0.0",
+      "safe-buffer": "npm:@socketregistry/safe-buffer@^1.0.6",
+      "safer-buffer": "npm:@socketregistry/safer-buffer@^1.0.6",
       "ts-api-utils": "^2.0.1",
+      "typedarray": "npm:@socketregistry/typedarray@^1.0.5",
       "typescript": "^5.7.3"
     }
   }

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

@@ -1,29 +1,27 @@
-import type { Linter } from "eslint";
-
+import type { RulePreset } from "@eslint-react/shared";
 import * as allConfig from "./configs/all";
 import { plugin } from "./plugin";
 
-function makeConfig(config: Linter.Config): Linter.Config {
+function makeConfig(config: { name: string; rules: RulePreset }) {
   return {
     ...config,
     plugins: {
-      ...config.plugins,
-      "react-dom": plugin,
+      "react-x": plugin,
     },
   };
 }
 
-function toLegacyConfig({ rules }: Linter.Config): Linter.LegacyConfig {
+function makeLegacyConfig(config: { rules: RulePreset }) {
   return {
-    plugins: ["react-debug"],
-    rules,
+    ...config,
+    plugins: ["react-x"],
   };
 }
 
 export default {
   ...plugin,
   configs: {
     ["all"]: makeConfig(allConfig),
-    ["all-legacy"]: toLegacyConfig(allConfig),
+    ["all-legacy"]: makeLegacyConfig(allConfig),
   },
 };

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

@@ -21,5 +21,4 @@ export const plugin = {
     /** @deprecated Use `hook` instead */
     "react-hooks": hook,
   },
-  // remove this type assertion when the typescript-eslint and eslint type incompatible issue is resolved
-} as unknown as ESLint.Plugin;
+} as const;

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

@@ -1,29 +1,27 @@
-import type { Linter } from "eslint";
-
+import type { RulePreset } from "@eslint-react/shared";
 import * as recommendedConfig from "./configs/recommended";
 import { plugin } from "./plugin";
 
-function makeConfig(config: Linter.Config): Linter.Config {
+function makeConfig(config: { name: string; rules: RulePreset }) {
   return {
     ...config,
     plugins: {
-      ...config.plugins,
-      "react-dom": plugin,
+      "react-x": plugin,
     },
   };
 }
 
-function toLegacyConfig({ rules }: Linter.Config): Linter.LegacyConfig {
+function makeLegacyConfig(config: { rules: RulePreset }) {
   return {
-    plugins: ["react-dom"],
-    rules,
+    ...config,
+    plugins: ["react-x"],
   };
 }
 
 export default {
   ...plugin,
   configs: {
     ["recommended"]: makeConfig(recommendedConfig),
-    ["recommended-legacy"]: toLegacyConfig(recommendedConfig),
+    ["recommended-legacy"]: makeLegacyConfig(recommendedConfig),
   },
 };

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

@@ -37,5 +37,4 @@ export const plugin = {
     /** @deprecated Use `no-void-elements-with-children` instead */
     "no-children-in-void-dom-elements": noVoidElementsWithChildren,
   },
-  // remove this type assertion when the typescript-eslint and eslint type incompatible issue is resolved
-} as unknown as ESLint.Plugin;
+} as const;

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

@@ -1,29 +1,27 @@
-import type { Linter } from "eslint";
-
+import type { RulePreset } from "@eslint-react/shared";
 import * as recommendedConfig from "./configs/recommended";
 import { plugin } from "./plugin";
 
-function makeConfig(config: Linter.Config): Linter.Config {
+function makeConfig(config: { name: string; rules: RulePreset }) {
   return {
     ...config,
     plugins: {
-      ...config.plugins,
-      "react-hooks-extra": plugin,
+      "react-x": plugin,
     },
   };
 }
 
-function toLegacyConfig({ rules }: Linter.Config): Linter.LegacyConfig {
+function makeLegacyConfig(config: { rules: RulePreset }) {
   return {
-    plugins: ["react-hooks-extra"],
-    rules,
+    ...config,
+    plugins: ["react-x"],
   };
 }
 
 export default {
   ...plugin,
   configs: {
     ["recommended"]: makeConfig(recommendedConfig),
-    ["recommended-legacy"]: toLegacyConfig(recommendedConfig),
+    ["recommended-legacy"]: makeLegacyConfig(recommendedConfig),
   },
 };

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

@@ -31,5 +31,4 @@ export const plugin = {
     /** @deprecated Use `no-useless-custom-hooks` instead */
     "no-redundant-custom-hook": noUselessCustomHooks,
   },
-  // remove this type assertion when the typescript-eslint and eslint type incompatible issue is resolved
-} as unknown as ESLint.Plugin;
+} as const;

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

@@ -1,29 +1,27 @@
-import type { Linter } from "eslint";
-
+import type { RulePreset } from "@eslint-react/shared";
 import * as recommendedConfig from "./configs/recommended";
 import { plugin } from "./plugin";
 
-function makeConfig(config: Linter.Config): Linter.Config {
+function makeConfig(config: { name: string; rules: RulePreset }) {
   return {
     ...config,
     plugins: {
-      ...config.plugins,
-      "react-naming-convention": plugin,
+      "react-x": plugin,
     },
   };
 }
 
-function toLegacyConfig({ rules }: Linter.Config): Linter.LegacyConfig {
+function makeLegacyConfig(config: { rules: RulePreset }) {
   return {
-    plugins: ["react-naming-convention"],
-    rules,
+    ...config,
+    plugins: ["react-x"],
   };
 }
 
 export default {
   ...plugin,
   configs: {
     ["recommended"]: makeConfig(recommendedConfig),
-    ["recommended-legacy"]: toLegacyConfig(recommendedConfig),
+    ["recommended-legacy"]: makeLegacyConfig(recommendedConfig),
   },
 };

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

@@ -17,5 +17,4 @@ export const plugin = {
     "filename-extension": filenameExtension,
     "use-state": useState,
   },
-  // remove this type assertion when the typescript-eslint and eslint type incompatible issue is resolved
-} as unknown as ESLint.Plugin;
+} as const;