File tree Expand file tree Collapse file tree 2 files changed +8
-8
lines changed Expand file tree Collapse file tree 2 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -23,18 +23,18 @@ import {
23
23
unocss ,
24
24
vue ,
25
25
} from './configs'
26
+ import {
27
+ isInEditor as defaultIsInEditor ,
28
+ hasTypeScript ,
29
+ hasVue ,
30
+ } from './env'
26
31
import {
27
32
combine ,
28
33
getOverrides ,
29
34
interopDefault ,
30
35
renamePluginInConfigs ,
31
36
resolveSubOptions ,
32
37
} from './shared'
33
- import {
34
- isInEditor as defaultIsInEditor ,
35
- hasTypeScript ,
36
- hasVue ,
37
- } from './env'
38
38
import type { Awaitable , OptionsConfig , TypedFlatConfigItem } from './types'
39
39
import type { Linter } from 'eslint'
40
40
@@ -69,15 +69,15 @@ export const defaultPluginRenaming = {
69
69
*
70
70
* @param {OptionsConfig & TypedFlatConfigItem } options
71
71
* The options for generating the ESLint configurations.
72
- * @param {Awaitable<TypedFlatConfigItem | TypedFlatConfigItem[] | Linter.FlatConfig []>[] } userConfigs
72
+ * @param {Awaitable<TypedFlatConfigItem | TypedFlatConfigItem[] | Linter.Config []>[] } userConfigs
73
73
* The user configurations to be merged with the generated configurations.
74
74
* @returns {Promise<TypedFlatConfigItem[]> }
75
75
* The merged ESLint configurations.
76
76
*/
77
77
export async function defineConfig (
78
78
options : OptionsConfig & TypedFlatConfigItem = { } ,
79
79
...userConfigs : Awaitable <
80
- TypedFlatConfigItem | TypedFlatConfigItem [ ] | Linter . FlatConfig [ ]
80
+ TypedFlatConfigItem | TypedFlatConfigItem [ ] | Linter . Config [ ]
81
81
> [ ]
82
82
) : Promise < TypedFlatConfigItem [ ] > {
83
83
const {
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ export type Rules = RuleOptions
6
6
export type { ConfigNames }
7
7
8
8
export type TypedFlatConfigItem = Omit <
9
- Linter . FlatConfig < Linter . RulesRecord & Rules > ,
9
+ Linter . Config < Linter . RulesRecord & Rules > ,
10
10
'plugins'
11
11
> & {
12
12
// Relax plugins type limitation, as most of the plugins did not have correct type info yet.
You can’t perform that action at this time.
0 commit comments