@cuiqg/eslint-config 2.5.9 → 2.5.11

package/.vscode/settings.json

@@ -1,8 +1,14 @@
 {
   "editor.formatOnSave": false,
-  "eslint.format.enable": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit",
     "source.organizeImports": "never"
-  }
+  },
+  "eslint.runtime": "node",
+  "eslint.validate": [
+    "javascript",
+    "vue",
+    "html",
+    "jsonc"
+  ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuiqg/eslint-config",
-  "version": "2.5.9",
+  "version": "2.5.11",
   "description": "Eslint config for @cuiqg",
   "keywords": [
     "eslint-config"
@@ -17,8 +17,7 @@
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "exports": {
-    ".": "./dist/index.mjs",
-    "./package.json": "./package.json"
+    ".": "./dist/index.mjs"
   },
   "devDependencies": {
     "@cuiqg/prettier-config": "latest",
@@ -40,10 +39,12 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-flat-config-utils": "^2.1.4",
     "eslint-plugin-compat": "^6.0.2",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsdoc": "^61.4.1",
     "eslint-plugin-package-json": "^0.85.0",
     "eslint-plugin-perfectionist": "^4.15.1",
     "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-unicorn": "^62.0.0",
     "eslint-plugin-vue": "^10.6.2",
     "globals": "^16.5.0",
@@ -51,12 +52,13 @@
     "local-pkg": "^1.1.2",
     "vue-eslint-parser": "^10.2.0"
   },
+  "prettier": "@cuiqg/prettier-config",
   "scripts": {
     "build": "tsdown",
     "dev": "tsdown --watch",
-    "build:inspect": "eslint-config-inspector build --config eslint-inspector.config.js",
+    "build:inspect": "pnpx @eslint/config-inspector build --config eslint-inspector.config.js",
     "lint": "eslint .",
-    "lint:inspect": "eslint-config-inspector --open false --config eslint-inspector.config.js",
+    "lint:inspect": "pnpx @eslint/config-inspector --open false --config eslint-inspector.config.js",
     "release": "bumpp && pnpm publish"
   }
 }

package/src/configs/ignores.js

@@ -1,5 +1,6 @@
 import { GLOB_EXCLUDE } from '../globs'
 import { interopDefault } from '../utils'
+
 export async function ignores() {
   const configGitignore = await interopDefault(import('eslint-config-flat-gitignore'))
 

package/src/configs/imports.js

@@ -0,0 +1,12 @@
+import { interopDefault } from '../utils'
+
+export async function imports() {
+  const pluginImport = await interopDefault(import('eslint-plugin-import'))
+
+  return [
+    {
+      ...pluginImport.flatConfigs.recommended,
+      name: 'cuiqg/imports'
+    }
+  ]
+}

package/src/configs/index.js

@@ -9,3 +9,5 @@ export * from './unocss'
 export * from './vue'
 export * from './compat'
 export * from './unicorn'
+export * from './promise'
+export * from './imports'

package/src/configs/package-json.js

@@ -1,29 +1,16 @@
 import { interopDefault } from '../utils'
 
 export async function packageJson() {
-  const [pluginPackageJson, parserJsonc] = await Promise.all([
-    interopDefault(import('eslint-plugin-package-json')),
-    interopDefault(import('jsonc-eslint-parser'))
-  ])
+  const pluginPackageJson = await interopDefault(import('eslint-plugin-package-json'))
 
   return [
     {
-      files: ['**/package.json'],
-      languageOptions: {
-        parser: parserJsonc
-      },
-      name: 'cuiqg/package-json',
-      plugins: {
-        'package-json': pluginPackageJson
-      },
+      ...pluginPackageJson.configs.recommended,
       rules: {
-        ...pluginPackageJson.configs.recommended.rules
+        ...pluginPackageJson.configs.recommended.rules,
+        ...pluginPackageJson.configs.stylistic.rules
       },
-      settings: {
-        packageJson: {
-          enforceForPrivate: false
-        }
-      }
+      name: 'cuiqg/package-json'
     }
   ]
 }

package/src/configs/promise.js

@@ -0,0 +1,12 @@
+import { interopDefault } from '../utils'
+
+export async function promise() {
+  const pluginPromise = await interopDefault(import('eslint-plugin-promise'))
+
+  return [
+    {
+      ...pluginPromise.configs['flat/recommended'],
+      name: 'cuiqg/promise'
+    }
+  ]
+}

package/src/presets.js

@@ -3,6 +3,7 @@ import { FlatConfigComposer } from 'eslint-flat-config-utils'
 import {
   compat,
   ignores,
+  imports,
   javascript,
   jsdoc,
   macros,
@@ -11,13 +12,15 @@ import {
   stylistic,
   unocss,
   vue,
-  unicorn
+  unicorn,
+  promise
 } from './configs'
 
 import { hasUnoCss, hasVue } from './env'
 
 export const defaultPluginRenaming = {
-  '@stylistic': 'style'
+  '@stylistic': 'style',
+  '@typescript-eslint': 'ts'
 }
 
 /**
@@ -42,10 +45,12 @@ export function cuiqg(
     compat(),
     ignores(),
     javascript(),
+    imports(),
     jsdoc(),
     stylistic(),
     packageJson(),
-    unicorn()
+    unicorn(),
+    promise()
   )
 
   if (enableVue) {

package/tsdown.config.js

@@ -1,9 +1,18 @@
 import { defineConfig } from 'tsdown'
-
+import { spawn } from 'node:child_process'
 export default defineConfig({
   entry: 'src/index.js',
   clean: true,
   shims: true,
   format: ['esm'],
-  exports: true
+  hooks: {
+    'build:done': async (args) => {
+      if (args.options?.watch) {
+        spawn('pnpx', ['@eslint/config-inspector', '--open', 'false', '--config', 'eslint-inspector.config.js'], {
+          stdio: 'inherit',
+          shell: true
+        })
+      }
+    }
+  }
 })