feat(eslint-config): upgrade to v9

.commitlintrc.cjs

@@ -1,10 +1,7 @@
 const lernaScopes = require('@commitlint/config-pnpm-scopes')
 
 module.exports = {
-  extends: [
-    '@commitlint/config-conventional',
-    '@commitlint/config-pnpm-scopes'
-  ],
+  extends: ['@commitlint/config-conventional', '@commitlint/config-pnpm-scopes'],
   rules: {
     'body-max-line-length': [0],
     'scope-enum': async (ctx) => {

.nano-staged.json

@@ -1,3 +1,3 @@
 {
-  "*.{js,ts,tsx}": "eslint --fix"
+  "*.{c,m,}{js,ts}{x,}": "eslint --flag v10_config_lookup_from_file --fix"
 }

eslint.config.js

@@ -0,0 +1,16 @@
+import { globalIgnores } from 'eslint/config'
+import baseConfig from '@trigen/eslint-config'
+import testConfig from '@trigen/eslint-config/test'
+import env from '@trigen/eslint-config/env'
+
+export default [
+  globalIgnores(['**/package/']),
+  ...baseConfig,
+  ...testConfig,
+  env.node,
+  {
+    rules: {
+      'no-console': 'off'
+    }
+  }
+]

package.json

@@ -19,7 +19,7 @@
   "scripts": {
     "clear": "del './packages/*/dist' ./coverage ./node_modules/.cache",
     "lint:package-json": "lint-package-json --monorepo",
-    "lint": "eslint '*.{js,cjs}' 'packages/**/*.{js,jsx,ts,tsx}'",
+    "lint": "eslint --flag v10_config_lookup_from_file",
     "test:unit": "vitest run",
     "test:unit:watch": "vitest watch",
     "test": "run -p lint test:unit",
@@ -43,7 +43,7 @@
     "clean-publish": "^4.0.0",
     "commitizen": "^4.2.4",
     "del-cli": "^5.0.0",
-    "eslint": "^8.0.0",
+    "eslint": "^9.0.0",
     "inquirer": "^8.0.0",
     "lerna": "^4.0.0",
     "nano-staged": "^0.8.0",

packages/babel-preset/eslint.config.mjs

@@ -0,0 +1,4 @@
+import commonjsConfig from '@trigen/eslint-config/commonjs'
+import rootConfig from '../../eslint.config.js'
+
+export default [...rootConfig, ...commonjsConfig]

packages/babel-preset/src/preset.js

@@ -100,7 +100,7 @@ module.exports = (api, envOptions, options) => {
         try {
           require.resolve('react-hot-loader/babel')
           plugins.push('react-hot-loader/babel')
-        } catch (err) {
+        } catch {
           /* Ignore */
         }
 

packages/browserslist-config/eslint.config.mjs

@@ -0,0 +1,4 @@
+import commonjsConfig from '@trigen/eslint-config/commonjs'
+import rootConfig from '../../eslint.config.js'
+
+export default [...rootConfig, ...commonjsConfig]

packages/eslint-config/README.md

@@ -35,12 +35,12 @@ npm i -D @trigen/eslint-config
 
 ## Configure
 
-Create `.eslintrc.json` with next content:
+Create `eslint.config.js` with next content:
 
-```json
-{
-  "extends": "@trigen/eslint-config"
-}
+```js
+import baseConfig from '@trigen/eslint-config'
+
+export default baseConfig
 ```
 
 ### Additional configs
@@ -49,25 +49,46 @@ There are additional configs for specific language features:
 
 | Config | Description |
 |--------|-------------|
+| @trigen/eslint-config/env | Globals for different environments. |
 | @trigen/eslint-config/commonjs | Rules for CommonJS modules. |
-| @trigen/eslint-config/esm | Rules for ES modules. |
-| @trigen/eslint-config/tsm | Rules for TS modules. |
-| @trigen/eslint-config/react | Rules for ReactJS code. |
-| @trigen/eslint-config/jest | Rules for Jest tests. |
-| @trigen/eslint-config/jest-dom | Rules for Jest DOM tests. |
-| @trigen/eslint-config/storybook | Rules for Storybook's stories. |
+| @trigen/eslint-config/module | Rules for ES modules. |
+| @trigen/eslint-config/bundler | Rules for ES modules with bundler's module resolution. |
+| @trigen/eslint-config/test | Rules for test files. |
+| @trigen/eslint-config/dom-test | Rules for DOM tests. |
+| @trigen/eslint-config/react | Rules for React code. |
+| @trigen/eslint-config/react-test | Rules for React tests. |
+| @trigen/eslint-config/storybook | Rules for Storybook stories. |
 | @trigen/eslint-config/typescript | Rules for TypeScript code. |
-| @trigen/eslint-config/typescript-requiring-type-checking | Rules for TypeScript code with type checking. |
+| @trigen/eslint-config/typescript-type-checked | Rules for TypeScript code with type checking. |
 
 Example:
 
-```json
-{
-  "extends": [
-    "@trigen/eslint-config",
-    "@trigen/eslint-config/react",
-    "@trigen/eslint-config/typescript",
-    "@trigen/eslint-config/typescript-requiring-type-checking"
-  ]
-}
+```js
+import baseConfig from '@trigen/eslint-config'
+import env from '@trigen/eslint-config/env'
+import bundlerConfig from '@trigen/eslint-config/bundler'
+import reactConfig from '@trigen/eslint-config/react'
+import typescriptConfig from '@trigen/eslint-config/typescript-type-checked'
+import testConfig from '@trigen/eslint-config/test'
+import reactTestConfig from '@trigen/eslint-config/react-test'
+import storybookConfig from '@trigen/eslint-config/storybook'
+
+export default [
+  env.browser,
+  ...baseConfig,
+  ...bundlerConfig,
+  ...reactConfig,
+  ...typescriptConfig,
+  ...testConfig,
+  ...reactTestConfig,
+  ...storybookConfig,
+  {
+    languageOptions: {
+      parserOptions: {
+        tsconfigRootDir: import.meta.dirname,
+        projectService: true
+      }
+    }
+  }
+]
 ```

packages/eslint-config/eslint.config.js

@@ -0,0 +1,16 @@
+import { globalIgnores } from 'eslint/config'
+import commonjsConfig from '@trigen/eslint-config/commonjs'
+import rootConfig from '../../eslint.config.js'
+
+export default [
+  globalIgnores(['**/*.d.ts']),
+  ...rootConfig,
+  ...commonjsConfig,
+  {
+    rules: {
+      'no-magic-numbers': 'off',
+      'import/no-default-export': 'off',
+      'import/no-anonymous-default-export': 'off'
+    }
+  }
+]

packages/eslint-config/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@trigen/eslint-config",
+  "type": "module",
   "version": "8.0.0-alpha.33",
   "description": "Trigen's ESLint config.",
   "author": "dangreen",
@@ -19,10 +20,19 @@
   "engines": {
     "node": ">=20"
   },
-  "main": "./src/index.js",
   "exports": {
-    ".": "./src/index.js",
-    "./*": "./src/*.js"
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    },
+    "./env": {
+      "types": "./src/env.d.ts",
+      "default": "./src/env.js"
+    },
+    "./*": {
+      "types": "./src/index.d.ts",
+      "default": "./src/*.js"
+    }
   },
   "publishConfig": {
     "access": "public",
@@ -35,22 +45,25 @@
   },
   "peerDependencies": {
     "@testing-library/dom": ">=8.0.0",
-    "eslint": ">=7.0.0"
+    "eslint": ">=9.0.0"
   },
   "peerDependenciesMeta": {
     "@testing-library/dom": {
       "optional": true
     }
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^27.0.0",
-    "eslint-plugin-jest-dom": "^5.0.0",
-    "eslint-plugin-jsdoc": "^46.0.0",
-    "eslint-plugin-react": "^7.27.1",
-    "eslint-plugin-react-hooks": "^4.3.0",
-    "eslint-plugin-testing-library": "^6.0.0"
+    "@eslint/js": "^9.12.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-jest": "^28.0.0",
+    "eslint-plugin-jest-dom": "^5.4.0",
+    "eslint-plugin-jsdoc": "^50.0.0",
+    "eslint-plugin-react": "^7.35.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-testing-library": "^6.3.0",
+    "globals": "^16.3.0",
+    "typescript-eslint": "^8.35.1"
   }
 }

packages/eslint-config/src/bundler.js

@@ -0,0 +1,21 @@
+/**
+ * Bundler override
+ */
+
+import { commonjsFiles } from './subconfigs/files.js'
+
+export default [
+  {
+    ignores: commonjsFiles,
+    rules: {
+      'import/unambiguous': 'error',
+      'import/no-commonjs': [
+        'error',
+        {
+          allowRequire: false,
+          allowPrimitiveModules: false
+        }
+      ]
+    }
+  }
+]

packages/eslint-config/src/commonjs.js

@@ -2,14 +2,10 @@
  * CommonJS override
  */
 
-module.exports = {
-  overrides: [
-    {
-      files: ['*.js'],
-      rules: {
-        'import/no-commonjs': 'off',
-        'import/unambiguous': 'off'
-      }
-    }
-  ]
-}
+import { moduleFiles } from './subconfigs/files.js'
+import moduleConfig from './module.js'
+
+export default moduleConfig.map(({ ignores, ...config }) => ({
+  files: moduleFiles,
+  ...config
+}))

packages/eslint-config/src/dom-test.js

@@ -0,0 +1,13 @@
+/**
+ * Test DOM override
+ */
+
+import jestDomPlugin from 'eslint-plugin-jest-dom'
+import { testFiles } from './subconfigs/files.js'
+
+export default [
+  {
+    files: testFiles,
+    ...jestDomPlugin.configs['flat/recommended']
+  }
+]

packages/eslint-config/src/env.d.ts

@@ -0,0 +1,8 @@
+import type { ESLint } from 'eslint'
+import type globals from 'globals'
+
+type FlatConfig = ESLint.ConfigData
+
+declare const config: Record<keyof typeof globals, FlatConfig>
+
+export default config;

packages/eslint-config/src/env.js

@@ -0,0 +1,15 @@
+/**
+ * Env override
+ */
+
+import globals from 'globals'
+
+export default Object.keys(globals).reduce((envs, type) => {
+  envs[type] = {
+    languageOptions: {
+      globals: globals[type]
+    }
+  }
+
+  return envs
+}, {})

packages/eslint-config/src/index.d.ts

@@ -0,0 +1,7 @@
+import type { ESLint } from 'eslint'
+
+type FlatConfig = ESLint.ConfigData
+
+declare const config: FlatConfig[]
+
+export default config