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

refactor(nuxt): simplify check of dedupe option (#28151)

Browse Source
This commit is contained in:
xjccc 2024-07-15 23:49:53 +08:00 committed by GitHub
parent 02d46dd3db
commit c260eaac57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,9 +100,6 @@ export interface AsyncDataExecuteOptions {
* Force a refresh, even if there is already a pending request. Previous requests will * Force a refresh, even if there is already a pending request. Previous requests will
* not be cancelled, but their result will not affect the data/pending state - and any * not be cancelled, but their result will not affect the data/pending state - and any
* previously awaited promises will not resolve until this new request resolves. * previously awaited promises will not resolve until this new request resolves.
*
* Instead of using `boolean` values, use `cancel` for `true` and `defer` for `false`.
* Boolean values will be removed in a future release.
*/ */
dedupe?: 'cancel' | 'defer' dedupe?: 'cancel' | 'defer'
} }
@ -122,9 +119,6 @@ export interface _AsyncData<DataT, ErrorT> {
export type AsyncData<Data, Error> = _AsyncData<Data, Error> & Promise<_AsyncData<Data, Error>> export type AsyncData<Data, Error> = _AsyncData<Data, Error> & Promise<_AsyncData<Data, Error>>
// TODO: remove boolean option in Nuxt 4
const isDefer = (dedupe?: boolean | 'cancel' | 'defer') => dedupe === 'defer' || dedupe === false
/** /**
* Provides access to data that resolves asynchronously in an SSR-friendly composable. * Provides access to data that resolves asynchronously in an SSR-friendly composable.
* See {@link https://nuxt.com/docs/api/composables/use-async-data} * See {@link https://nuxt.com/docs/api/composables/use-async-data}
@ -245,10 +239,6 @@ export function useAsyncData<
options.deep = options.deep ?? asyncDataDefaults.deep options.deep = options.deep ?? asyncDataDefaults.deep
options.dedupe = options.dedupe ?? 'cancel' options.dedupe = options.dedupe ?? 'cancel'
if (import.meta.dev && typeof options.dedupe === 'boolean') {
console.warn('[nuxt] `boolean` values are deprecated for the `dedupe` option of `useAsyncData` and will be removed in the future. Use \'cancel\' or \'defer\' instead.')
}
// TODO: make more precise when v4 lands // TODO: make more precise when v4 lands
const hasCachedData = () => options.getCachedData!(key, nuxtApp) !== undefined const hasCachedData = () => options.getCachedData!(key, nuxtApp) !== undefined
@ -275,7 +265,7 @@ export function useAsyncData<
asyncData.refresh = asyncData.execute = (opts = {}) => { asyncData.refresh = asyncData.execute = (opts = {}) => {
if (nuxtApp._asyncDataPromises[key]) { if (nuxtApp._asyncDataPromises[key]) {
if (isDefer(opts.dedupe ?? options.dedupe)) { if ((opts.dedupe ?? options.dedupe) === 'defer') {
// Avoid fetching same key more than once at a time // Avoid fetching same key more than once at a time
return nuxtApp._asyncDataPromises[key]! return nuxtApp._asyncDataPromises[key]!
} }