From b1826ee9f469b466afba20b79b8f5a5db3e65aea Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 3 Apr 2023 13:04:56 +0100 Subject: [PATCH] fix(kit): support calling Nuxt 2 modules with module container (#20023) --- packages/kit/src/module/install.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/kit/src/module/install.ts b/packages/kit/src/module/install.ts index 98c5a2e0ce..8cfa52336d 100644 --- a/packages/kit/src/module/install.ts +++ b/packages/kit/src/module/install.ts @@ -1,4 +1,5 @@ import type { Nuxt, NuxtModule } from '@nuxt/schema' +import { isNuxt2 } from '../compatibility' import { useNuxt } from '../context' import { resolveModule, requireModule } from '../internal/cjs' import { importModule } from '../internal/esm' @@ -10,7 +11,12 @@ export async function installModule (moduleToInstall: string | NuxtModule, _inli const { nuxtModule, inlineOptions } = await normalizeModule(moduleToInstall, _inlineOptions) // Call module - const res = await nuxtModule(inlineOptions, nuxt) ?? {} + const res = ( + isNuxt2() + // @ts-expect-error Nuxt 2 `moduleContainer` is not typed + ? await nuxtModule.call(nuxt.moduleContainer, inlineOptions, nuxt) + : await nuxtModule(inlineOptions, nuxt) + ) ?? {} if (res === false /* setup aborted */) { return }