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

fix(kit): support calling Nuxt 2 modules with module container (#20023)

Browse Source
This commit is contained in:
Daniel Roe 2023-04-03 13:04:56 +01:00 committed by GitHub
parent 8908aa7c5a
commit b1826ee9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/kit/src/module/install.ts
View File

@ -1,4 +1,5 @@
import type { Nuxt, NuxtModule } from '@nuxt/schema' import type { Nuxt, NuxtModule } from '@nuxt/schema'
import { isNuxt2 } from '../compatibility'
import { useNuxt } from '../context' import { useNuxt } from '../context'
import { resolveModule, requireModule } from '../internal/cjs' import { resolveModule, requireModule } from '../internal/cjs'
import { importModule } from '../internal/esm' import { importModule } from '../internal/esm'
@ -10,7 +11,12 @@ export async function installModule (moduleToInstall: string | NuxtModule, _inli
const { nuxtModule, inlineOptions } = await normalizeModule(moduleToInstall, _inlineOptions) const { nuxtModule, inlineOptions } = await normalizeModule(moduleToInstall, _inlineOptions)
// Call module // 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 */) { if (res === false /* setup aborted */) {
return return
} }