@ocavue/eslint-config 1.10.1 → 1.11.0

package/dist/src/antfu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"antfu.d.ts","sourceRoot":"","sources":["../../src/antfu.js"],"names":[],"mappings":"AAEA,mGAeC"}
+{"version":3,"file":"antfu.d.ts","sourceRoot":"","sources":["../../src/antfu.js"],"names":[],"mappings":"AAEA,mGAgBC"}

package/dist/src/imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/imports.js"],"names":[],"mappings":"AAKA,qGA2CC"}
+{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/imports.js"],"names":[],"mappings":"AAIA,qGA6CC"}

package/dist/src/typescript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../src/typescript.js"],"names":[],"mappings":"AAYA,wGAqFC;;qBA5FoB,mBAAmB"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../src/typescript.js"],"names":[],"mappings":"AAWA,wGA8FC;;qBApGoB,mBAAmB"}

package/dist/src/vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vue.d.ts","sourceRoot":"","sources":["../../src/vue.js"],"names":[],"mappings":"AAYA,iGAyBC"}
+{"version":3,"file":"vue.d.ts","sourceRoot":"","sources":["../../src/vue.js"],"names":[],"mappings":"AAYA,iGAgCC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocavue/eslint-config",
   "type": "module",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "packageManager": "pnpm@8.15.9",
   "description": "",
   "author": "ocavue <ocavue@gmail.com>",
@@ -39,7 +39,7 @@
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-antfu": "^2.3.4",
     "eslint-plugin-deprecation": "^3.0.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import-x": "^3.1.0",
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-markdown": "^5.1.0",
     "eslint-plugin-no-only-tests": "^3.1.0",

package/src/antfu.js

@@ -9,6 +9,7 @@ export function antfu() {
         antfu: antfuPlugin,
       },
       rules: {
+        'antfu/import-dedupe': 'error',
         'antfu/top-level-function': 'error',
       },
     },

package/src/imports.js

@@ -1,7 +1,6 @@
 // @ts-check
 
-// @ts-expect-error no type
-import importPlugin from 'eslint-plugin-import'
+import * as importPlugin from 'eslint-plugin-import-x'
 
 export function imports() {
   /** @type {import('eslint').Linter.FlatConfig[]} */
@@ -9,6 +8,7 @@ export function imports() {
     {
       name: 'import',
       plugins: {
+        // @ts-expect-error incorrect type
         import: importPlugin,
       },
       settings: {
@@ -26,6 +26,7 @@ export function imports() {
         'import/no-mutable-exports': 'warn',
         'import/no-useless-path-segments': 'warn',
         'import/newline-after-import': 'warn',
+        'import/no-duplicates': 'warn',
         'import/order': [
           'warn',
           {

package/src/typescript.js

@@ -6,7 +6,6 @@ import deprecationPlugin from 'eslint-plugin-deprecation'
 import tseslint from 'typescript-eslint'
 
 import { GLOB_JS, GLOB_JSX, GLOB_TEST, GLOB_TS, GLOB_TSX } from './shared.js'
-import { typescriptLanguageOptions } from './typescript-language-options.js'
 
 export { tseslint }
 
@@ -20,7 +19,15 @@ export function typescript() {
     {
       name: 'typescript',
       files: [GLOB_TS, GLOB_TSX, GLOB_JS, GLOB_JSX],
-      languageOptions: typescriptLanguageOptions,
+      languageOptions: {
+        // @ts-expect-error: conflict type
+        parser: tseslint.parser,
+        parserOptions: {
+          project: true,
+          sourceType: 'module',
+          ecmaVersion: 'latest',
+        },
+      },
       plugins: {
         // @ts-expect-error: conflict type
         '@typescript-eslint': tseslint.plugin,
@@ -36,7 +43,8 @@ export function typescript() {
         '@typescript-eslint/consistent-indexed-object-style': 'off',
         '@typescript-eslint/array-type': 'off',
         '@typescript-eslint/dot-notation': 'off',
-        '@typescript-eslint/no-unnecessary-parameter-property-assignment': 'warn',
+        '@typescript-eslint/no-unnecessary-parameter-property-assignment':
+          'warn',
         '@typescript-eslint/restrict-plus-operands': 'warn',
         '@typescript-eslint/no-unsafe-call': 'warn',
         '@typescript-eslint/no-unsafe-return': 'warn',

package/src/vue.js

@@ -2,25 +2,32 @@
 
 import prettierConfig from 'eslint-config-prettier'
 // @ts-expect-error no types
-import pluginVue from 'eslint-plugin-vue'
+import vuePlugin from 'eslint-plugin-vue'
+import tseslint from 'typescript-eslint'
 
 import { GLOB_VUE } from './shared.js'
-import { typescriptLanguageOptions } from './typescript-language-options.js'
 
-/** @type {import('eslint').Linter.FlatConfig} */
-const vueRecommended = pluginVue.configs['flat/recommended']
+/** @type {import('eslint').Linter.FlatConfig[]} */
+const vueRecommended = vuePlugin.configs['flat/recommended']
 
 export function vue() {
   /** @type {import('eslint').Linter.FlatConfig[]} */
   const config = [
+    ...vueRecommended,
     {
-      ...vueRecommended,
-      name: 'vue',
+      name: 'vue:language-options',
       files: [GLOB_VUE],
-      languageOptions: typescriptLanguageOptions,
+      languageOptions: {
+        parserOptions: {
+          parser: tseslint.parser,
+          sourceType: 'module',
+          ecmaVersion: 'latest',
+        },
+      },
+    },
+    {
+      name: 'vue:rules-override',
       rules: {
-        ...vueRecommended.rules,
-
         ...Object.fromEntries(
           Object.entries(prettierConfig.rules)
             .filter(([key]) => key.startsWith('vue/'))

package/dist/src/typescript-language-options.d.ts

@@ -1,3 +0,0 @@
-/** @type {import('eslint').Linter.FlatConfig['languageOptions']} */
-export const typescriptLanguageOptions: import("eslint").Linter.FlatConfig["languageOptions"];
-//# sourceMappingURL=typescript-language-options.d.ts.map

package/dist/src/typescript-language-options.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"typescript-language-options.d.ts","sourceRoot":"","sources":["../../src/typescript-language-options.js"],"names":[],"mappings":"AAIA,oEAAoE;AACpE,wCADW,OAAO,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAS/D"}

package/src/typescript-language-options.js

@@ -1,14 +0,0 @@
-// @ts-check
-
-import tseslint from 'typescript-eslint'
-
-/** @type {import('eslint').Linter.FlatConfig['languageOptions']} */
-export const typescriptLanguageOptions = {
-  // @ts-expect-error: conflict type
-  parser: tseslint.parser,
-  parserOptions: {
-    project: true,
-    sourceType: 'module',
-    ecmaVersion: 'latest',
-  },
-}