fix: esmodules for eslint

gijslaarman · Oct 16, 2024 · c0d6c40 · c0d6c40
1 parent e9a205f
commit c0d6c40
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 108 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,11 +1,4 @@
-import globals from 'globals'
-import pluginJs from '@eslint/js'
-import tseslint from 'typescript-eslint'
+import baseConfig from './eslint/base.mjs'
+import typescriptConfig from './eslint/typescript.mjs'
 
-export default [
-  { extends: ['./eslint/_base.js'] },
-
-  { languageOptions: { globals: { ...globals.browser, ...globals.node } } },
-  pluginJs.configs.recommended,
-  ...tseslint.configs.recommended,
-]
+export default [...baseConfig, ...typescriptConfig]
diff --git a/eslint/base.js b/eslint/base.js
diff --git a/eslint/base.mjs b/eslint/base.mjs
@@ -0,0 +1,23 @@
+// Base settings
+
+import js from '@eslint/js'
+import eslintConfigPrettier from 'eslint-config-prettier'
+import importPlugin from 'eslint-plugin-import'
+
+export default [
+  // Extend recommended rules
+  {
+    plugins: { import: importPlugin },
+    rules: {
+      ...importPlugin.configs['recommended'].rules,
+    },
+  },
+  {
+    files: ['**/*.js'],
+    rules: {
+      ...js.configs.recommended.rules,
+      'no-unused-vars': 'warn',
+    },
+  },
+  eslintConfigPrettier,
+]
diff --git a/eslint/react-typescript.js → eslint/react-typescript.mjs b/eslint/react-typescript.js → eslint/react-typescript.mjs
diff --git a/eslint/react.js b/eslint/react.js
diff --git a/eslint/react.mjs b/eslint/react.mjs
@@ -0,0 +1,4 @@
+// react.js
+import pluginReact from 'eslint-plugin-react'
+
+export default [...pluginReact.configs.flat.all]
diff --git a/eslint/typescript.js b/eslint/typescript.js
diff --git a/eslint/typescript.mjs b/eslint/typescript.mjs
@@ -0,0 +1,5 @@
+// Typescript
+
+import tseslint from 'typescript-eslint'
+
+export default [...tseslint.configs.recommended]
diff --git a/package.json b/package.json
@@ -13,8 +13,12 @@
   "license": "ISC",
   "author": "Gijs Laarman",
   "exports": {
-    "./eslint/*": "./eslint/*.js",
-    "./prettier": "./prettier/index.js",
+    "./eslint/*": {
+      "import": "./eslint/*.mjs"
+    },
+    "./prettier": {
+      "require": "./prettier/index.cjs"
+    },
     "./typescript/node20": "./typescript/node20.tsconfig.json",
     "./stylelint/*": "./stylelint/*.js"
   },
@@ -31,6 +35,7 @@
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^8.9.0",
     "@typescript-eslint/parser": "^8.9.0",
+    "@typescript-eslint/typescript-estree": "^8.9.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^3.6.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/prettier/index.js → prettier/index.cjs b/prettier/index.js → prettier/index.cjs