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 {
2323 unocss ,
2424 vue ,
2525} from './configs'
26+ import {
27+ isInEditor as defaultIsInEditor ,
28+ hasTypeScript ,
29+ hasVue ,
30+ } from './env'
2631import {
2732 combine ,
2833 getOverrides ,
2934 interopDefault ,
3035 renamePluginInConfigs ,
3136 resolveSubOptions ,
3237} from './shared'
33- import {
34- isInEditor as defaultIsInEditor ,
35- hasTypeScript ,
36- hasVue ,
37- } from './env'
3838import type { Awaitable , OptionsConfig , TypedFlatConfigItem } from './types'
3939import type { Linter } from 'eslint'
4040
@@ -69,15 +69,15 @@ export const defaultPluginRenaming = {
6969 *
7070 * @param {OptionsConfig & TypedFlatConfigItem } options
7171 * The options for generating the ESLint configurations.
72- * @param {Awaitable<TypedFlatConfigItem | TypedFlatConfigItem[] | Linter.FlatConfig []>[] } userConfigs
72+ * @param {Awaitable<TypedFlatConfigItem | TypedFlatConfigItem[] | Linter.Config []>[] } userConfigs
7373 * The user configurations to be merged with the generated configurations.
7474 * @returns {Promise<TypedFlatConfigItem[]> }
7575 * The merged ESLint configurations.
7676 */
7777export async function defineConfig (
7878 options : OptionsConfig & TypedFlatConfigItem = { } ,
7979 ...userConfigs : Awaitable <
80- TypedFlatConfigItem | TypedFlatConfigItem [ ] | Linter . FlatConfig [ ]
80+ TypedFlatConfigItem | TypedFlatConfigItem [ ] | Linter . Config [ ]
8181 > [ ]
8282) : Promise < TypedFlatConfigItem [ ] > {
8383 const {
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ export type Rules = RuleOptions
66export type { ConfigNames }
77
88export type TypedFlatConfigItem = Omit <
9- Linter . FlatConfig < Linter . RulesRecord & Rules > ,
9+ Linter . Config < Linter . RulesRecord & Rules > ,
1010 'plugins'
1111> & {
1212 // 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