@alexlit/lint-kit 171.0.0 → 172.0.0

package/eslint.config.js

@@ -7,16 +7,9 @@ import {
 export default [
   ...defaultPreset,
 
-  {
-    ignores: ['packages/config-eslint/_legacy'],
-  },
+  { ignores: ['packages/config-eslint/_legacy'] },
 
-  {
-    files: ['packages/**'],
-    rules: {
-      'no-restricted-imports': 'off',
-    },
-  },
+  { files: ['packages/**'], rules: { 'no-restricted-imports': 'off' } },
 
   ...tailwindcss,
   ...prettierConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexlit/lint-kit",
-  "version": "171.0.0",
+  "version": "172.0.0",
   "private": false,
   "description": "Preset of configuration files and dependencies for linting web applications (designed for Vue.js with TypeScript)",
   "keywords": [

package/packages/config-eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexlit/config-eslint",
-  "version": "129.2.0",
+  "version": "130.0.0",
   "private": false,
   "description": "Sharable ESLint configuration",
   "keywords": [
@@ -40,27 +40,27 @@
   },
   "dependencies": {
     "@eslint/js": "^9.39.2",
-    "@eslint/json": "^0.14.0",
+    "@eslint/json": "^1.0.0",
     "@intlify/eslint-plugin-vue-i18n": "^4.1.1",
     "@stylistic/eslint-plugin": "^5.7.1",
     "@tanstack/eslint-plugin-query": "^5.91.3",
     "@unocss/eslint-config": "^66.6.0",
     "eslint": "9.39.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jsdoc": "^62.4.1",
+    "eslint-plugin-jsdoc": "^62.5.0",
     "eslint-plugin-perfectionist": "^5.4.0",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-regexp": "^3.0.0",
-    "eslint-plugin-sonarjs": "^3.0.5",
+    "eslint-plugin-sonarjs": "^3.0.6",
     "eslint-plugin-tailwindcss": "^3.18.2",
     "eslint-plugin-unicorn": "^62.0.0",
     "eslint-plugin-vitest": "^0.5.4",
     "eslint-plugin-vue": "^10.7.0",
     "eslint-plugin-vuejs-accessibility": "^2.4.1",
-    "globals": "^17.1.0",
+    "globals": "^17.2.0",
     "jsonc-eslint-parser": "^2.4.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.1",
+    "typescript-eslint": "^8.54.0",
     "yaml-eslint-parser": "^2.0.0"
   },
   "publishConfig": {

package/packages/config-eslint/plugins/javascript.js

@@ -1,9 +1,10 @@
 import plugin from '@eslint/js';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [eslint](https://eslint.org) */
-export const javascript = [
+export const javascript = defineConfig([
   { files: FILES, ...plugin.configs.recommended },
   {
     files: FILES,
@@ -38,4 +39,4 @@ export const javascript = [
       'prefer-template': 'warn',
     },
   },
-];
+]);

package/packages/config-eslint/plugins/jsdoc.js

@@ -1,9 +1,10 @@
 import plugin from 'eslint-plugin-jsdoc';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) */
-export const jsdoc = [
+export const jsdoc = defineConfig([
   { files: FILES, ...plugin.configs['flat/recommended'] },
   {
     files: FILES,
@@ -32,4 +33,4 @@ export const jsdoc = [
       'jsdoc/tag-lines': 'off',
     },
   },
-];
+]);

package/packages/config-eslint/plugins/json.js

@@ -1,34 +1,27 @@
 import plugin from '@eslint/json';
+import { defineConfig } from 'eslint/config';
 
 /** @see [eslint/json](https://github.com/eslint/json) */
-export const json = [
-  // json
+export const json = defineConfig([
   {
+    extends: ['json/recommended'],
     files: ['**/*.json'],
     ignores: ['**/package-lock.json'],
     language: 'json/json',
-    ...plugin.configs.recommended,
-  },
-  {
-    files: ['**/*.json'],
-    ignores: ['**/package.json', '**/package-lock.json'],
-    rules: {
-      'json/sort-keys': 'warn',
-      'json/top-level-interop': 'error',
-    },
+    plugins: { json: plugin },
   },
 
-  // jsonc
   {
+    extends: ['json/recommended'],
     files: ['**/*.jsonc'],
     language: 'json/jsonc',
-    ...plugin.configs.recommended,
+    plugins: { json: plugin },
   },
 
-  // json5
   {
+    extends: ['json/recommended'],
     files: ['**/*.json5'],
     language: 'json/json5',
-    ...plugin.configs.recommended,
+    plugins: { json: plugin },
   },
-];
+]);

package/packages/config-eslint/plugins/perfectionist.js

@@ -1,9 +1,10 @@
 import plugin from 'eslint-plugin-perfectionist';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [eslint-plugin-perfectionist](https://perfectionist.dev) */
-export const perfectionist = [
+export const perfectionist = defineConfig([
   { files: FILES, ...plugin.configs['recommended-natural'] },
   {
     files: FILES,
@@ -29,4 +30,4 @@ export const perfectionist = [
       ],
     },
   },
-];
+]);

package/packages/config-eslint/plugins/prettier.js

@@ -1,5 +1,6 @@
 import config from 'eslint-config-prettier';
 import plugin from 'eslint-plugin-prettier/recommended';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
@@ -16,13 +17,13 @@ const fixes = {
 };
 
 /** @see [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) */
-export const prettier = [
+export const prettier = defineConfig([
   { files: FILES, ...plugin },
   { files: ['**/*.vue'], rules: { ...fixes } },
-];
+]);
 
 /** @see [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) */
-export const prettierConfig = [
+export const prettierConfig = defineConfig([
   { files: FILES, ...config },
   { files: ['**/*.vue'], rules: { ...fixes } },
-];
+]);

package/packages/config-eslint/plugins/regexp.js

@@ -1,6 +1,9 @@
 import plugin from 'eslint-plugin-regexp';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [eslint-plugin-regexp](https://github.com/ota-meshi/eslint-plugin-regexp) */
-export const regexp = [{ files: FILES, ...plugin.configs['flat/recommended'] }];
+export const regexp = defineConfig([
+  { files: FILES, ...plugin.configs['flat/recommended'] },
+]);

package/packages/config-eslint/plugins/sonar.js

@@ -1,9 +1,10 @@
 import plugin from 'eslint-plugin-sonarjs';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
-/** @see [eslint-plugin-sonarjs](https://github.com/SonarSource/eslint-plugin-sonarjs) */
-export const sonar = [
+/** @see [eslint-plugin-sonarjs](https://github.com/SonarSource/SonarJS/blob/master/packages/jsts/src/rules/README.md) */
+export const sonar = defineConfig([
   { files: FILES, ...plugin.configs.recommended },
   {
     files: FILES,
@@ -14,4 +15,4 @@ export const sonar = [
       'sonarjs/todo-tag': 'warn',
     },
   },
-];
+]);

package/packages/config-eslint/plugins/stylistic.js

@@ -1,10 +1,19 @@
 import plugin from '@stylistic/eslint-plugin';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [@stylistic/eslint-plugin](https://eslint.style/) */
-export const stylistic = [
-  plugin.configs.recommended,
+export const stylistic = defineConfig([
+  {
+    ...plugin.configs.recommended,
+    ignores: [
+      ...(plugin.configs.recommended.ignores ?? []),
+      '**/*.json',
+      '**/*.jsonc',
+      '**/*.json5',
+    ],
+  },
   {
     files: FILES,
     plugins: { '@stylistic': plugin },
@@ -99,4 +108,4 @@ export const stylistic = [
       ],
     },
   },
-];
+]);

package/packages/config-eslint/plugins/tailwindcss.js

@@ -1,8 +1,10 @@
+import { defineConfig } from 'eslint/config';
+
 // import tailwind from 'eslint-plugin-tailwindcss';
 import { FILES } from '../presets/base.js';
 
 /** @see [eslint-plugin-tailwindcss](https://github.com/francoismassart/eslint-plugin-tailwindcss) */
-export const tailwindcss = [
+export const tailwindcss = defineConfig([
   // TODO: включить после обновления плагина
   // ...tailwind.configs['flat/recommended'],
   {
@@ -26,4 +28,4 @@ export const tailwindcss = [
     //   },
     // },
   },
-];
+]);

package/packages/config-eslint/plugins/tanstack-query.js

@@ -1,4 +1,7 @@
 import plugin from '@tanstack/eslint-plugin-query';
+import { defineConfig } from 'eslint/config';
 
 /** @see [@tanstack/query](https://tanstack.com/query/latest/docs/eslint/eslint-plugin-query) */
-export const tanstackQuery = [...plugin.configs['flat/recommended']];
+export const tanstackQuery = defineConfig([
+  ...plugin.configs['flat/recommended'],
+]);

package/packages/config-eslint/plugins/typescript.js

@@ -1,10 +1,11 @@
 /* eslint-disable unicorn/no-null */
+import { defineConfig } from 'eslint/config';
 import plugin from 'typescript-eslint';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint) */
-export const typescript = [
+export const typescript = defineConfig([
   ...plugin.configs.strict,
   ...plugin.configs.stylistic,
 
@@ -50,4 +51,4 @@ export const typescript = [
       ],
     },
   },
-];
+]);

package/packages/config-eslint/plugins/unicorn.js

@@ -1,9 +1,10 @@
 import plugin from 'eslint-plugin-unicorn';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) */
-export const unicorn = [
+export const unicorn = defineConfig([
   { files: FILES, ...plugin.configs['flat/all'] },
   {
     files: FILES,
@@ -53,4 +54,4 @@ export const unicorn = [
   },
   { files: ['.*'], rules: { 'unicorn/no-null': 'off' } },
   { files: ['*.d.ts'], rules: { 'unicorn/prefer-export-from': 'off' } },
-];
+]);

package/packages/config-eslint/plugins/unocss.js

@@ -1,9 +1,10 @@
 import plugin from '@unocss/eslint-config/flat';
+import { defineConfig } from 'eslint/config';
 
 import { FILES } from '../presets/base.js';
 
 /** @see [@unocss/eslint-config](https://unocss.dev/integrations/eslint) */
-export const unocss = [
+export const unocss = defineConfig([
   { files: FILES, ...plugin },
   { files: FILES, rules: { 'unocss/order-attributify': 'off' } },
-];
+]);

package/packages/config-eslint/plugins/vitest.js

@@ -1,12 +1,11 @@
 import plugin from 'eslint-plugin-vitest';
+import { defineConfig } from 'eslint/config';
 
 /** @see [eslint-plugin-vitest](https://github.com/veritem/eslint-plugin-vitest) */
-export const vitest = [
+export const vitest = defineConfig([
   {
     files: ['*.{test,spec}.{js,ts}'],
-    plugins: {
-      vitest: plugin,
-    },
+    plugins: { vitest: plugin },
     rules: {
       ...plugin.configs.all.rules,
 
@@ -16,4 +15,4 @@ export const vitest = [
       'vitest/require-to-throw-message': 'off',
     },
   },
-];
+]);

package/packages/config-eslint/plugins/vue-accessibility.js

@@ -1,7 +1,8 @@
 import plugin from 'eslint-plugin-vuejs-accessibility';
+import { defineConfig } from 'eslint/config';
 
 /** @see [eslint-plugin-vuejs-accessibility](https://vue-a11y.github.io/eslint-plugin-vuejs-accessibility/) */
-export const vueAccessibility = [
+export const vueAccessibility = defineConfig([
   ...plugin.configs['flat/recommended'],
 
   {
@@ -9,14 +10,9 @@ export const vueAccessibility = [
     rules: {
       'vuejs-accessibility/label-has-for': [
         'warn',
-        {
-          allowChildren: true,
-          required: {
-            some: ['nesting', 'id'],
-          },
-        },
+        { allowChildren: true, required: { some: ['nesting', 'id'] } },
       ],
       'vuejs-accessibility/no-autofocus': ['warn', { ignoreNonDOM: true }],
     },
   },
-];
+]);

package/packages/config-eslint/plugins/vue-i18n.js

@@ -1,7 +1,8 @@
 import plugin from '@intlify/eslint-plugin-vue-i18n';
+import { defineConfig } from 'eslint/config';
 
 /** @see [eslint-plugin-vue-i18n](https://eslint-plugin-vue-i18n.intlify.dev/) */
-export const vueI18n = [
+export const vueI18n = defineConfig([
   ...plugin.configs['flat/recommended'].map((config) => ({
     ...config,
     ignores: [
@@ -18,15 +19,11 @@ export const vueI18n = [
       '@intlify/vue-i18n/key-format-style': [
         'error',
         'snake_case',
-        {
-          allowArray: false,
-        },
+        { allowArray: false },
       ],
       '@intlify/vue-i18n/no-duplicate-keys-in-locale': [
         'error',
-        {
-          ignoreI18nBlock: false,
-        },
+        { ignoreI18nBlock: false },
       ],
       '@intlify/vue-i18n/no-dynamic-keys': 'warn',
       '@intlify/vue-i18n/no-raw-text': 'off',
@@ -42,4 +39,4 @@ export const vueI18n = [
       },
     },
   },
-];
+]);

package/packages/config-eslint/plugins/vue.js

@@ -1,8 +1,9 @@
 import plugin from 'eslint-plugin-vue';
+import { defineConfig } from 'eslint/config';
 import typescript from 'typescript-eslint';
 
 /** @see [eslint-plugin-vue](https://eslint.vuejs.org/rules/) */
-export const vue = [
+export const vue = defineConfig([
   ...plugin.configs['flat/recommended'].map((config) => ({
     ...config,
     ignores: [
@@ -183,4 +184,4 @@ export const vue = [
     files: ['**/pages/**/*.vue', '**/layouts/**/*.vue'],
     rules: { 'vue/multi-word-component-names': 'off' },
   },
-];
+]);

package/packages/config-eslint/presets/base.js

@@ -1,9 +1,10 @@
+import { defineConfig } from 'eslint/config';
 import globals from 'globals';
 
 export const FILES = ['**/*.{js,mjs,cjs,jsx,ts,tsx,vue}'];
 
 /** Base config */
-export const base = [
+export const base = defineConfig([
   { files: FILES, languageOptions: { globals: globals.browser } },
   {
     ignores: [
@@ -18,4 +19,4 @@ export const base = [
       'sw.js',
     ],
   },
-];
+]);

package/packages/config-eslint/presets/default.js

@@ -1,3 +1,5 @@
+import { defineConfig } from 'eslint/config';
+
 import { javascript } from '../plugins/javascript.js';
 import { jsdoc } from '../plugins/jsdoc.js';
 import { json } from '../plugins/json.js';
@@ -15,7 +17,7 @@ import { vueI18n } from '../plugins/vue-i18n.js';
 import { vue } from '../plugins/vue.js';
 import { base } from './base.js';
 
-export const defaultPreset = [
+export const defaultPreset = defineConfig([
   ...base, // must be first
 
   ...javascript,
@@ -34,4 +36,4 @@ export const defaultPreset = [
   ...vueI18n,
 
   ...prettierConfig, // must be last
-];
+]);

package/scripts/lint.eslint.sh

@@ -4,7 +4,7 @@ source "$(dirname $0)"/../bash.config.sh
 
 OPTION=${1}
 
-FILES='./**/*{.cjs,.mjs,.js,.jsx,.ts,.tsx,.vue}'
+FILES='./**/*{.cjs,.mjs,.js,.jsx,.ts,.tsx,.vue,.json}'
 
 echo -e "${YELLOW}eslint ${GREY}-> ${CYAN}${FILES}${WHITE}"