Upgrade to ESLint 9

Closes #65.
niksy · Nov 16, 2024 · 3fb6785 · 3fb6785
1 parent ed90592
commit 3fb6785
Show file tree

Hide file tree

Showing 14 changed files with 582 additions and 561 deletions.
diff --git a/.eslintrc b/.eslintrc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 16
+          - 18
     steps:
       - name: Clone repository
         uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -7,21 +7,21 @@
 ## Install
 
 ```sh
-npm install eslint@8 eslint-config-nitpick --save-dev
+npm install eslint@9 eslint-config-nitpick --save-dev
 ```
 
 ## Usage
 
-Add this config to your `.eslintrc`:
+Add this config to your `eslint.config.js`:
 
 <!-- prettier-ignore-start -->
 
-```json
-{
-	"extends": [
-		"eslint-config-nitpick"
-	]
-}
+```js
+import configNitpick from 'eslint-config-nitpick';
+
+export default [
+	configNitpick
+];
 ```
 
 <!-- prettier-ignore-end -->
@@ -31,34 +31,34 @@ preset:**
 
 <!-- prettier-ignore-start -->
 
-```json
-{
-	"extends": [
-		"eslint-config-nitpick",
-		"eslint-config-nitpick/other-preset"
-	]
-}
+```js
+import configNitpick from 'eslint-config-nitpick';
+import configPreset from 'eslint-config-nitpick/other-preset';
+
+export default [
+	configNitpick,
+	configPreset
+];
 ```
 
 <!-- prettier-ignore-end -->
 
 ## Presets
 
-In addition to default preset, there are also specific presets. You can apply
-multiple presets with [ESLint `extends` option][eslint-extends].
+In addition to default preset, there are also specific presets.
 
 ### Browser
 
 Browser specific rules.
 
 <!-- prettier-ignore-start -->
 
-```json
-{
-	"extends": [
-		"eslint-config-nitpick/browser"
-	]
-}
+```js
+import configBrowser from 'eslint-config-nitpick/browser';
+
+export default [
+	configBrowser
+];
 ```
 
 <!-- prettier-ignore-end -->
@@ -69,12 +69,12 @@ Rules for testing frameworks (e.g. Mocha).
 
 <!-- prettier-ignore-start -->
 
-```json
-{
-	"extends": [
-		"eslint-config-nitpick/tests"
-	]
-}
+```js
+import configTest from 'eslint-config-nitpick/tests';
+
+export default [
+	configTest
+];
 ```
 
 <!-- prettier-ignore-end -->
@@ -85,12 +85,12 @@ Vue specific rules.
 
 <!-- prettier-ignore-start -->
 
-```json
-{
-	"extends": [
-		"eslint-config-nitpick/vue"
-	]
-}
+```js
+import configVue from 'eslint-config-nitpick/vue';
+
+export default [
+	...configVue
+];
 ```
 
 <!-- prettier-ignore-end -->
@@ -101,12 +101,12 @@ TypeScript specific rules.
 
 <!-- prettier-ignore-start -->
 
-```json
-{
-	"extends": [
-		"eslint-config-nitpick/typescript"
-	]
-}
+```js
+import configTypescript from 'eslint-config-nitpick/typescript';
+
+export default [
+	configTypescript
+];
 ```
 
 <!-- prettier-ignore-end -->
