fix: update override patterns and minor changes to base config

Author: RebeccaStevens

.cspell.json

@@ -35,13 +35,17 @@
   "words": [
     "bar",
     "baz",
+    "cjsx",
     "corge",
+    "ctsx",
     "foo",
     "fred",
     "garply",
     "grault",
     "litecoin",
+    "mjsx",
     "monero",
+    "mtsx",
     "noreply",
     "plugh",
     "quux",

src/builtin/deprecated.ts

@@ -25,3 +25,5 @@ export const rules: Linter.Config["rules"] = {
   "require-jsdoc": "off",
   "valid-jsdoc": "off",
 };
+
+export const overrides: NonNullable<Linter.Config["overrides"]> = [];

src/builtin/index.ts

@@ -1,13 +1,32 @@
 import type { Linter } from "eslint";
 
-import { rules as deprecated } from "./deprecated";
-import { rules as layout } from "./layout+formatting";
-import { rules as possibleProblems } from "./possible-problems";
-import { rules as suggestions } from "./suggestions";
+import {
+  rules as deprecatedRules,
+  overrides as deprecatedOverrides,
+} from "./deprecated";
+import {
+  rules as layoutRules,
+  overrides as layoutOverrides,
+} from "./layout+formatting";
+import {
+  rules as possibleProblemsRules,
+  overrides as possibleProblemsOverrides,
+} from "./possible-problems";
+import {
+  rules as suggestionsRules,
+  overrides as suggestionsOverrides,
+} from "./suggestions";
 
 export const rules: Linter.Config["rules"] = {
-  ...possibleProblems,
-  ...suggestions,
-  ...layout,
-  ...deprecated,
+  ...possibleProblemsRules,
+  ...suggestionsRules,
+  ...layoutRules,
+  ...deprecatedRules,
 };
+
+export const overrides: NonNullable<Linter.Config["overrides"]> = [
+  ...deprecatedOverrides,
+  ...layoutOverrides,
+  ...possibleProblemsOverrides,
+  ...suggestionsOverrides,
+];

src/builtin/layout+formatting.ts

@@ -290,3 +290,5 @@ export const rules: Linter.Config["rules"] = {
   ],
   "yield-star-spacing": ["error", "after"],
 };
+
+export const overrides: NonNullable<Linter.Config["overrides"]> = [];

src/builtin/possible-problems.ts

@@ -82,3 +82,5 @@ export const rules: Linter.Config["rules"] = {
     },
   ],
 };
+
+export const overrides: NonNullable<Linter.Config["overrides"]> = [];

src/builtin/suggestions.ts

@@ -1,3 +1,4 @@
+import { typescriptDeclarationFiles } from "common/files";
 import type { Linter } from "eslint";
 
 const useNumberIsFinite = "Please use Number.isFinite instead";
@@ -182,3 +183,12 @@ export const rules: Linter.Config["rules"] = {
   "symbol-description": "error",
   "yoda": ["error", "never"],
 };
+
+export const overrides: NonNullable<Linter.Config["overrides"]> = [
+  {
+    files: typescriptDeclarationFiles,
+    rules: {
+      "init-declarations": "off",
+    },
+  },
+];

src/common/files.ts

@@ -0,0 +1,5 @@
+export const typescriptFiles = ["**/*.{ts,tsx,mts,mtsx,cts,ctsx}"];
+export const typescriptDeclarationFiles = ["**/*.d.{ts,mts,cts}"];
+export const jsxFiles = ["**/*.{jsx,cjsx,mjsx,tsx,ctsx,mtsx}"];
+export const testFiles = ["{test,tests}/**/*", "**/*.{spec,test}.*"];
+export const commonJsFiles = ["**/*.{cjs,cts}"];

src/configs/common-overrides.ts

@@ -1,3 +1,4 @@
+import { jsxFiles, testFiles } from "common/files";
 import type { Linter } from "eslint";
 
 export default {
@@ -16,16 +17,19 @@ export default {
       extends: ["@rebeccastevens/eslint-config/script"],
     },
     {
-      files: ["{test,tests}/**/*", "**/*.test.*"],
+      files: testFiles,
       extends: ["@rebeccastevens/eslint-config/test"],
     },
     {
-      files: ["**/*.{cjs,cts}"],
-      rules: {
-        "@typescript-eslint/no-var-requires": "off",
-        "import/no-dynamic-require": "off",
-        "node/no-missing-require": "off",
-        "unicorn/prefer-module": "off",
+      files: jsxFiles,
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+        ecmaFeatures: {
+          globalReturn: false,
+          impliedStrict: true,
+          jsx: true,
+        },
       },
     },
   ],

src/configs/modern.ts

@@ -1,7 +1,10 @@
 import { deepmerge } from "deepmerge-ts";
 import type { Linter } from "eslint";
 
