Updated dependencies, updated node config and react config

burtek · May 16, 2023 · c0baeb7 · c0baeb7
1 parent 006e2fc
commit c0baeb7
Show file tree

Hide file tree

Showing 8 changed files with 260 additions and 244 deletions.
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -1,53 +1,53 @@
 {
-    "MD001": true,
-    "MD003": {
-        "style": "atx"
-    },
-    "MD004": {
-        "style": "sublist"
-    },
-    "MD005": true,
-    "MD007": true,
-    "MD010": true,
-    "MD011": true,
-    "MD012": true,
-    "MD013": false,
-    "MD018": true,
-    "MD019": true,
-    "MD022": true,
-    "MD023": true,
-    "MD024": {
-        "siblings_only": true
-    },
-    "MD025": true,
-    "MD026": true,
-    "MD027": true,
-    "MD028": true,
-    "MD029": true,
-    "MD030": true,
-    "MD031": true,
-    "MD032": true,
-    "MD033": {
-        "allowed_elements": [
-            "table", "thead", "tbody", "tr", "th", "td",
-            "style", "code", "b", "i", "u", "br"
-        ]
-    },
-    "MD034": true,
-    "MD035": true,
-    "MD036": true,
-    "MD037": true,
-    "MD038": true,
-    "MD039": true,
-    "MD040": true,
-    "MD041": true,
-    "MD042": true,
-    "MD045": true,
-    "MD046 ": {
-        "style": "fenced"
-    },
-    "MD047": true,
-    "MD048 ": {
-        "style": "backtick"
-    }
-}
+  "MD001": true,
+  "MD003": {
+    "style": "atx"
+  },
+  "MD004": {
+    "style": "sublist"
+  },
+  "MD005": true,
+  "MD007": true,
+  "MD010": true,
+  "MD011": true,
+  "MD012": true,
+  "MD013": false,
+  "MD018": true,
+  "MD019": true,
+  "MD022": true,
+  "MD023": true,
+  "MD024": {
+    "siblings_only": true
+  },
+  "MD025": true,
+  "MD026": true,
+  "MD027": true,
+  "MD028": true,
+  "MD029": true,
+  "MD030": true,
+  "MD031": true,
+  "MD032": true,
+  "MD033": {
+    "allowed_elements": [
+      "table", "thead", "tbody", "tr", "th", "td",
+      "style", "code", "b", "i", "u", "br"
+    ]
+  },
+  "MD034": true,
+  "MD035": true,
+  "MD036": true,
+  "MD037": true,
+  "MD038": true,
+  "MD039": true,
+  "MD040": true,
+  "MD041": true,
+  "MD042": true,
+  "MD045": true,
+  "MD046 ": {
+    "style": "fenced"
+  },
+  "MD047": true,
+  "MD048 ": {
+    "style": "backtick"
+  }
+}
diff --git a/.npmignore b/.npmignore
@@ -5,7 +5,6 @@
 /.eslintrc.txt
 /eslint.config.js
 /tests
