Skip to content

Commit b68f7e1

Browse files
committed
fix: install plugins globally for easy overrides
1 parent b6a6470 commit b68f7e1

File tree

7 files changed

+38
-30
lines changed

7 files changed

+38
-30
lines changed

src/configs/jsonc.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ import { GLOB_JSON, GLOB_JSON5, GLOB_JSONC } from '../globs'
33
import { parserJsonc, pluginJsonc } from '../plugins'
44

55
export const jsonc: FlatESLintConfigItem[] = [
6+
{
7+
plugins: {
8+
jsonc: pluginJsonc as any,
9+
},
10+
},
611
{
712
files: [GLOB_JSON, GLOB_JSON5, GLOB_JSONC],
813
languageOptions: {
914
parser: parserJsonc,
1015
},
11-
plugins: {
12-
jsonc: pluginJsonc as any,
13-
},
1416
rules: {
1517
'jsonc/array-bracket-spacing': ['error', 'never'],
1618
'jsonc/comma-dangle': ['error', 'never'],

src/configs/markdown.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { FlatESLintConfigItem } from 'eslint-define-config'
22
import { GLOB_MARKDOWN, GLOB_MARKDOWN_CODE } from '../globs'
3-
import { pluginMarkdown, pluginTs } from '../plugins'
3+
import { pluginMarkdown } from '../plugins'
44
import { OFF } from '../flags'
55
import type { OptionsComponentExts } from '../types'
66

@@ -11,10 +11,12 @@ export function markdown(options: OptionsComponentExts = {}): FlatESLintConfigIt
1111

1212
return [
1313
{
14-
files: [GLOB_MARKDOWN],
1514
plugins: {
1615
markdown: pluginMarkdown,
1716
},
17+
},
18+
{
19+
files: [GLOB_MARKDOWN],
1820
processor: 'markdown/markdown',
1921
},
2022
{
@@ -29,9 +31,6 @@ export function markdown(options: OptionsComponentExts = {}): FlatESLintConfigIt
2931
},
3032
},
3133
},
32-
plugins: {
33-
ts: pluginTs as any,
34-
},
3534
rules: {
3635
'antfu/no-cjs-exports': OFF,
3736
'antfu/no-ts-export-equal': OFF,

src/configs/stylistic.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import type { FlatESLintConfigItem } from 'eslint-define-config'
2-
import { pluginStylistic } from '../plugins'
2+
import { pluginAntfu, pluginStylistic } from '../plugins'
33

44
export const stylistic: FlatESLintConfigItem[] = [
55
{
66
plugins: {
7+
antfu: pluginAntfu,
78
style: pluginStylistic,
89
},
910
rules: {

src/configs/test.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import { OFF } from '../flags'
55
import type { OptionsIsInEditor } from '../types'
66

77
export function test(options: OptionsIsInEditor = {}): FlatESLintConfigItem[] {
8-
return [
9-
{
10-
files: GLOB_TESTS,
11-
plugins: {
12-
'no-only-tests': pluginNoOnlyTests,
13-
},
14-
rules: {
15-
'no-only-tests/no-only-tests': options.isInEditor ? OFF : 'error',
16-
},
8+
return [{
9+
plugins: {
10+
'no-only-tests': pluginNoOnlyTests,
1711
},
18-
]
12+
}, {
13+
files: GLOB_TESTS,
14+
rules: {
15+
'no-only-tests/no-only-tests': options.isInEditor ? OFF : 'error',
16+
},
17+
}]
1918
}

src/configs/typescript.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ export function typescript(options?: OptionsComponentExts): FlatESLintConfigItem
1212
} = options ?? {}
1313

1414
return [
15+
{
16+
plugins: {
17+
antfu: pluginAntfu,
18+
import: pluginImport,
19+
ts: pluginTs as any,
20+
},
21+
},
1522
{
1623
files: [
1724
GLOB_TS,
@@ -24,11 +31,6 @@ export function typescript(options?: OptionsComponentExts): FlatESLintConfigItem
2431
sourceType: 'module',
2532
},
2633
},
27-
plugins: {
28-
antfu: pluginAntfu,
29-
import: pluginImport,
30-
ts: pluginTs as any,
31-
},
3234
rules: {
3335
...renameRules(
3436
pluginTs.configs['eslint-recommended'].overrides![0].rules!,

src/configs/vue.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ const vue2Rules: Rules = {
3535

3636
export function vue(options: OptionsHasTypeScript = {}): FlatESLintConfigItem[] {
3737
return [
38+
{
39+
plugins: {
40+
vue: pluginVue,
41+
},
42+
},
3843
{
3944
files: [GLOB_VUE],
4045
languageOptions: {
@@ -48,9 +53,7 @@ export function vue(options: OptionsHasTypeScript = {}): FlatESLintConfigItem[]
4853
sourceType: 'module',
4954
},
5055
},
51-
plugins: {
52-
vue: pluginVue,
53-
},
56+
5457
processor: pluginVue.processors['.vue'],
5558
rules: {
5659
...(isVue3 ? vue3Rules : vue2Rules),

src/configs/yml.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ import { parserYml, pluginYml } from '../plugins'
44
import { OFF } from '../flags'
55

66
export const yml: FlatESLintConfigItem[] = [
7+
{
8+
plugins: {
9+
yml: pluginYml as any,
10+
},
11+
},
712
{
813
files: [GLOB_YAML],
914
languageOptions: {
1015
parser: parserYml,
1116
},
12-
plugins: {
13-
yml: pluginYml as any,
14-
},
1517
rules: {
1618
'style/spaced-comment': OFF,
1719

0 commit comments

Comments
 (0)