@st1ggy/linter-config 2.31.0 → 2.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@st1ggy/linter-config",
-  "version": "2.31.0",
+  "version": "2.32.0",
   "description": "ESLint, Stylelint and Prettier configs for React, Vue [WIP] and Svelte [WIP]",
   "private": false,
   "repository": {
@@ -22,10 +22,8 @@
   "dependencies": {
     "@eslint/compat": "^1.3.0",
     "@eslint/js": "^9.29.0",
-    "@stylistic/eslint-plugin-js": "^4.4.1",
-    "@stylistic/eslint-plugin-jsx": "^4.4.1",
+    "@stylistic/eslint-plugin": "^4.4.1",
     "@stylistic/eslint-plugin-migrate": "^4.4.1",
-    "@stylistic/eslint-plugin-ts": "^4.4.1",
     "eslint": "^9.29.0",
     "eslint-config-next": "^15.3.3",
     "eslint-config-prettier": "^10.1.5",

package/src/eslint/configs/config.common.js

@@ -1,15 +1,15 @@
 import eslint from '@eslint/js'
-import stylisticJs from '@stylistic/eslint-plugin-js'
+import stylistic from '@stylistic/eslint-plugin'
 import { defineConfig } from 'eslint/config'
 
 import { files } from './constants.js'
 
 export default defineConfig([
   eslint.configs.recommended,
-  stylisticJs.configs.all,
+  stylistic.configs.all,
   {
     files,
-    plugins: { '@stylistic/js': stylisticJs },
+    plugins: { '@stylistic': stylistic },
     rules: {
       'no-console': 'warn',
       'no-debugger': 'warn',
@@ -63,22 +63,22 @@ export default defineConfig([
       ],
       curly: ['error', 'all'],
       // @stylistic
-      '@stylistic/js/object-curly-newline': 'off',
-      '@stylistic/js/operator-linebreak': 'off',
-      '@stylistic/js/function-paren-newline': 'off',
-      '@stylistic/js/no-confusing-arrow': 'off',
-      '@stylistic/js/newline-per-chained-call': 'off',
-      '@stylistic/js/indent': 'off',
-      '@stylistic/js/implicit-arrow-linebreak': 'off',
-      '@stylistic/js/lines-between-class-members': [
+      '@stylistic/object-curly-newline': 'off',
+      '@stylistic/operator-linebreak': 'off',
+      '@stylistic/function-paren-newline': 'off',
+      '@stylistic/no-confusing-arrow': 'off',
+      '@stylistic/newline-per-chained-call': 'off',
+      '@stylistic/indent': 'off',
+      '@stylistic/implicit-arrow-linebreak': 'off',
+      '@stylistic/lines-between-class-members': [
         'error',
         'always',
         {
           exceptAfterSingleLine: true,
         },
       ],
-      '@stylistic/js/no-mixed-operators': 'off',
-      '@stylistic/js/max-len': [
+      '@stylistic/no-mixed-operators': 'off',
+      '@stylistic/max-len': [
         'error',
         {
           code: 120,
@@ -89,10 +89,10 @@ export default defineConfig([
           ignoreTrailingComments: true,
         },
       ],
-      '@stylistic/js/quotes': ['error', 'single', { avoidEscape: true }],
-      '@stylistic/js/spaced-comment': ['error', 'always'],
-      '@stylistic/js/object-curly-spacing': ['error', 'always', { objectsInObjects: true }],
-      '@stylistic/js/padding-line-between-statements': [
+      '@stylistic/quotes': ['error', 'single', { avoidEscape: true }],
+      '@stylistic/spaced-comment': ['error', 'always'],
+      '@stylistic/object-curly-spacing': ['error', 'always', { objectsInObjects: true }],
+      '@stylistic/padding-line-between-statements': [
         'error',
         { blankLine: 'always', prev: '*', next: 'if' },
         { blankLine: 'always', prev: 'if', next: 'if' },
@@ -102,7 +102,7 @@ export default defineConfig([
         { blankLine: 'always', prev: '*', next: 'case' },
         { blankLine: 'always', prev: 'if', next: '*' },
       ],
-      '@stylistic/js/multiline-comment-style': ['error', 'separate-lines', { checkJSDoc: true }],
+      '@stylistic/multiline-comment-style': ['error', 'separate-lines', { checkJSDoc: true }],
     },
   },
 ])

package/src/eslint/configs/config.react.js

@@ -1,4 +1,4 @@
-import stylisticJsx from '@stylistic/eslint-plugin-jsx'
+import stylistic from '@stylistic/eslint-plugin'
 import { defineConfig } from 'eslint/config'
 import reactPlugin from 'eslint-plugin-react'
 import reactHooksPlugin from 'eslint-plugin-react-hooks'
@@ -8,7 +8,7 @@ import { files } from './constants.js'
 export default defineConfig([
   reactPlugin.configs.flat.recommended,
   reactPlugin.configs.flat['jsx-runtime'],
-  stylisticJsx.configs.recommended,
+  stylistic.configs.recommended,
   {
     files,
     plugins: { 'react-hooks': reactHooksPlugin },
@@ -37,11 +37,11 @@ export default defineConfig([
 
       ...reactHooksPlugin.configs.recommended.rules,
       // @stylistic
-      '@stylistic/jsx/jsx-closing-bracket-location': 'error',
-      '@stylistic/jsx/jsx-closing-tag-location': 'error',
-      '@stylistic/jsx/jsx-curly-brace-presence': ['error', { props: 'never', children: 'never' }],
-      '@stylistic/jsx/jsx-curly-newline': ['error', { multiline: 'consistent', singleline: 'forbid' }],
-      '@stylistic/jsx/jsx-curly-spacing': [
+      '@stylistic/jsx-closing-bracket-location': 'error',
+      '@stylistic/jsx-closing-tag-location': 'error',
+      '@stylistic/jsx-curly-brace-presence': ['error', { props: 'never', children: 'never' }],
+      '@stylistic/jsx-curly-newline': ['error', { multiline: 'consistent', singleline: 'forbid' }],
+      '@stylistic/jsx-curly-spacing': [
         'error',
         {
           when: 'never',
@@ -49,11 +49,11 @@ export default defineConfig([
           children: false,
         },
       ],
-      '@stylistic/jsx/jsx-equals-spacing': ['error', 'never'],
-      '@stylistic/jsx/jsx-first-prop-new-line': ['error', 'multiline'],
-      '@stylistic/jsx/jsx-max-props-per-line': ['error', { when: 'multiline' }],
-      '@stylistic/jsx/jsx-props-no-multi-spaces': 'error',
-      '@stylistic/jsx/jsx-tag-spacing': 'error',
+      '@stylistic/jsx-equals-spacing': ['error', 'never'],
+      '@stylistic/jsx-first-prop-new-line': ['error', 'multiline'],
+      '@stylistic/jsx-max-props-per-line': ['error', { when: 'multiline' }],
+      '@stylistic/jsx-props-no-multi-spaces': 'error',
+      '@stylistic/jsx-tag-spacing': 'error',
     },
   },
 ])