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

Merge ba29fc031a into edc299a043

Browse Source
This commit is contained in:
Inesh Bose 2024-11-20 06:35:52 -05:00 committed by GitHub
commit b0ecaee59a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/kit/src/module/define.ts
View File

@ -65,7 +65,7 @@ function _defineNuxtModule<
const optionsDefaults: TOptionsDefaults = const optionsDefaults: TOptionsDefaults =
module.defaults instanceof Function module.defaults instanceof Function
? module.defaults(nuxt) ? await module.defaults(nuxt)
: module.defaults ?? <TOptionsDefaults> {} : module.defaults ?? <TOptionsDefaults> {}
let options = defu(inlineOptions, nuxtConfigOptions, optionsDefaults) let options = defu(inlineOptions, nuxtConfigOptions, optionsDefaults)

2
packages/schema/src/types/module.ts
View File

@ -64,7 +64,7 @@ export interface ModuleDefinition<
TWith extends boolean, TWith extends boolean,
> { > {
meta?: ModuleMeta meta?: ModuleMeta
defaults?: TOptionsDefaults | ((nuxt: Nuxt) => TOptionsDefaults) defaults?: TOptionsDefaults | ((nuxt: Nuxt) => Awaitable<TOptionsDefaults>)
schema?: TOptions schema?: TOptions
hooks?: Partial<NuxtHooks> hooks?: Partial<NuxtHooks>
setup?: ( setup?: (