nuxt-nightly 4.2.1-29373755.3e1eb666 → 4.2.1-29373901.6b5d7717

package/dist/app/composables/asyncData.js

@@ -352,22 +352,21 @@ function createAsyncData(nuxtApp, key, _handler, options, initialCachedData) {
       }
       asyncData._abortController = new AbortController();
       asyncData.status.value = "pending";
+      const cleanupController = new AbortController();
       const promise = new Promise(
         (resolve, reject) => {
           try {
             const timeout = opts.timeout ?? options.timeout;
-            const mergedSignal = mergeAbortSignals(nuxtApp, [asyncData._abortController?.signal, opts?.signal], timeout);
+            const mergedSignal = mergeAbortSignals([asyncData._abortController?.signal, opts?.signal], cleanupController.signal, timeout);
             if (mergedSignal.aborted) {
               const reason = mergedSignal.reason;
               reject(reason instanceof Error ? reason : new DOMException(String(reason ?? "Aborted"), "AbortError"));
               return;
             }
-            const onAbort = () => {
+            mergedSignal.addEventListener("abort", () => {
               const reason = mergedSignal.reason;
               reject(reason instanceof Error ? reason : new DOMException(String(reason ?? "Aborted"), "AbortError"));
-            };
-            mergedSignal.addEventListener("abort", onAbort, { once: true });
-            removeListenerAfterRender(nuxtApp, mergedSignal, onAbort);
+            }, { once: true, signal: cleanupController.signal });
             return Promise.resolve(handler(nuxtApp, { signal: mergedSignal })).then(resolve, reject);
           } catch (err) {
             reject(err);
@@ -408,6 +407,7 @@ function createAsyncData(nuxtApp, key, _handler, options, initialCachedData) {
         if (pendingWhenIdle) {
           asyncData.pending.value = false;
         }
+        cleanupController.abort();
         delete nuxtApp._asyncDataPromises[key];
       });
       nuxtApp._asyncDataPromises[key] = promise;
@@ -452,7 +452,7 @@ function createHash(_handler, options) {
     getCachedData: options.getCachedData ? hash(options.getCachedData) : void 0
   };
 }
-function mergeAbortSignals(nuxtApp, signals, timeout) {
+function mergeAbortSignals(signals, cleanupSignal, timeout) {
   const list = signals.filter((s) => !!s);
   if (typeof timeout === "number" && timeout >= 0) {
     const timeoutSignal = AbortSignal.timeout?.(timeout);
@@ -485,18 +485,7 @@ function mergeAbortSignals(nuxtApp, signals, timeout) {
     }
   };
   for (const sig of list) {
-    sig.addEventListener?.("abort", onAbort, { once: true });
-    removeListenerAfterRender(nuxtApp, sig, onAbort);
+    sig.addEventListener?.("abort", onAbort, { once: true, signal: cleanupSignal });
   }
   return controller.signal;
 }
-function removeListenerAfterRender(nuxtApp, sig, onAbort) {
-  if (!import.meta.server) {
-    return;
-  }
-  for (const hook of ["app:rendered", "app:error"]) {
-    nuxtApp.hooks.hookOnce(hook, () => {
-      sig.removeEventListener?.("abort", onAbort);
-    });
-  }
-}

package/dist/index.mjs

@@ -3835,7 +3835,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.2.1-29373755.3e1eb666";
+const version = "4.2.1-29373901.6b5d7717";
 
 function createImportProtectionPatterns(nuxt, options) {
   const patterns = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.2.1-29373755.3e1eb666",
+  "version": "4.2.1-29373901.6b5d7717",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,11 +67,11 @@
     "@dxup/nuxt": "^0.2.1",
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devtools": "^3.0.1",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.1-29373755.3e1eb666",
-    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.2.1-29373755.3e1eb666",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.1-29373755.3e1eb666",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.1-29373901.6b5d7717",
+    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.2.1-29373901.6b5d7717",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.1-29373901.6b5d7717",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.2.1-29373755.3e1eb666",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.2.1-29373901.6b5d7717",
     "@unhead/vue": "^2.0.19",
     "@vue/shared": "^3.5.22",
     "c12": "^3.3.1",