Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxt): prefer nuxt app context over getCurrentInstance #5456

Merged
merged 1 commit into from Jun 15, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/nuxt/src/app/nuxt.ts
Expand Up @@ -236,17 +236,17 @@ export function callWithNuxt<T extends (...args: any[]) => any> (nuxt: NuxtApp |
* Returns the current Nuxt instance.
*/
export function useNuxtApp () {
const vm = getCurrentInstance()
const nuxtAppInstance = nuxtAppCtx.use()

if (!vm) {
const nuxtAppInstance = nuxtAppCtx.use()
if (!nuxtAppInstance) {
if (!nuxtAppInstance) {
const vm = getCurrentInstance()
if (!vm) {
throw new Error('nuxt instance unavailable')
}
return nuxtAppInstance
return vm.appContext.app.$nuxt as NuxtApp
}

return vm.appContext.app.$nuxt as NuxtApp
return nuxtAppInstance
}

export function useRuntimeConfig (): RuntimeConfig {
Expand Down