chore(config): consolidate eslint config

Kurocado-Studio · Dec 8, 2024 · 8f67f12 · 8f67f12
1 parent 50f0990
commit 8f67f12
Show file tree

Hide file tree

Showing 7 changed files with 786 additions and 721 deletions.
diff --git a/package.json b/package.json
@@ -85,12 +85,14 @@
     "eslint-plugin-tsdoc": "^0.2.17",
     "eslint-plugin-unicorn": "^51.0.1",
     "eslint-plugin-vitest": "^0.5.4",
+    "globals": "^15.13.0",
     "jsdom": "^25.0.1",
     "lint-staged": "^15.2.10",
     "prettier-plugin-packagejson": "^2.5.6",
     "prettier-plugin-sort-imports": "^1.8.6",
     "prettier-plugin-tailwindcss": "^0.6.9",
     "semantic-release-github-pullrequest": "^1.3.0",
+    "typescript-eslint": "^8.17.0",
     "url-join": "^4.0.1",
     "vite-plugin-dts": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/eslint/constants.js b/src/eslint/constants.js
@@ -7,31 +7,34 @@
  * Explore our open-source projects: {@link https://github.com/kurocado-studio}
  */
 import babelParser from '@babel/eslint-parser';
-import tsRecommended from '@typescript-eslint/eslint-plugin';
 import typescriptParser from '@typescript-eslint/parser';
 import prettierConfig from 'eslint-config-prettier';
 import eslintPluginImport from 'eslint-plugin-import';
 import tsdocRecommended from 'eslint-plugin-tsdoc';
 import unicornRecommended from 'eslint-plugin-unicorn';
 import vitestRecommended from 'eslint-plugin-vitest';
+import tsRecommended from 'typescript-eslint';
 
 import { base } from './rules/base/index.js';
 import { typescriptEslintConfig } from './rules/typescript/index.js';
 
-const SPEC_PREFIX = 'spec';
-const TEST_PREFIX = 'test';
+export const JS_EXTENSIONS_PREFIX = '{js,cjs,jsx,mjsx}';
+export const TS_EXTENSIONS_PREFIX = '{ts,tsx,mtsx}';
+export const SPEC_PREFIX = 'spec';
+export const TEST_PREFIX = 'test';
 
 export const sharedEslintConfig = {
   ECMA_VERSION: 2021,
-  JAVASCRIPT_FILES: ['*.js?(x)', '*.mjs'],
+  JAVASCRIPT_FILES: [`**/*.${JS_EXTENSIONS_PREFIX}`],
   JAVASCRIPT_TEST_FILES: [
-    `*.${TEST_PREFIX}.js?(x)`,
-    `*.${SPEC_PREFIX}.js?(x)`,
-    `*.${TEST_PREFIX}.mjs?(x)`,
-    `*.${SPEC_PREFIX}.mjs?(x)`,
+    `**/*.${TEST_PREFIX}.${JS_EXTENSIONS_PREFIX}`,
+    `**/*.${SPEC_PREFIX}.${JS_EXTENSIONS_PREFIX}`,
+  ],
+  TYPESCRIPT_FILES: [`**/*.${TS_EXTENSIONS_PREFIX}`],
+  TYPESCRIPT_TEST_FILES: [
+    `**/*.${TEST_PREFIX}.${TS_EXTENSIONS_PREFIX}`,
+    `**/*.${SPEC_PREFIX}.${TS_EXTENSIONS_PREFIX}`,
   ],
-  TYPESCRIPT_FILES: ['*.ts?(x)'],
-  TYPESCRIPT_TEST_FILES: [`*.${TEST_PREFIX}.ts?(x)`, `*.${SPEC_PREFIX}.ts?(x)`],
 };
 
 export const typescriptLanguageOptions = {
@@ -67,12 +70,9 @@ export const javascriptLanguageOptions = {
   },
 };
 
-export const tsconfigRootDir = process.cwd();
-
 export const typescriptLanguageRootConfig = {
   ...typescriptLanguageOptions,
   plugins: {
-    '@typescript-eslint': tsRecommended,
     import: eslintPluginImport,
     prettierConfig,
     tsdoc: tsdocRecommended,
@@ -81,6 +81,7 @@ export const typescriptLanguageRootConfig = {
   },
   rules: {
     ...base.rules,
+    ...tsRecommended.rules,
     ...eslintPluginImport.configs.recommended.rules,
     ...eslintPluginImport.configs.typescript.rules,
     ...typescriptEslintConfig.rules,
@@ -93,14 +94,14 @@ export const typescriptLanguageRootConfig = {
 export const javascriptLanguageRootConfig = {
   ...javascriptLanguageOptions,
   plugins: {
-    '@typescript-eslint': tsRecommended,
     import: eslintPluginImport,
-    prettierConfig,
+    prettier: prettierConfig,
     tsdoc: tsdocRecommended,
     unicorn: unicornRecommended,
     vitest: vitestRecommended,
   },
   rules: {
-    '@typescript-eslint/no-var-requires': 'off',
+    ...base.rules,
+    ...eslintPluginImport.configs.recommended.rules,
   },
 };
diff --git a/src/eslint/eslint.base.js b/src/eslint/eslint.base.js
@@ -8,8 +8,11 @@
  */
 import eslintPluginImport from 'eslint-plugin-import';
 import vitestRecommended from 'eslint-plugin-vitest';
+import globals from 'globals';
 
 import {
+  JS_EXTENSIONS_PREFIX,
+  TS_EXTENSIONS_PREFIX,
   javascriptLanguageRootConfig,
   sharedEslintConfig,
   typescriptLanguageRootConfig,
@@ -39,11 +42,23 @@ export const eslintBaseConfig = [
     },
   },
   {
-    files: ['vitest.web.ts', 'vitest.node.ts'],
+    files: [`vite.*.${TS_EXTENSIONS_PREFIX}`],
     rules: {
       'import/no-cycle': 'off',
     },
   },
+  {
+    files: [`**/*.${JS_EXTENSIONS_PREFIX}`, `**/*.${TS_EXTENSIONS_PREFIX}`],
+    languageOptions: {
+      globals: globals.node,
+    },
+  },
+  {
+    files: ['src/eslint/constants.js'],
+    rules: {
+      'import/no-unresolved': 'off',
+    },
+  },
   {
     files: [
       '.commitlintrc.js',
@@ -56,6 +71,6 @@ export const eslintBaseConfig = [
     },
   },
   {
-    ignores: ['dist/*', '**/*.d.ts', 'node_modules', '**/temp.js', 'config/*'],
+    ignores: ['**/*.d.ts', 'dist/*', 'build/*', 'node_modules'],
   },
 ];
diff --git a/src/eslint/eslint.browser.js b/src/eslint/eslint.browser.js
@@ -6,22 +6,19 @@
  *
  * Explore our open-source projects: {@link https://github.com/kurocado-studio}
  */
-import babelParser from '@babel/eslint-parser';
+import globals from 'globals';
 
-import {
-  javascriptLanguageOptions,
-  typescriptLanguageRootConfig,
-} from './constants.js';
+import { typescriptLanguageRootConfig } from './constants.js';
 import { eslintBaseConfig } from './eslint.base.js';
 
 export const eslintBrowserConfig = [
   ...eslintBaseConfig,
   {
     ...typescriptLanguageRootConfig,
-    rules: {
-      ...typescriptLanguageRootConfig.rules,
-      'import/no-cycle': 'off',
+    languageOptions: {
+      globals: globals.browser,
     },
+    rules: typescriptLanguageRootConfig.rules,
     settings: {
       'import/resolver': {
         alias: {

diff --git a/src/eslint/eslint.node.js b/src/eslint/eslint.node.js
@@ -8,13 +8,4 @@
  */
 import { eslintBaseConfig } from './eslint.base.js';
 
-export const eslintNodeConfig = [
-  ...eslintBaseConfig,
-  {
-    languageOptions: {
-      globals: {
-        node: true,
-      },
-    },
-  },
-];
+export const eslintNodeConfig = eslintBaseConfig;
diff --git a/src/eslint/eslint.react.js b/src/eslint/eslint.react.js
@@ -9,17 +9,30 @@
 import jsxA11yRecommended from 'eslint-plugin-jsx-a11y';
 import reactRecommended from 'eslint-plugin-react';
 import reactHooksRecommended from 'eslint-plugin-react-hooks';
+import globals from 'globals';
 
+import { TS_EXTENSIONS_PREFIX } from './constants.js';
 import { reactEslintConfig } from './rules/react/index.js';
 
 export const eslintReactConfig = [
   {
+    files: [`**/*.${TS_EXTENSIONS_PREFIX}`],
+    ...reactRecommended.configs.flat.recommended,
+    languageOptions: {
+      ...reactRecommended.configs.flat.recommended.languageOptions,
+      globals: {
+        ...globals.serviceworker,
+        ...globals.browser,
+      },
+    },
     plugins: {
       'jsx-a11y': jsxA11yRecommended,
-      react: reactRecommended,
       'react-hooks': reactHooksRecommended,
     },
-    rules: reactEslintConfig.rules,
+    rules: {
+      ...reactEslintConfig.rules,
+      ...reactRecommended.configs.flat.recommended.rules,
+    },
     settings: {
       react: {
         version: 'detect',