mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-22 05:35:13 +00:00
fix(nuxt): remove boolean
value for dedupe
in v4 compat (#27511)
This commit is contained in:
parent
018b03588a
commit
11a79359b8
@ -223,6 +223,46 @@ export default defineNuxtConfig({
|
|||||||
|
|
||||||
Please report an issue if you are doing this, as we do not plan to keep this as configurable.
|
Please report an issue if you are doing this, as we do not plan to keep this as configurable.
|
||||||
|
|
||||||
|
#### Removal of deprecated `boolean` values for `dedupe` option when calling `refresh` in `useAsyncData` and `useFetch`
|
||||||
|
|
||||||
|
🚦 **Impact Level**: Minimal
|
||||||
|
|
||||||
|
##### What Changed
|
||||||
|
|
||||||
|
Previously it was possible to pass `dedupe: boolean` to `refresh`. These were aliases of `cancel` (`true`) and `defer` (`false`).
|
||||||
|
|
||||||
|
```ts twoslash [app.vue]
|
||||||
|
const { refresh } = await useAsyncData(async () => ({ message: 'Hello, Nuxt 3!' }))
|
||||||
|
|
||||||
|
async function refreshData () {
|
||||||
|
await refresh({ dedupe: true })
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
##### Reasons for Change
|
||||||
|
|
||||||
|
These aliases were removed, for greater clarity.
|
||||||
|
|
||||||
|
The issue came up when adding `dedupe` as an option to `useAsyncData`, and we removed the boolean values as they ended up being _opposites_.
|
||||||
|
|
||||||
|
`refresh({ dedupe: false })` meant 'do not _cancel_ existing requests in favour of this new one'. But passing `dedupe: true` within the options of `useAsyncData` means 'do not make any new requests if there is an existing pending request.' (See [PR](https://github.com/nuxt/nuxt/pull/24564#pullrequestreview-1764584361).)
|
||||||
|
|
||||||
|
##### Migration Steps
|
||||||
|
|
||||||
|
The migration should be straightforward:
|
||||||
|
|
||||||
|
```diff
|
||||||
|
const { refresh } = await useAsyncData(async () => ({ message: 'Hello, Nuxt 3!' }))
|
||||||
|
|
||||||
|
async function refreshData () {
|
||||||
|
- await refresh({ dedupe: true })
|
||||||
|
+ await refresh({ dedupe: 'cancel' })
|
||||||
|
|
||||||
|
- await refresh({ dedupe: false })
|
||||||
|
+ await refresh({ dedupe: 'defer' })
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
#### Respect defaults when clearing `data` in `useAsyncData` and `useFetch`
|
#### Respect defaults when clearing `data` in `useAsyncData` and `useFetch`
|
||||||
|
|
||||||
🚦 **Impact Level**: Minimal
|
🚦 **Impact Level**: Minimal
|
||||||
|
@ -11,7 +11,7 @@ import { onNuxtReady } from './ready'
|
|||||||
import { asyncDataDefaults, resetAsyncDataToUndefined } from '#build/nuxt.config.mjs'
|
import { asyncDataDefaults, resetAsyncDataToUndefined } from '#build/nuxt.config.mjs'
|
||||||
|
|
||||||
// TODO: temporary module for backwards compatibility
|
// TODO: temporary module for backwards compatibility
|
||||||
import type { DefaultAsyncDataErrorValue, DefaultAsyncDataValue } from '#app/defaults'
|
import type { DedupeOption, DefaultAsyncDataErrorValue, DefaultAsyncDataValue } from '#app/defaults'
|
||||||
|
|
||||||
export type AsyncDataRequestStatus = 'idle' | 'pending' | 'success' | 'error'
|
export type AsyncDataRequestStatus = 'idle' | 'pending' | 'success' | 'error'
|
||||||
|
|
||||||
@ -99,7 +99,6 @@ export interface AsyncDataOptions<
|
|||||||
|
|
||||||
export interface AsyncDataExecuteOptions {
|
export interface AsyncDataExecuteOptions {
|
||||||
_initial?: boolean
|
_initial?: boolean
|
||||||
// TODO: remove boolean option in Nuxt 4
|
|
||||||
/**
|
/**
|
||||||
* 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
|
||||||
@ -108,7 +107,7 @@ export interface AsyncDataExecuteOptions {
|
|||||||
* Instead of using `boolean` values, use `cancel` for `true` and `defer` for `false`.
|
* Instead of using `boolean` values, use `cancel` for `true` and `defer` for `false`.
|
||||||
* Boolean values will be removed in a future release.
|
* Boolean values will be removed in a future release.
|
||||||
*/
|
*/
|
||||||
dedupe?: boolean | 'cancel' | 'defer'
|
dedupe?: DedupeOption
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface _AsyncData<DataT, ErrorT> {
|
export interface _AsyncData<DataT, ErrorT> {
|
||||||
|
@ -3,5 +3,6 @@
|
|||||||
export type DefaultAsyncDataErrorValue = null
|
export type DefaultAsyncDataErrorValue = null
|
||||||
export type DefaultAsyncDataValue = null
|
export type DefaultAsyncDataValue = null
|
||||||
export type DefaultErrorValue = null
|
export type DefaultErrorValue = null
|
||||||
|
export type DedupeOption = boolean | 'cancel' | 'defer'
|
||||||
|
|
||||||
export {}
|
export {}
|
||||||
|
@ -112,6 +112,8 @@ export const pluginsDeclaration: NuxtTemplate = {
|
|||||||
|
|
||||||
const pluginsName = (await annotatePlugins(ctx.nuxt, ctx.app.plugins)).filter(p => p.name).map(p => `'${p.name}'`)
|
const pluginsName = (await annotatePlugins(ctx.nuxt, ctx.app.plugins)).filter(p => p.name).map(p => `'${p.name}'`)
|
||||||
|
|
||||||
|
const isV4 = ctx.nuxt.options.future.compatibilityVersion === 4
|
||||||
|
|
||||||
return `// Generated by Nuxt'
|
return `// Generated by Nuxt'
|
||||||
import type { Plugin } from '#app'
|
import type { Plugin } from '#app'
|
||||||
|
|
||||||
@ -131,9 +133,10 @@ declare module '#app' {
|
|||||||
}
|
}
|
||||||
|
|
||||||
declare module '#app/defaults' {
|
declare module '#app/defaults' {
|
||||||
type DefaultAsyncDataErrorValue = ${ctx.nuxt.options.future.compatibilityVersion === 4 ? 'undefined' : 'null'}
|
type DefaultAsyncDataErrorValue = ${isV4 ? 'undefined' : 'null'}
|
||||||
type DefaultAsyncDataValue = ${ctx.nuxt.options.future.compatibilityVersion === 4 ? 'undefined' : 'null'}
|
type DefaultAsyncDataValue = ${isV4 ? 'undefined' : 'null'}
|
||||||
type DefaultErrorValue = ${ctx.nuxt.options.future.compatibilityVersion === 4 ? 'undefined' : 'null'}
|
type DefaultErrorValue = ${isV4 ? 'undefined' : 'null'}
|
||||||
|
type DedupeOption = ${isV4 ? '\'cancel\' | \'defer\'' : 'boolean | \'cancel\' | \'defer\''}
|
||||||
}
|
}
|
||||||
|
|
||||||
declare module 'vue' {
|
declare module 'vue' {
|
||||||
|
@ -15,7 +15,7 @@ if (count || data.value !== 1) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
timeout = 100
|
timeout = 100
|
||||||
const p = refresh({ dedupe: true, _initial: false })
|
const p = refresh({ dedupe: 'cancel', _initial: false })
|
||||||
|
|
||||||
if (import.meta.client && (count !== 0 || data.value !== 1)) {
|
if (import.meta.client && (count !== 0 || data.value !== 1)) {
|
||||||
throw new Error('count should start at 0')
|
throw new Error('count should start at 0')
|
||||||
|
Loading…
Reference in New Issue
Block a user