From cdc4a231073d120c2fc119970ad61fe81225df29 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 10 Sep 2024 21:16:35 +0100 Subject: [PATCH] fix(nuxt,schema): accept any module in inline `modules` array (#28922) --- packages/nuxt/src/core/templates.ts | 2 +- packages/schema/src/config/common.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts index ea9a380521..7b1845cb4a 100644 --- a/packages/nuxt/src/core/templates.ts +++ b/packages/nuxt/src/core/templates.ts @@ -226,7 +226,7 @@ export const schemaTemplate: NuxtTemplate = { ` [${configKey}]${options.unresolved ? '?' : ''}: typeof ${genDynamicImport(importName, { wrapper: false })}.default extends NuxtModule ? ${options.unresolved ? 'Partial' : 'O'} : Record`, ] }), - modules.length > 0 && options.unresolved ? ` modules?: (undefined | null | false | NuxtModule | string | [NuxtModule | string, Record] | ${modules.map(([configKey, importName, mod]) => `[${genString(mod.meta?.rawPath || importName)}, Exclude]`).join(' | ')})[],` : '', + modules.length > 0 && options.unresolved ? ` modules?: (undefined | null | false | NuxtModule | string | [NuxtModule | string, Record] | ${modules.map(([configKey, importName, mod]) => `[${genString(mod.meta?.rawPath || importName)}, Exclude]`).join(' | ')})[],` : '', ].filter(Boolean) return [ diff --git a/packages/schema/src/config/common.ts b/packages/schema/src/config/common.ts index aa668b95ed..61fcd1f2a5 100644 --- a/packages/schema/src/config/common.ts +++ b/packages/schema/src/config/common.ts @@ -295,7 +295,7 @@ export default defineUntypedSchema({ * function () {} * ] * ``` - * @type {(typeof import('../src/types/module').NuxtModule | string | [typeof import('../src/types/module').NuxtModule | string, Record] | undefined | null | false)[]} + * @type {(typeof import('../src/types/module').NuxtModule | string | [typeof import('../src/types/module').NuxtModule | string, Record] | undefined | null | false)[]} */ modules: { $resolve: (val: string[] | undefined): string[] => (val || []).filter(Boolean),