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

perf(nuxt): unsubscribe from watch when scope is disposed (#26554)

Browse Source
This commit is contained in:
Daniel Roe 2024-04-03 10:15:21 +01:00 committed by GitHub
parent 2f8915127d
commit cbb4a1cb61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/nuxt/src/app/composables/asyncData.ts
View File

@ -1,4 +1,4 @@
import { computed, getCurrentInstance, onBeforeMount, onServerPrefetch, onUnmounted, ref, shallowRef, toRef, unref, watch } from 'vue' import { computed, getCurrentInstance, getCurrentScope, onBeforeMount, onScopeDispose, onServerPrefetch, onUnmounted, ref, shallowRef, toRef, unref, watch } from 'vue'
import type { Ref, WatchSource } from 'vue' import type { Ref, WatchSource } from 'vue'
import type { NuxtApp } from '../nuxt' import type { NuxtApp } from '../nuxt'
import { useNuxtApp } from '../nuxt' import { useNuxtApp } from '../nuxt'
@ -223,8 +223,8 @@ export function useAsyncData<
const promise = nuxtApp.runWithContext(_handler) const promise = nuxtApp.runWithContext(_handler)
nuxtApp.ssrContext!._sharedPrerenderCache!.set(key, promise) nuxtApp.ssrContext!._sharedPrerenderCache!.set(key, promise)
return promise return promise
} }
// Used to get default values // Used to get default values
@ -370,16 +370,20 @@ export function useAsyncData<
// 4. Navigation (lazy: false) - or plugin usage: await fetch // 4. Navigation (lazy: false) - or plugin usage: await fetch
initialFetch() initialFetch()
} }
const hasScope = getCurrentScope()
if (options.watch) { if (options.watch) {
watch(options.watch, () => asyncData.refresh()) const unsub = watch(options.watch, () => asyncData.refresh())
if (hasScope) {
onScopeDispose(unsub)
}
} }
const off = nuxtApp.hook('app:data:refresh', async (keys) => { const off = nuxtApp.hook('app:data:refresh', async (keys) => {
if (!keys || keys.includes(key)) { if (!keys || keys.includes(key)) {
await asyncData.refresh() await asyncData.refresh()
} }
}) })
if (instance) { if (hasScope) {
onUnmounted(off) onScopeDispose(off)
} }
} }