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.

Sign up for GitHub

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

Jump to bottom

feat: pass nuxt instance to getCachedData #1156

Merged
merged 1 commit into from
Mar 19, 2024
Merged

feat: pass nuxt instance to getCachedData #1156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/bridge/src/runtime/composables/asyncData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface AsyncDataOptions<
* A `null` or `undefined` return value will trigger a fetch.
* Default is `key => nuxt.isHydrating ? nuxt.payload.data[key] : nuxt.static.data[key]` which only caches data when payloadExtraction is enabled.
*/
getCachedData?: (key: string) => DataT
getCachedData?: (key: string, nuxtApp: NuxtAppCompat) => DataT
/**
* A function that can be used to alter handler function result after resolving
*/
Expand Down Expand Up @@ -171,7 +171,7 @@ export function useAsyncData<
options.default = options.default ?? (getDefault as () => DefaultT)
options.getCachedData = options.getCachedData ?? getDefaultCachedData

const hasCachedData = () => ![null, undefined].includes(options.getCachedData!(key) as any)
const hasCachedData = () => options.getCachedData!(key, nuxt) != null

options.lazy = options.lazy ?? false
options.immediate = options.immediate ?? true
Expand All @@ -189,7 +189,7 @@ export function useAsyncData<
const _ref = options.deep ? ref : shallowRef

nuxt._asyncData[key] = {
data: _ref(options.getCachedData!(key) ?? options.default!()),
data: _ref(options.getCachedData!(key, nuxt) ?? options.default!()),
pending: ref(!hasCachedData()),
error: toRef(nuxt.payload._errors, key),
status: ref('idle')
Expand All @@ -209,7 +209,7 @@ export function useAsyncData<
}
// Avoid fetching same key that is already fetched
if ((opts._initial || (nuxt.isHydrating && opts._initial !== false)) && hasCachedData()) {
return Promise.resolve(options.getCachedData!(key))
return Promise.resolve(options.getCachedData!(key, nuxt))
}
asyncData.pending.value = true
asyncData.status.value = 'pending'
Expand Down