Skip to content

Commit c19559f

Browse files
committedFeb 19, 2024··
feat!: move the optional sort-keys plugin to perfectionist
ref: antfu/eslint-config@9fa7426
1 parent a2ec44f commit c19559f

7 files changed

+50
-20
lines changed
 

‎eslint.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { createRequire } from 'node:module'
2+
// import { sxzz } from './dist/index.js'
3+
24
const require = createRequire(import.meta.url)
35
require('sucrase/register')
46
/** @type {typeof import('./src/index.ts')} */
57
const { sxzz } = require('./src/index.ts')
68

7-
// import { sxzz } from './dist/index.js'
8-
99
export default sxzz(
1010
[
1111
{
1212
files: ['src/**/*.ts'],
1313
rules: {
14-
'sort-keys/sort-keys-fix': 'error',
14+
'perfectionist/sort-objects': 'error',
1515
},
1616
},
1717
{

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"eslint-plugin-jsonc": "^2.13.0",
4848
"eslint-plugin-markdown": "^3.0.1",
4949
"eslint-plugin-n": "^16.6.2",
50+
"eslint-plugin-perfectionist": "^2.5.0",
5051
"eslint-plugin-prettier": "^5.1.3",
51-
"eslint-plugin-sort-keys": "^2.3.5",
5252
"eslint-plugin-unicorn": "^51.0.1",
5353
"eslint-plugin-unused-imports": "^3.1.0",
5454
"eslint-plugin-vue": "^9.21.1",

‎pnpm-lock.yaml

+35-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/configs/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export * from './javascript'
55
export * from './jsonc'
66
export * from './markdown'
77
export * from './node'
8+
export * from './perfectionist'
89
export * from './prettier'
9-
export * from './sort-keys'
1010
export * from './sort'
1111
export * from './typescript'
1212
export * from './unicorn'
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { pluginSortKeys } from '../plugins'
1+
import { pluginPerfectionist } from '../plugins'
22
import type { FlatESLintConfigItem } from 'eslint-define-config'
33

44
export const sortKeys: FlatESLintConfigItem[] = [
55
{
66
plugins: {
7-
'sort-keys': pluginSortKeys,
7+
perfectionist: pluginPerfectionist,
88
},
99
},
1010
]

‎src/plugins.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ export const pluginUnicorn = interopDefault(_pluginUnicorn)
2727
import * as _pluginVue from 'eslint-plugin-vue'
2828
export const pluginVue = interopDefault(_pluginVue)
2929

30+
import * as _pluginNode from 'eslint-plugin-n'
31+
export const pluginNode = interopDefault(_pluginNode)
32+
33+
import * as _pluginPerfectionist from 'eslint-plugin-perfectionist'
34+
export const pluginPerfectionist = interopDefault(_pluginPerfectionist)
35+
3036
import * as _pluginUnocss from '@unocss/eslint-plugin'
3137
export const pluginUnocss: typeof import('@unocss/eslint-plugin').default =
3238
interopDefault(_pluginUnocss)
@@ -41,8 +47,6 @@ export * as pluginImport from 'eslint-plugin-i'
4147
export * as pluginJsonc from 'eslint-plugin-jsonc'
4248
export * as pluginUnusedImports from 'eslint-plugin-unused-imports'
4349
export * as pluginYml from 'eslint-plugin-yml'
44-
export * as pluginSortKeys from 'eslint-plugin-sort-keys'
45-
export * as pluginNode from 'eslint-plugin-n'
4650

4751
export * as parserVue from 'vue-eslint-parser'
4852
export * as parserYml from 'yaml-eslint-parser'

‎src/presets.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ export { presetBasic as basic, presetAll as all }
6060
export function sxzz(
6161
config: FlatESLintConfigItem | FlatESLintConfigItem[] = [],
6262
{
63-
vue: enableVue = hasVue,
64-
prettier: enablePrettier = true,
6563
markdown: enableMarkdown = true,
64+
prettier: enablePrettier = true,
6665
unocss: enableUnocss = hasUnocss,
66+
vue: enableVue = hasVue,
6767
}: Partial<{
6868
/** Vue support. Auto-enable. */
6969
vue: boolean

0 commit comments

Comments
 (0)
Please sign in to comment.