-import { rules as builtinRules } from "~/builtin";
+import {
+  rules as builtinRules,
+  overrides as builtinOverrides,
+} from "~/builtin";
 import { settings as eslintComments } from "~/plugins/eslint-comments";
 import { settings as functional } from "~/plugins/functional";
 import { settings as importPlugin } from "~/plugins/import";
@@ -17,24 +20,23 @@ const baseConfig: Linter.Config = {
   parser: "babel-eslint",
 
   parserOptions: {
-    ecmaVersion: 2021,
+    ecmaVersion: "latest",
     ecmaFeatures: {
       globalReturn: false,
       impliedStrict: true,
     },
     sourceType: "module",
-    extraFileExtensions: [".cjs", ".mjs"],
   },
 
   extends: ["eslint:recommended"],
 
-  env: {
-    es6: true,
-  },
-
   rules: builtinRules,
 
+  overrides: builtinOverrides,
+
   ignorePatterns: ["dist/"],
+
+  reportUnusedDisableDirectives: true,
 };
 
 export default deepmerge(

src/configs/typescript.ts

@@ -33,36 +33,22 @@ const baseConfig: Linter.Config = {
       ".tsx",
       ".mjs",
       ".mts",
+      ".mtsx",
       ".cjs",
       ".cts",
+      ".ctsx",
     ],
     "import/parsers": {
-      "@typescript-eslint/parser": [".ts", ".tsx", ".mts", ".cts"],
+      "@typescript-eslint/parser": [
+        ".ts",
+        ".tsx",
+        ".mts",
+        ".mtsx",
+        ".cts",
+        ".ctsx",
+      ],
     },
   },
-
-  overrides: [
-    {
-      files: ["**/*.{ts,tsx,mts,cts}"],
-      rules: {
-        "import/no-unresolved": "off",
-        "import/named": "off",
-        "import/default": "off",
-        "import/namespace": "off",
-
-        "node/no-unsupported-features/es-syntax": "off",
-      },
-    },
-    {
-      files: "**/*.d.{ts,mts,cts}",
-      rules: {
-        "@typescript-eslint/consistent-type-definitions": "off",
-        "@typescript-eslint/triple-slash-reference": "off",
-
-        "init-declarations": "off",
-      },
-    },
-  ],
 };
 
 export default deepmerge(baseConfig, typescript);

src/plugins/import.ts

@@ -1,3 +1,4 @@
+import { commonJsFiles, typescriptFiles } from "common/files";
 import type { Linter } from "eslint";
 
 export const settings: Linter.Config = {
@@ -150,9 +151,19 @@ export const settings: Linter.Config = {
 
   overrides: [
     {
-      files: ["**/*.cjs"],
+      files: commonJsFiles,
       rules: {
         "import/no-commonjs": "off",
+        "import/no-dynamic-require": "off",
+      },
+    },
+    {
+      files: typescriptFiles,
+      rules: {
+        "import/no-unresolved": "off",
+        "import/named": "off",
+        "import/default": "off",
+        "import/namespace": "off",
       },
     },
   ],

src/plugins/node.ts

@@ -1,3 +1,4 @@
+import { commonJsFiles, typescriptFiles } from "common/files";
 import type { Linter } from "eslint";
 
 export const settings: Linter.Config = {
@@ -36,4 +37,19 @@ export const settings: Linter.Config = {
     "node/prefer-promises/dns": "error",
     "node/prefer-promises/fs": "error",
   },
+
+  overrides: [
+    {
+      files: commonJsFiles,
+      rules: {
+        "node/no-missing-require": "off",
+      },
+    },
+    {
+      files: typescriptFiles,
+      rules: {
+        "node/no-unsupported-features/es-syntax": "off",
+      },
+    },
+  ],
 };

src/plugins/typescript.ts

@@ -1,3 +1,4 @@
+import { commonJsFiles, typescriptDeclarationFiles } from "common/files";
 import type { Linter } from "eslint";
 
 export const settings: Linter.Config = {
@@ -266,4 +267,20 @@ export const settings: Linter.Config = {
     "@typescript-eslint/unified-signatures": "warn",
     "@typescript-eslint/no-redeclare": "error",
   },
+
+  overrides: [
+    {
+      files: commonJsFiles,
+      rules: {
+        "@typescript-eslint/no-var-requires": "off",
+      },
+    },
+    {
+      files: typescriptDeclarationFiles,
+      rules: {
+        "@typescript-eslint/consistent-type-definitions": "off",
+        "@typescript-eslint/triple-slash-reference": "off",
+      },
+    },
+  ],
 };

src/plugins/unicorn.ts

@@ -1,3 +1,4 @@
+import { commonJsFiles } from "common/files";
 import type { Linter } from "eslint";
 
 export const settings: Linter.Config = {
@@ -27,4 +28,13 @@ export const settings: Linter.Config = {
     "unicorn/prefer-top-level-await": "error",
     "unicorn/prevent-abbreviations": "off",
   },
+
+  overrides: [
+    {
+      files: commonJsFiles,
+      rules: {
+        "unicorn/prefer-module": "off",
+      },
+    },
+  ],
 };