@@ -18,7 +18,7 @@ export async function typescript(
18
18
OptionsTypeScriptWithTypes &
19
19
OptionsTypeScriptParserOptions = { } ,
20
20
) : Promise < TypedFlatConfigItem [ ] > {
21
- const { componentExts = [ ] , overrides = { } , parserOptions = { } } = options
21
+ const { componentExts = [ ] , overrides = { } , overridesTypeAware = { } , parserOptions = { } } = options
22
22
23
23
const files = options . files ?? [
24
24
GLOB_TS ,
@@ -105,8 +105,8 @@ export async function typescript(
105
105
// assign type-aware parser for type-aware files and type-unaware parser for the rest
106
106
...( isTypeAware
107
107
? [
108
+ makeParser ( false , files ) ,
108
109
makeParser ( true , filesTypeAware , ignoresTypeAware ) ,
109
- makeParser ( false , files , filesTypeAware ) ,
110
110
]
111
111
: [ makeParser ( false , files ) ] ) ,
112
112
{
@@ -170,8 +170,8 @@ export async function typescript(
170
170
ignores : ignoresTypeAware ,
171
171
name : 'coderwyd/typescript/rules-type-aware' ,
172
172
rules : {
173
- ...( tsconfigPath ? typeAwareRules : { } ) ,
174
- ...overrides ,
173
+ ...typeAwareRules ,
174
+ ...overridesTypeAware ,
175
175
} ,
176
176
} ,
177
177
]
0 commit comments