fix(nuxt): handle non-immediate useAsyncData with different key on ssr (#33341)

danielroe · web-flow · commit c704151692fc · 2025-10-06T14:18:31.000+01:00
diff --git a/packages/nuxt/src/app/composables/asyncData.ts b/packages/nuxt/src/app/composables/asyncData.ts
@@ -247,17 +247,20 @@ export function useAsyncData<
   }
 
   // Create or use a shared asyncData entity
-  const initialFetchOptions: AsyncDataExecuteOptions = { cause: 'initial', dedupe: options.dedupe }
-  if (!nuxtApp._asyncData[key.value]?._init) {
-    initialFetchOptions.cachedData = options.getCachedData!(key.value, nuxtApp, { cause: 'initial' })
-    nuxtApp._asyncData[key.value] = createAsyncData(nuxtApp, key.value, _handler, options, initialFetchOptions.cachedData)
+  function createInitialFetch () {
+    const initialFetchOptions: AsyncDataExecuteOptions = { cause: 'initial', dedupe: options.dedupe }
+    if (!nuxtApp._asyncData[key.value]?._init) {
+      initialFetchOptions.cachedData = options.getCachedData!(key.value, nuxtApp, { cause: 'initial' })
+      nuxtApp._asyncData[key.value] = createAsyncData(nuxtApp, key.value, _handler, options, initialFetchOptions.cachedData)
+    }
+    return () => nuxtApp._asyncData[key.value]!.execute(initialFetchOptions)
   }
+
+  const initialFetch = createInitialFetch()
   const asyncData = nuxtApp._asyncData[key.value]!
 
   asyncData._deps++
 
-  const initialFetch = () => nuxtApp._asyncData[key.value]!.execute(initialFetchOptions)
-
   const fetchOnServer = options.server !== false && nuxtApp.payload.serverRendered
 
   // Server side
@@ -389,8 +392,14 @@ export function useAsyncData<
     pending: writableComputedRef(() => nuxtApp._asyncData[key.value]?.pending as Ref<boolean>),
     status: writableComputedRef(() => nuxtApp._asyncData[key.value]?.status as Ref<AsyncDataRequestStatus>),
     error: writableComputedRef(() => nuxtApp._asyncData[key.value]?.error as Ref<NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>>),
-    refresh: (...args) => nuxtApp._asyncData[key.value]!.execute(...args),
-    execute: (...args) => nuxtApp._asyncData[key.value]!.execute(...args),
+    refresh: (...args) => {
+      if (!nuxtApp._asyncData[key.value]?._init) {
+        const initialFetch = createInitialFetch()
+        return initialFetch()
+      }
+      return nuxtApp._asyncData[key.value]!.execute(...args)
+    },
+    execute: (...args) => asyncReturn.refresh(...args),
     clear: () => clearNuxtDataByKey(nuxtApp, key.value),
   }
 
