fix: fix solid and react configs

Author: aminya

package.json

@@ -46,6 +46,7 @@
     "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-solid": "^0.14.5",
     "eslint-plugin-yaml": "^1.0.3",
+    "globals": "^16.0.0",
     "globify-gitignore": "^1.0.3",
     "make-synchronous": "^0.1.1",
     "prettier": "3.5.3",

pnpm-lock.yaml

@@ -1,28 +1,32 @@
 import type { Linter } from "eslint"
 import base from "./index.cjs"
-import { tsConfig } from "./typescript.cjs"
+import { tsConfigs } from "./typescript.cjs"
+import reactPlugin from "eslint-plugin-react"
+import globals from "globals";
 
-const nonStrictConfig: Linter.Config = {
+const reactTypeScript: Linter.Config = {
+  ...tsConfigs,
+  ...reactPlugin.configs.flat.recommended
+};
+
+const nonStrictConfig: Linter.Config[] = [
   ...base,
-  plugins: ["react", ...(base.plugins ?? [])],
-  extends: ["plugin:react/recommended", ...(base.extends ?? [])],
-  overrides: [
-    // TypeScript:
-    {
-      ...tsConfig,
-      plugins: ["react", ...(tsConfig.plugins ?? [])],
-      extends: ["plugin:react/recommended", ...(tsConfig.extends ?? [])],
-      rules: tsConfig.rules,
-    },
-    // The rest is the same
-    ...(base.overrides?.slice(1) ?? []),
-  ],
-  settings: {
-    ...base.settings,
-    react: {
-      version: "detect",
+  // JavaScript:
+  {
+    files: ['**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}'],
+    ...reactPlugin.configs.flat.recommended,
+  },
+  {
+    files: ['**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}'],
+    languageOptions: {
+      globals: {
+        ...globals.serviceworker,
+        ...globals.browser,
+      },
     },
   },
-}
+  // TypeScript:
+  reactTypeScript,
+]
 
 export default nonStrictConfig

src/index-react.cts

@@ -1,24 +1,19 @@
 import type { Linter } from "eslint"
 import base from "./index.cjs"
 import { tsConfig } from "./typescript.cjs"
+import solid from "eslint-plugin-solid"
+
+const solidTypeScript: Linter.Config = {
+  ...tsConfig,
+  ...solid.configs["flat/typescript"]
+};
 
 const nonStrictConfig: Linter.Config[] = [
   ...base,
   // JavaScript:
-  {
-    files: ["*.js", "*.jsx", "*.mjs", "*.cjs"],
-    plugins: ["solid", ...(base.plugins ?? [])],
-    extends: ["plugin:solid/recommended", ...(base.extends ?? [])],
-  },
+  solid.configs["flat/recommended"],
   // TypeScript:
-  {
-    ...tsConfig,
-    plugins: ["solid", ...(tsConfig.plugins ?? [])],
-    extends: ["plugin:solid/typescript", ...(tsConfig.extends ?? [])],
-    rules: tsConfig.rules,
-  },
-  // The rest is the same
-  ...(base.overrides?.slice(1) ?? []),
+  solidTypeScript,
 ]
 
 export default nonStrictConfig

src/index-solid.cts

@@ -1,5 +1,5 @@
 import { jsConfig } from "./javascript.cjs"
-import { tsConfig } from "./typescript.cjs"
+import { tsConfigs } from "./typescript.cjs"
 import { jsonConfig } from "./json.cjs"
 import { yamlConfig } from "./yaml.cjs"
 import { htmlConfig } from "./html.cjs"
@@ -31,7 +31,7 @@ function maybeAddCoffeeScript() {
 const config: Linter.Config[] = [
   ...jsConfig,
   pluginOptmizeRegex.configs.all,
-  ...tsConfig,
+  ...tsConfigs,
   jsonConfig,
   yamlConfig,
   htmlConfig,

src/index.cts

@@ -9,7 +9,7 @@ import makeSynchronous from "make-synchronous"
 import { eslintRulesExtra } from "./official-eslint-rules.cjs"
 import { pluginImportRulesExtra, pluginImportTypeScriptRulesExtra } from "./plugin-import-rules.cjs"
 import { pluginNodeRules } from "./plugin-node-rules.cjs"
-import { findFilesForGroups } from "./utils.cjs"
+import { findFilesForGroups } from "./searchFs.cjs"
 import * as eslintTypeScriptParser from "@typescript-eslint/parser"
 
 const tsFiles = ["**/*.tsx", "**/*.ts", "**/*.mts", "**/*.cts"]
@@ -125,32 +125,34 @@ const pluginTypeScriptProjectRules: Linter.RulesRecord = disableProjectBasedRule
       "@typescript-eslint/switch-exhaustiveness-check": "warn",
     }
 
-export const tsConfig: Linter.Config[] = [
+export const tsConfig: Linter.Config = {
+  files: tsFiles,
+  languageOptions: {
+    parser: eslintTypeScriptParser,
+    parserOptions: {
+      project: tsConfigFiles,
+      createDefaultProgram: true, // otherwise Eslint will error if a ts file is not covered by one of the tsconfig.json files
+    },
+  },
+  plugins: {
+    node: nodePlugin,
+    import: importPlugin,
+    "only-warn": onlyWarnPlugin,
+  },
+  rules: {
+    ...javaScriptRules(),
+    ...pluginTypeScriptRulesExtra,
+    ...pluginTypeScriptProjectRules,
+    ...pluginNodeRules,
+    ...pluginImportRulesExtra,
+    ...pluginImportTypeScriptRulesExtra,
+    ...importPlugin.configs.recommended.rules,
+  },
+};
+
+export const tsConfigs: Linter.Config[] = [
   // TypeScript files
   js.configs.recommended,
   ...typeScriptPlugin.configs.recommended,
-  {
-    files: tsFiles,
-    languageOptions: {
-      parser: eslintTypeScriptParser,
-      parserOptions: {
-        project: tsConfigFiles,
-        createDefaultProgram: true, // otherwise Eslint will error if a ts file is not covered by one of the tsconfig.json files
-      },
-    },
-    plugins: {
-      node: nodePlugin,
-      import: importPlugin,
-      "only-warn": onlyWarnPlugin,
-    },
-    rules: {
-      ...javaScriptRules(),
-      ...pluginTypeScriptRulesExtra,
-      ...pluginTypeScriptProjectRules,
-      ...pluginNodeRules,
-      ...pluginImportRulesExtra,
-      ...pluginImportTypeScriptRulesExtra,
-      ...importPlugin.configs.recommended.rules,
-    },
-  },
+  tsConfig,
 ]