@@ -120,7 +120,5 @@ MIT © [Ivan Nikolić](http://ivannikolic.com)
 [ci]: https://github.com/niksy/eslint-config-nitpick/actions?query=workflow%3ACI
 [ci-img]: https://github.com/niksy/eslint-config-nitpick/workflows/CI/badge.svg?branch=master
 [eslint]: http://eslint.org/
-[eslint-extends]: http://eslint.org/docs/user-guide/configuring#extending-configuration-files
-[tc39-proposals]: https://github.com/tc39/proposals#active-proposals
 
 <!-- prettier-ignore-end -->
diff --git a/browser.js b/browser.js
@@ -1,11 +1,20 @@
-'use strict';
+import globals from 'globals';
+import pluginUnicorn from 'eslint-plugin-unicorn';
 
-module.exports = {
-	env: {
-		node: false,
-		browser: true
+const nodeGlobalsDisabled = Object.fromEntries(
+	Object.entries(globals.node).map(([key]) => [key, 'off'])
+);
+
+export default {
+	languageOptions: {
+		globals: {
+			...nodeGlobalsDisabled,
+			...globals.browser
+		}
+	},
+	plugins: {
+		unicorn: pluginUnicorn
 	},
-	plugins: ['eslint-plugin-unicorn'],
 	rules: {
 		'no-console': 2,
 		'no-implicit-globals': 2,

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,59 @@
+import configPrettier from 'eslint-config-prettier';
+import pluginPrettier from 'eslint-plugin-prettier';
+import pluginUnicorn from 'eslint-plugin-unicorn';
+import pluginImport from 'eslint-plugin-import';
+import configTest from './tests.js';
+import configBase from './index.js';
+
+export default [
+	configBase,
+	configPrettier,
+	{
+		plugins: {
+			prettier: pluginPrettier,
+			unicorn: pluginUnicorn,
+			import: pluginImport
+		},
+		'rules': {
+			'prettier/prettier': 1,
+			'unicorn/prefer-module': 0,
+			'import/no-commonjs': 0
+		}
+	},
+	{
+		'files': ['*.js'],
+		plugins: {
+			unicorn: pluginUnicorn
+		},
+		'rules': {
+			'unicorn/prevent-abbreviations': [
+				1,
+				{
+					'allowList': {
+						'env': true,
+						'props': true,
+						'prev': true,
+						'ignoreRefs': true
+					}
+				}
+			]
+		}
+	},
+	{
+		...configTest,
+		'files': ['test/**'],
+		plugins: {
+			...configTest.plugins,
+			unicorn: pluginUnicorn,
+			import: pluginImport
+		},
+		'rules': {
+			...configTest.rules,
+			'unicorn/prefer-module': 2,
+			'import/no-commonjs': 2
+		}
+	},
+	{
+		ignores: ['**/test/fixtures/*.config.*']
+	}
+];
diff --git a/index.js b/index.js
@@ -1,21 +1,26 @@
-'use strict';
+import globals from 'globals';
+import pluginPromise from 'eslint-plugin-promise';
+import pluginNode from 'eslint-plugin-n';
+import pluginUnicorn from 'eslint-plugin-unicorn';
+import pluginJsdoc from 'eslint-plugin-jsdoc';
+import pluginImport from 'eslint-plugin-import';
 
-module.exports = {
-	env: {
-		node: true,
-		es2022: true
-	},
-	parserOptions: {
+export default {
+	languageOptions: {
 		ecmaVersion: 2022,
-		sourceType: 'module'
+		sourceType: 'module',
+		globals: {
+			...globals.node,
+			...globals.es2022
+		}
+	},
+	plugins: {
+		promise: pluginPromise,
+		n: pluginNode,
+		unicorn: pluginUnicorn,
+		jsdoc: pluginJsdoc,
+		import: pluginImport
 	},
-	plugins: [
-		'eslint-plugin-promise',
-		'eslint-plugin-n',
-		'eslint-plugin-unicorn',
-		'eslint-plugin-jsdoc',
-		'eslint-plugin-import'
-	],
 	rules: {
 		'n/no-sync': 1,
 		'n/no-restricted-require': 0,
@@ -267,7 +272,6 @@ module.exports = {
 		'no-unexpected-multiline': 2,
 		'no-unreachable': 2,
 		'use-isnan': 2,
-		'valid-jsdoc': 0,
 		'valid-typeof': 2,
 		'no-unsafe-finally': 1,
 		'no-unsafe-negation': 2,
@@ -445,7 +449,6 @@ module.exports = {
 			}
 		],
 		'operator-assignment': 0,
-		'require-jsdoc': 0,
 		'sort-keys': 0,
 		'sort-vars': 0,
 		'line-comment-position': 0,