@aliexme/eslint-config 2.2.0 → 3.0.0

package/configs/base.js

@@ -1,11 +1,11 @@
-import eslintJs from '@eslint/js'
+import { defineConfig } from 'eslint/config'
+import eslint from '@eslint/js'
 import globals from 'globals'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  eslintJs.configs.recommended,
+export default defineConfig([
+  eslint.configs.recommended,
   {
-    name: '@aliexme/eslint-config-base',
+    name: '@aliexme/eslint-config/base',
     languageOptions: {
       ecmaVersion: 'latest',
       sourceType: 'module',
@@ -16,38 +16,7 @@ export default [
       },
     },
     rules: {
-      quotes: ['error', 'single'],
-      'jsx-quotes': ['error', 'prefer-single'],
-      'quote-props': ['error', 'as-needed'],
-      semi: ['error', 'never'],
-      indent: ['error', 2, { SwitchCase: 1, offsetTernaryExpressions: true }],
-      'max-len': ['error', 120],
-      'no-multiple-empty-lines': ['error', { max: 1, maxEOF: 0, maxBOF: 0 }],
-      'comma-dangle': ['error', 'always-multiline'],
-      'comma-spacing': ['error', { before: false, after: true }],
-      'comma-style': ['error', 'last'],
-      'key-spacing': 'error',
-      'keyword-spacing': ['error', { before: true, after: true }],
-      'object-curly-spacing': ['error', 'always'],
-      'array-bracket-spacing': ['error', 'never'],
-      'computed-property-spacing': ['error', 'never', { enforceForClassMembers: true }],
-      'arrow-spacing': 'error',
-      'switch-colon-spacing': ['error', { after: true, before: false }],
-      'space-in-parens': ['error', 'never'],
-      'space-before-function-paren': [
-        'error',
-        {
-          anonymous: 'never',
-          named: 'never',
-          asyncArrow: 'always',
-        },
-      ],
-      'space-before-blocks': ['error', 'always'],
       'no-constant-condition': ['error', { checkLoops: false }],
-      'no-trailing-spaces': 'error',
-      'no-multi-spaces': 'error',
-      'eol-last': 'error',
-      'arrow-parens': 'error',
       'no-useless-rename': 'error',
       'no-var': 'error',
       'prefer-const': 'error',
@@ -58,48 +27,22 @@ export default [
       'array-callback-return': ['error', { checkForEach: true }],
       'prefer-destructuring': ['error', { array: false, object: true }, { enforceForRenamedProperties: false }],
       'prefer-template': 'error',
-      'template-curly-spacing': ['error', 'never'],
       'no-eval': 'error',
-      'wrap-iife': ['error', 'inside', { functionPrototypeMethods: true }],
       'no-loop-func': 'error',
       'prefer-rest-params': 'error',
       'default-param-last': 'error',
       'no-new-func': 'error',
       'no-param-reassign': ['error', { props: true }],
       'prefer-spread': 'error',
-      'space-infix-ops': ['error', { int32Hint: true }],
-      'function-paren-newline': ['error', 'multiline-arguments'],
-      'object-curly-newline': ['error', { consistent: true }],
       'prefer-arrow-callback': 'error',
       'no-empty-function': 'error',
       'no-useless-constructor': 'error',
       'dot-notation': 'error',
       'one-var': ['error', 'never'],
       'no-multi-assign': 'error',
-      'operator-linebreak': [
-        'error',
-        'before',
-        {
-          overrides: { '=': 'after' },
-        },
-      ],
       eqeqeq: 'error',
       'no-unneeded-ternary': ['error', { defaultAssignment: false }],
       'no-nested-ternary': 'error',
-      'no-mixed-operators': 'error',
-      'brace-style': ['error', '1tbs'],
-      'spaced-comment': [
-        'error',
-        'always',
-        {
-          markers: ['/', '!', '?'],
-        },
-      ],
-      'newline-per-chained-call': ['error', { ignoreChainWithDepth: 2 }],
-      'no-whitespace-before-property': 'error',
-      'padded-blocks': ['error', 'never'],
-      'block-spacing': ['error', 'always'],
-      'func-call-spacing': ['error', 'never'],
       'no-new-wrappers': 'error',
       radix: ['error', 'as-needed'],
       'id-length': [
@@ -132,4 +75,4 @@ export default [
       'no-console': 'warn',
     },
   },
-]
+])

package/configs/import.js

@@ -1,61 +1,53 @@
-import { FlatCompat } from '@eslint/eslintrc'
-import { fixupPluginRules } from '@eslint/compat'
-// @ts-expect-error Could not find a declaration file for module 'eslint-plugin-import'
-import eslintPluginImport from 'eslint-plugin-import'
+import tseslint from 'typescript-eslint'
+import { createNodeResolver, importX } from 'eslint-plugin-import-x'
+import { createTypeScriptImportResolver } from 'eslint-import-resolver-typescript'
 
-const compat = new FlatCompat()
-
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  ...compat.extends('plugin:import/typescript'),
-  {
-    plugins: {
-      import: fixupPluginRules(eslintPluginImport),
-    },
-    settings: {
-      'import/resolver': {
-        node: {
-          extensions: ['.js', '.cjs', '.mjs', '.jsx', '.ts', '.tsx', '.vue'],
-          moduleDirectory: ['src/', 'node_modules'],
-        },
+export default /** @type {import('eslint').Linter.Config[]} */ (
+  tseslint.config([
+    importX.flatConfigs.recommended,
+    importX.flatConfigs.typescript,
+    {
+      name: '@aliexme/eslint-config/import',
+      settings: {
+        'import-x/resolver-next': [
+          createNodeResolver({ modules: ['src/', 'node_modules'] }),
+          createTypeScriptImportResolver(),
+        ],
+        'import-x/extensions': ['.js', '.cjs', '.mjs', '.jsx', '.ts', '.tsx', '.vue', '.astro'],
+        'import-x/ignore': ['node_modules'],
+      },
+      rules: {
+        'import-x/order': [
+          'error',
+          {
+            groups: ['builtin', 'external', 'internal', ['parent', 'sibling'], 'index', 'object'],
+            pathGroups: [
+              { pattern: '{react*,vue*,astro*}', group: 'external', position: 'before' },
+              { pattern: '{next*,nuxt*}', group: 'external', position: 'before' },
+              { pattern: '@aliexme/**', group: 'external', position: 'after' },
+              { pattern: '#*', group: 'external', position: 'after' },
+              { pattern: './**/{styles,*.styles,*.css,*.scss}', group: 'internal', position: 'before' },
+              { pattern: '../**/{styles,*.styles,*.css,*.scss}', group: 'internal', position: 'before' },
+              { pattern: '@/**', group: 'internal', position: 'before' },
+              { pattern: '~/**', group: 'internal', position: 'before' },
+            ],
+            pathGroupsExcludedImportTypes: ['builtin'],
+            'newlines-between': 'always',
+            warnOnUnassignedImports: true,
+            distinctGroup: false,
+          },
+        ],
+        'import-x/no-useless-path-segments': ['error', { noUselessIndex: false }],
+        'import-x/no-duplicates': ['error', { 'prefer-inline': true }],
+        'import-x/no-self-import': 'error',
+        'import-x/no-mutable-exports': 'error',
+        'import-x/first': 'error',
+        'import-x/newline-after-import': 'error',
+        'import-x/default': 'off',
+        'import-x/named': 'off',
+        'import-x/namespace': 'off',
+        'import-x/no-named-as-default-member': 'off',
       },
-      'import/ignore': ['node_modules'],
-    },
-    rules: {
-      'import/no-useless-path-segments': ['error', { noUselessIndex: false }],
-      'import/order': [
-        'error',
-        {
-          groups: [['builtin', 'external'], 'internal', ['parent', 'sibling'], 'index', 'object'],
-          pathGroups: [
-            {
-              pattern: '@aliexme/**',
-              group: 'external',
-              position: 'after',
-            },
-            {
-              // Nuxt imports
-              pattern: '#{app,components,imports}',
-              group: 'external',
-              position: 'after',
-            },
-            {
-              pattern: './{styles,*.styles,*.css,*.scss}',
-              group: 'internal',
-              position: 'before',
-            },
-          ],
-          pathGroupsExcludedImportTypes: ['@aliexme'],
-          'newlines-between': 'always',
-          warnOnUnassignedImports: true,
-        },
-      ],
-      'import/no-duplicates': ['error', { 'prefer-inline': true }],
-      'import/no-self-import': 'error',
-      'import/no-mutable-exports': 'error',
-      'import/first': 'error',
-      'import/newline-after-import': 'error',
-      'import/namespace': 'off',
     },
-  },
-]
+  ])
+)

package/configs/prettier.js

@@ -1,51 +1,4 @@
+import { defineConfig } from 'eslint/config'
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  eslintPluginPrettierRecommended,
-  {
-    rules: {
-      // Disable @stylistic rules
-      '@stylistic/block-spacing': 'off',
-      '@stylistic/brace-style': 'off',
-      '@stylistic/comma-dangle': 'off',
-      '@stylistic/comma-spacing': 'off',
-      '@stylistic/func-call-spacing': 'off',
-      '@stylistic/function-paren-newline': 'off',
-      '@stylistic/indent': 'off',
-      '@stylistic/indent-binary-ops': 'off',
-      '@stylistic/jsx-child-element-spacing': 'off',
-      '@stylistic/jsx-closing-bracket-location': 'off',
-      '@stylistic/jsx-closing-tag-location': 'off',
-      '@stylistic/jsx-curly-newline': 'off',
-      '@stylistic/jsx-curly-spacing': 'off',
-      '@stylistic/jsx-equals-spacing': 'off',
-      '@stylistic/jsx-first-prop-new-line': 'off',
-      '@stylistic/jsx-indent': 'off',
-      '@stylistic/jsx-indent-props': 'off',
-      '@stylistic/jsx-max-props-per-line': 'off',
-      '@stylistic/jsx-newline': 'off',
-      '@stylistic/jsx-one-expression-per-line': 'off',
-      '@stylistic/jsx-props-no-multi-spaces': 'off',
-      '@stylistic/jsx-quotes': 'off',
-      '@stylistic/jsx-tag-spacing': 'off',
-      '@stylistic/jsx-wrap-multilines': 'off',
-      '@stylistic/key-spacing': 'off',
-      '@stylistic/keyword-spacing': 'off',
-      '@stylistic/lines-around-comment': 'off',
-      '@stylistic/max-len': 'off',
-      '@stylistic/member-delimiter-style': 'off',
-      '@stylistic/multiline-ternary': 'off',
-      '@stylistic/no-extra-parens': 'off',
-      '@stylistic/no-extra-semi': 'off',
-      '@stylistic/object-curly-spacing': 'off',
-      '@stylistic/operator-linebreak': 'off',
-      '@stylistic/quotes': 'off',
-      '@stylistic/semi': 'off',
-      '@stylistic/space-before-blocks': 'off',
-      '@stylistic/space-before-function-paren': 'off',
-      '@stylistic/space-infix-ops': 'off',
-      '@stylistic/type-annotation-spacing': 'off',
-    },
-  },
-]
+export default defineConfig([eslintPluginPrettierRecommended])

package/configs/react-native.js

@@ -1,8 +1,8 @@
+import { defineConfig } from 'eslint/config'
 // @ts-expect-error Could not find a declaration file for module 'eslint-plugin-react-native'
 import eslintPluginReactNative from 'eslint-plugin-react-native'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
+export default defineConfig([
   {
     plugins: {
       'react-native': eslintPluginReactNative,
@@ -14,4 +14,4 @@ export default [
       'react-native/no-single-element-style-arrays': 'error',
     },
   },
-]
+])

package/configs/react.js

@@ -1,12 +1,11 @@
+import { defineConfig } from 'eslint/config'
 // @ts-expect-error Could not find a declaration file for module 'eslint-plugin-react/configs/recommended.js'
 import eslintPluginReactRecommended from 'eslint-plugin-react/configs/recommended.js'
 // @ts-expect-error Could not find a declaration file for module 'eslint-plugin-react/configs/jsx-runtime.js'
 import eslintPluginReactJsxRuntime from 'eslint-plugin-react/configs/jsx-runtime.js'
-// @ts-expect-error Could not find a declaration file for module 'eslint-plugin-react-hooks'
 import eslintPluginReactHooks from 'eslint-plugin-react-hooks'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
+export default defineConfig([
   eslintPluginReactRecommended,
   eslintPluginReactJsxRuntime,
   {
@@ -16,19 +15,6 @@ export default [
       },
     },
     rules: {
-      'react/jsx-tag-spacing': [
-        'error',
-        {
-          closingSlash: 'never',
-          beforeSelfClosing: 'proportional-always',
-          afterOpening: 'never',
-          beforeClosing: 'never',
-        },
-      ],
-      'react/jsx-max-props-per-line': ['error', { when: 'multiline' }],
-      'react/jsx-curly-spacing': ['error', { when: 'never', children: true }],
-      'react/jsx-curly-brace-presence': ['error', 'never'],
-      'react/jsx-closing-bracket-location': 'error',
       'react/self-closing-comp': 'error',
       'react/no-unused-prop-types': 'error',
     },
@@ -47,4 +33,4 @@ export default [
       ...eslintPluginReactHooks.configs.recommended.rules,
     },
   },
-]
+])

