Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-11 08:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): test all custom app config keys for any (#20105)

Browse Source
This commit is contained in:
Daniel Roe 2023-04-06 13:33:54 +01:00 committed by GitHub
parent 4d75540655
commit 41bfd55230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/nuxt/src/core/templates.ts
View File

@ -224,14 +224,14 @@ type IsAny<T> = 0 extends 1 & T ? true : false
type MergedAppConfig<Resolved extends Record<string, any>, Custom extends Record<string, any>> = { type MergedAppConfig<Resolved extends Record<string, any>, Custom extends Record<string, any>> = {
[K in keyof Resolved]: K extends keyof Custom [K in keyof Resolved]: K extends keyof Custom
? Custom[K] extends Record<string, any> ? IsAny<Custom[K]> extends true
? IsAny<Custom[K]> extends true ? Resolved[K]
? Resolved[K] : Custom[K] extends Record<string, any>
: Resolved[K] extends Record<string, any> ? Resolved[K] extends Record<string, any>
? MergedAppConfig<Resolved[K], Custom[K]> ? MergedAppConfig<Resolved[K], Custom[K]>
: Exclude<Custom[K], undefined> : Exclude<Custom[K], undefined>
: Exclude<Custom[K], undefined> : Exclude<Custom[K], undefined>
: Resolved[K] : Resolved[K]
} }
declare module 'nuxt/schema' { declare module 'nuxt/schema' {