-/import-types.d.ts
 /docs
 /*.md
 /tsconfig.json

diff --git a/README.md b/README.md
@@ -4,14 +4,11 @@
 ![npm next version](https://img.shields.io/npm/v/@dtrw/eslint-config/next)
 ![NPM License](https://img.shields.io/npm/l/@dtrw/eslint-config)
 ![Release](https://img.shields.io/github/actions/workflow/status/burtek/eslint-config/make-release.yml?label=publish%20release)
+![dependencies](https://img.shields.io/librariesio/release/npm/@dtrw/eslint-config)
 
 
 This is repository with my `eslint` configs for multiple purposes that are used (or will be used) in my other projects.
 
-## WARNING
-
-This README is outdated, please wait for 2.0.0 docs.
-
 ## Install
 
 ```bash

diff --git a/configs/node.js b/configs/node.js
@@ -1,30 +1,33 @@
 import { defineFlatConfig } from 'eslint-define-config';
-import n from 'eslint-plugin-n';
+import nModule from 'eslint-plugin-n/configs/recommended-module.js';
+import nScript from 'eslint-plugin-n/configs/recommended-script.js';
 import nodeSecurity from 'eslint-plugin-security-node';
 import globals from 'globals';
 
 
-export function prepareConfig() {
+/**
+ * @param {Object} [config]
+ * @param {'module' | 'script'} [config.mode]
+ */
+export function prepareConfig({ mode = 'module' } = {}) {
+    const isModule = mode === 'module';
+
     return defineFlatConfig([
+        {
+            files: [isModule ? '**/*.{cjs,cts}' : '**/*.{js,cjs,ts,cts}'],
+            ...nScript
+        },
+        {
+            files: [isModule ? '**/*.{js,mjs,ts,mts}' : '**/*.{mjs,mts}'],
+            ...nModule
+        },
         {
             files: ['**/*.{js,cjs,mjs,ts,cts,mts}'],
-            plugins: {
-                n,
-                'security-node': nodeSecurity
-            },
             languageOptions: {
-                globals: {
-                    // eslint-disable-next-line no-warning-comments
-                    ...n.configs['recommended-module'].globals, // TODO: recommended once eslint-plugin-n moves to FlatConfig
-                    ...globals.node
-                },
+                globals: { ...globals.node },
                 parserOptions: { ecmaFeatures: { globalReturn: false } }
             },
             rules: {
-                // eslint-disable-next-line no-warning-comments
-                ...n.configs['recommended-module'].rules, // TODO: recommended once eslint-plugin-n moves to FlatConfig
-                ...nodeSecurity.configs.recommended.rules,
-
                 'no-console': 'off',
 
                 'n/no-missing-import': 'off',
@@ -37,10 +40,7 @@ export function prepareConfig() {
                 'n/prefer-global/url-search-params': 'error',
                 'n/prefer-global/url': 'error',
                 'n/prefer-promises/dns': 'error',
-                'n/prefer-promises/fs': 'error',
-
-                // https://github.com/gkouziik/eslint-plugin-security-node/pull/63
-                'security-node/detect-unhandled-async-errors': 'off'
+                'n/prefer-promises/fs': 'error'
             }
         },
         {
@@ -50,6 +50,16 @@ export function prepareConfig() {
                 'n/no-unpublished-require': 'error',
                 'n/no-unsupported-features/es-syntax': 'off'
             }
+        },
+        {
+            files: ['**/*.{js,cjs,mjs,ts,cts,mts}'],
+            plugins: { 'security-node': nodeSecurity },
+            rules: {
+                ...nodeSecurity.configs.recommended.rules,
+
+                // https://github.com/gkouziik/eslint-plugin-security-node/pull/63
+                'security-node/detect-unhandled-async-errors': 'off'
+            }
         }
     ]);
 }
diff --git a/configs/react.js b/configs/react.js
@@ -61,7 +61,7 @@ export function prepareConfig({ a11y = false, nextjs = false } = {}) {
                 'jsx-quotes': ['error', 'prefer-double'],
 
                 'react/button-has-type': 'warn',
-                'react/hook-use-state': 'error',
+                'react/hook-use-state': ['error', { allowDestructuredState: true }],
                 'react/iframe-missing-sandbox': 'error',
                 'react/jsx-boolean-value': 'error',
                 'react/jsx-child-element-spacing': 'error',
@@ -121,6 +121,7 @@ export function prepareConfig({ a11y = false, nextjs = false } = {}) {
                 'react/no-danger': 'error',
                 'react/no-did-mount-set-state': 'error',
                 'react/no-did-update-set-state': 'error',
+                'react/no-object-type-as-default-prop': 'error',
                 'react/no-redundant-should-component-update': 'error',
                 'react/no-this-in-sfc': 'error',
                 'react/no-typos': 'error',
@@ -158,7 +159,10 @@ export function prepareConfig({ a11y = false, nextjs = false } = {}) {
         {
             files: jsxFiles,
             plugins: { 'jsx-a11y': jsxA11y },
-            rules: { ...jsxA11y.configs.recommended.rules }
+            rules: {
+                ...jsxA11y.configs.recommended.rules,
+                'jsx-a11y/anchor-ambiguous-text': 'error'
+            }
         }
     ]);