package/configs/recommended.js

@@ -1,7 +1,8 @@
-import baseConfigArray from './base.js'
-import typescriptConfigArray from './typescript.js'
-import stylisticConfigArray from './stylistic.js'
-import importConfigArray from './import.js'
+import { defineConfig } from 'eslint/config'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [...baseConfigArray, ...typescriptConfigArray, ...stylisticConfigArray, ...importConfigArray]
+import baseConfig from './base.js'
+import typescriptConfig from './typescript.js'
+import stylisticConfig from './stylistic.js'
+import importConfig from './import.js'
+
+export default defineConfig([baseConfig, typescriptConfig, stylisticConfig, importConfig])

package/configs/stylistic.js

@@ -1,7 +1,7 @@
+import { defineConfig } from 'eslint/config'
 import stylistic from '@stylistic/eslint-plugin'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
+export default defineConfig([
   stylistic.configs.customize({
     jsx: true,
     arrowParens: true,
@@ -14,16 +14,12 @@ export default [
     semi: false,
   }),
   {
+    name: '@aliexme/eslint-config/stylistic',
     rules: {
-      '@stylistic/array-bracket-newline': ['error', { multiline: true }],
-      '@stylistic/array-element-newline': [
-        'error',
-        {
-          consistent: true,
-          multiline: true,
-        },
-      ],
-      '@stylistic/function-paren-newline': ['error', 'multiline-arguments'],
+      '@stylistic/quotes': ['error', 'single'],
+      '@stylistic/quote-props': ['error', 'as-needed'],
+      '@stylistic/semi': ['error', 'never'],
+      '@stylistic/indent': ['error', 2, { SwitchCase: 1, offsetTernaryExpressions: true }],
       '@stylistic/max-len': [
         'error',
         {
@@ -35,11 +31,41 @@ export default [
           ignoreRegExpLiterals: true,
         },
       ],
-      '@stylistic/member-delimiter-style': [
+      '@stylistic/no-multiple-empty-lines': ['error', { max: 1, maxEOF: 0, maxBOF: 0 }],
+      '@stylistic/comma-dangle': ['error', 'always-multiline'],
+      '@stylistic/comma-spacing': ['error', { before: false, after: true }],
+      '@stylistic/comma-style': ['error', 'last'],
+      '@stylistic/key-spacing': 'error',
+      '@stylistic/keyword-spacing': ['error', { before: true, after: true }],
+      '@stylistic/object-curly-spacing': ['error', 'always'],
+      '@stylistic/array-bracket-spacing': ['error', 'never'],
+      '@stylistic/computed-property-spacing': ['error', 'never', { enforceForClassMembers: true }],
+      '@stylistic/arrow-spacing': 'error',
+      '@stylistic/switch-colon-spacing': ['error', { after: true, before: false }],
+      '@stylistic/space-in-parens': ['error', 'never'],
+      '@stylistic/space-before-function-paren': [
         'error',
         {
-          multiline: { delimiter: 'none' },
-          singleline: { delimiter: 'semi' },
+          anonymous: 'never',
+          named: 'never',
+          asyncArrow: 'always',
+        },
+      ],
+      '@stylistic/space-before-blocks': ['error', 'always'],
+      '@stylistic/template-curly-spacing': ['error', 'never'],
+      '@stylistic/block-spacing': ['error', 'always'],
+      '@stylistic/func-call-spacing': ['error', 'never'],
+      '@stylistic/type-annotation-spacing': 'error',
+      '@stylistic/no-trailing-spaces': 'error',
+      '@stylistic/no-multi-spaces': 'error',
+      '@stylistic/eol-last': 'error',
+      '@stylistic/arrow-parens': 'error',
+      '@stylistic/array-bracket-newline': ['error', { multiline: true }],
+      '@stylistic/array-element-newline': [
+        'error',
+        {
+          consistent: true,
+          multiline: true,
         },
       ],
       '@stylistic/object-curly-newline': [
@@ -50,6 +76,35 @@ export default [
         },
       ],
       '@stylistic/object-property-newline': ['error', { allowAllPropertiesOnSameLine: true }],
+      '@stylistic/function-paren-newline': ['error', 'multiline-arguments'],
+      '@stylistic/member-delimiter-style': [
+        'error',
+        {
+          multiline: { delimiter: 'none' },
+          singleline: { delimiter: 'semi' },
+        },
+      ],
+      '@stylistic/wrap-iife': ['error', 'inside', { functionPrototypeMethods: true }],
+      '@stylistic/space-infix-ops': ['error', { int32Hint: true }],
+      '@stylistic/operator-linebreak': [
+        'error',
+        'before',
+        {
+          overrides: { '=': 'after' },
+        },
+      ],
+      '@stylistic/no-mixed-operators': 'error',
+      '@stylistic/brace-style': ['error', '1tbs'],
+      '@stylistic/spaced-comment': [
+        'error',
+        'always',
+        {
+          markers: ['/', '!', '?'],
+        },
+      ],
+      '@stylistic/newline-per-chained-call': ['error', { ignoreChainWithDepth: 2 }],
+      '@stylistic/no-whitespace-before-property': 'error',
+      '@stylistic/padded-blocks': ['error', 'never'],
 
       // JSX
       '@stylistic/jsx-curly-spacing': ['error', { when: 'never', children: true }],
@@ -62,6 +117,9 @@ export default [
           beforeClosing: 'never',
         },
       ],
+      '@stylistic/jsx-max-props-per-line': ['error', { when: 'multiline' }],
+      '@stylistic/jsx-curly-brace-presence': ['error', 'never'],
+      '@stylistic/jsx-closing-bracket-location': 'error',
     },
   },
-]
+])

package/configs/typescript.js

@@ -1,7 +1,7 @@
 import tseslint from 'typescript-eslint'
 
 export default /** @type {import('eslint').Linter.Config[]} */ (
-  tseslint.config(...tseslint.configs.strict, ...tseslint.configs.stylistic, {
+  tseslint.config(tseslint.configs.strict, tseslint.configs.stylistic, {
     name: '@aliexme/eslint-config/typescript',
     languageOptions: {
       parserOptions: {
@@ -18,13 +18,6 @@ export default /** @type {import('eslint').Linter.Config[]} */ (
         },
       ],
       '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
-      '@typescript-eslint/member-delimiter-style': [
-        'error',
-        {
-          multiline: { delimiter: 'none' },
-          singleline: { delimiter: 'semi' },
-        },
-      ],
       '@typescript-eslint/no-empty-object-type': [
         'error',
         {
@@ -35,7 +28,6 @@ export default /** @type {import('eslint').Linter.Config[]} */ (
         'error',
         { prefer: 'type-imports', fixStyle: 'inline-type-imports' },
       ],
-      '@typescript-eslint/type-annotation-spacing': 'error',
     },
   })
 )

package/index.js

@@ -1,4 +1,5 @@
-import recommendedConfigArray from './configs/recommended.js'
+import { defineConfig } from 'eslint/config'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default recommendedConfigArray
+import recommendedConfig from './configs/recommended.js'
+
+export default defineConfig(recommendedConfig)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aliexme/eslint-config",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "description": "Set of configs for ESLint",
   "private": false,
   "author": "Alexander Smirnov <al.smirnov996@gmail.com>",
@@ -22,28 +22,29 @@
   ],
   "exports": {
     ".": "./index.js",
+    "./recommended": "./configs/recommended.js",
     "./base": "./configs/base.js",
     "./typescript": "./configs/typescript.js",
     "./stylistic": "./configs/stylistic.js",
     "./import": "./configs/import.js",
+    "./prettier": "./configs/prettier.js",
     "./react": "./configs/react.js",
     "./react-native": "./configs/react-native.js",
-    "./vue": "./configs/vue.js",
-    "./prettier": "./configs/prettier.js",
-    "./recommended": "./configs/recommended.js"
+    "./vue": "./configs/vue.js"
   },
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@eslint/compat": "^1.2.7",
-    "@eslint/eslintrc": "^3.3.0",
-    "@eslint/js": "^9.21.0",
-    "@stylistic/eslint-plugin": "^4.0.1",
-    "eslint-plugin-import": "^2.31.0",
-    "globals": "^16.0.0",
-    "typescript-eslint": "^8.24.1"
+    "@eslint/compat": "^1.3.0",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.29.0",
+    "@stylistic/eslint-plugin": "^4.4.1",
+    "eslint-import-resolver-typescript": "^4.4.3",
+    "eslint-plugin-import-x": "^4.15.2",
+    "globals": "^16.2.0",
+    "typescript-eslint": "^8.34.0"
   },
   "peerDependencies": {
     "eslint": "^9.0.0",
@@ -52,7 +53,7 @@
     "eslint-plugin-react": "^7.0.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-native": "^5.0.0",
-    "eslint-plugin-vue": "^9.0.0",
+    "eslint-plugin-vue": "^10.0.0",
     "prettier": "^3.0.0"
   },
   "peerDependenciesMeta": {
@@ -78,5 +79,5 @@
       "optional": true
     }
   },
-  "gitHead": "d9dd047ad7d94b5cbca23dee147746f8f1ccc6dd"
+  "gitHead": "321970688f8f10ed7dade8a34bdc39bee724f4c8"
 }