Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(nuxt): prefer using currentInstance if available in useNuxtApp #19624

Closed
wants to merge 1 commit into from
Closed
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
11 changes: 4 additions & 7 deletions packages/nuxt/src/app/nuxt.ts
Expand Up @@ -315,17 +315,14 @@ export function callWithNuxt<T extends (...args: any[]) => any> (nuxt: NuxtApp |
* Returns the current Nuxt instance.
*/
export function useNuxtApp () {
const vm = getCurrentInstance()
if (vm) { return vm.appContext.app.$nuxt as NuxtApp }
const nuxtAppInstance = nuxtAppCtx.tryUse()

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

return nuxtAppInstance
return nuxtAppInstance as NuxtApp
}

export function useRuntimeConfig (): RuntimeConfig {
Expand Down