fix(nuxt): prefer nuxt app context over getCurrentInstance

nuxt · Jun 14, 2022 · ee03e0d · ee03e0d
1 parent 92c5a94
commit ee03e0d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/nuxt/src/app/nuxt.ts b/packages/nuxt/src/app/nuxt.ts
@@ -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 {