nuxt-nightly 4.3.0-29356103.2f7957ac → 4.3.0-29430616.754c35a4

package/dist/app/composables/asyncData.js

@@ -150,7 +150,7 @@ You can use a different key or move the call to a composable to ensure the optio
       if (keyChanging) {
         return;
       }
-      asyncData._execute({ cause: "watch", dedupe: options.dedupe });
+      nuxtApp._asyncData[key.value]?._execute({ cause: "watch", dedupe: options.dedupe });
     }) : () => {
     };
     if (hasScope) {
@@ -352,11 +352,12 @@ 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([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"));
@@ -365,7 +366,7 @@ function createAsyncData(nuxtApp, key, _handler, options, initialCachedData) {
             mergedSignal.addEventListener("abort", () => {
               const reason = mergedSignal.reason;
               reject(reason instanceof Error ? reason : new DOMException(String(reason ?? "Aborted"), "AbortError"));
-            }, { once: true });
+            }, { once: true, signal: cleanupController.signal });
             return Promise.resolve(handler(nuxtApp, { signal: mergedSignal })).then(resolve, reject);
           } catch (err) {
             reject(err);
@@ -390,14 +391,14 @@ function createAsyncData(nuxtApp, key, _handler, options, initialCachedData) {
         asyncData.status.value = "success";
       }).catch((error) => {
         if (nuxtApp._asyncDataPromises[key] && nuxtApp._asyncDataPromises[key] !== promise) {
-          return;
+          return nuxtApp._asyncDataPromises[key];
         }
         if (asyncData._abortController?.signal.aborted) {
-          return;
+          return nuxtApp._asyncDataPromises[key];
         }
         if (typeof DOMException !== "undefined" && error instanceof DOMException && error.name === "AbortError") {
           asyncData.status.value = "idle";
-          return;
+          return nuxtApp._asyncDataPromises[key];
         }
         asyncData.error.value = createError(error);
         asyncData.data.value = unref(options.default());
@@ -406,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;
@@ -450,7 +452,7 @@ function createHash(_handler, options) {
     getCachedData: options.getCachedData ? hash(options.getCachedData) : void 0
   };
 }
-function mergeAbortSignals(signals, timeout) {
+function mergeAbortSignals(signals, cleanupSignal, timeout) {
   const list = signals.filter((s) => !!s);
   if (typeof timeout === "number" && timeout >= 0) {
     const timeoutSignal = AbortSignal.timeout?.(timeout);
@@ -483,7 +485,7 @@ function mergeAbortSignals(signals, timeout) {
     }
   };
   for (const sig of list) {
-    sig.addEventListener?.("abort", onAbort, { once: true });
+    sig.addEventListener?.("abort", onAbort, { once: true, signal: cleanupSignal });
   }
   return controller.signal;
 }

package/dist/app/composables/fetch.js

@@ -85,7 +85,7 @@ function generateOptionSegments(opts) {
     toValue(opts.method)?.toUpperCase() || "GET",
     toValue(opts.baseURL)
   ];
-  for (const _obj of [opts.params || opts.query]) {
+  for (const _obj of [opts.query || opts.params]) {
     const obj = toValue(_obj);
     if (!obj) {
       continue;

package/dist/app/composables/once.js

@@ -1,5 +1,6 @@
 import { useRouter } from "./router.js";
 import { useNuxtApp } from "../nuxt.js";
+let _isHmrUpdating = false;
 export async function callOnce(...args) {
   const autoKey = typeof args[args.length - 1] === "string" ? args.pop() : void 0;
   if (typeof args[0] !== "string") {
@@ -24,7 +25,9 @@ export async function callOnce(...args) {
     cleanups.push(nuxtApp.hooks.hook("page:start", callback), useRouter().beforeResolve(callback));
   }
   if (nuxtApp.payload.once.has(_key)) {
-    return;
+    if (!import.meta.dev || !_isHmrUpdating) {
+      return;
+    }
   }
   nuxtApp._once ||= {};
   nuxtApp._once[_key] ||= fn() || true;
@@ -32,3 +35,15 @@ export async function callOnce(...args) {
   nuxtApp.payload.once.add(_key);
   delete nuxtApp._once[_key];
 }
+if (import.meta.hot) {
+  import.meta.hot.on("vite:beforeUpdate", (payload) => {
+    if (payload.updates.some((u) => u.type === "js-update")) {
+      _isHmrUpdating = true;
+    }
+  });
+  import.meta.hot.on("vite:afterUpdate", (payload) => {
+    if (payload.updates.some((u) => u.type === "js-update")) {
+      _isHmrUpdating = false;
+    }
+  });
+}

package/dist/app/composables/router.js

@@ -12,7 +12,7 @@ export const useRoute = () => {
   if (import.meta.dev && !getCurrentInstance() && isProcessingMiddleware()) {
     const middleware = useNuxtApp()._processingMiddleware;
     const trace = getUserTrace().map(({ source, line, column }) => `at ${source}:${line}:${column}`).join("\n");
-    console.warn(`[nuxt] \`useRoute\` was called within middleware${typeof middleware === "string" ? ` (\`${middleware}\`)` : ""}. This may lead to misleading results. Instead, use the (to, from) arguments passed to the middleware to access the new and old routes. Learn more: https://nuxt.com/docs/4.x/guide/directory-structure/app/middleware#accessing-route-in-middleware` + ("\n" + trace));
+    console.warn(`[nuxt] \`useRoute\` was called within middleware${typeof middleware === "string" ? ` (\`${middleware}\`)` : ""}. This may lead to misleading results. Instead, use the (to, from) arguments passed to the middleware to access the new and old routes. Learn more: https://nuxt.com/docs/4.x/directory-structure/app/middleware#accessing-route-in-middleware` + ("\n" + trace));
   }
   if (hasInjectionContext()) {
     return inject(PageRouteSymbol, useNuxtApp()._route);

package/dist/app/entry.async.d.ts

@@ -1,3 +1,3 @@
-import type { CreateOptions } from './nuxt.js';
-declare const entry: (ctx?: CreateOptions["ssrContext"]) => Promise<any>;
+import type { Entry } from './entry.js';
+declare const entry: Entry | (() => Promise<Entry>);
 export default entry;

package/dist/app/entry.d.ts

@@ -1,7 +1,8 @@
 import type { App } from 'vue';
 import '#build/fetch.mjs';
 import '#build/global-polyfills.mjs';
-import type { CreateOptions } from './nuxt.js';
+import type { NuxtSSRContext } from './nuxt.js';
 import '#build/css';
-declare const _default: (ssrContext?: CreateOptions["ssrContext"]) => Promise<App<Element>>;
+export type Entry = (ssrContext?: NuxtSSRContext) => Promise<App<Element>>;
+declare const _default: Entry;
 export default _default;

package/dist/app/entry.js

@@ -75,4 +75,4 @@ if (import.meta.client) {
     throw error;
   });
 }
-export default (ssrContext) => entry(ssrContext);
+export default ((ssrContext) => entry(ssrContext));

package/dist/app/nuxt.d.ts

@@ -1,6 +1,7 @@
 import type { App, EffectScope, Ref, VNode, onErrorCaptured } from 'vue';
 import type { RouteLocationNormalizedLoaded } from 'vue-router';
 import type { Hookable } from 'hookable';
+import type { UseContext } from 'unctx';
 import type { SSRContext, createRenderer } from 'vue-bundle-renderer/runtime';
 import type { EventHandlerRequest, H3Event } from 'h3';
 import type { RenderResponse } from 'nitropack/types';
@@ -15,7 +16,7 @@ import type { NuxtAppManifestMeta } from './composables/manifest.js';
 import type { LoadingIndicator } from './composables/loading-indicator.js';
 import type { RouteAnnouncer } from './composables/route-announcer.js';
 import type { AppConfig, AppConfigInput, RuntimeConfig } from 'nuxt/schema';
-export declare function getNuxtAppCtx(id?: any): import("unctx/index").UseContext<NuxtApp>;
+export declare function getNuxtAppCtx(id?: string): UseContext<NuxtApp>;
 type HookResult = Promise<void> | void;
 type AppRenderedContext = {
     ssrContext: NuxtApp['ssrContext'];
@@ -148,7 +149,9 @@ interface _NuxtApp {
     /** @internal */
     _appConfig: AppConfig;
     /** @internal */
-    _route: RouteLocationNormalizedLoaded;
+    _route: RouteLocationNormalizedLoaded & {
+        sync?: () => void;
+    };
     /** @internal */
     _islandPromises?: Record<string, Promise<any>>;
     /** @internal */
@@ -240,14 +243,14 @@ export declare function applyPlugins(nuxtApp: NuxtApp, plugins: Array<Plugin & O
 export declare function defineNuxtPlugin<T extends Record<string, unknown>>(plugin: Plugin<T> | ObjectPlugin<T>): Plugin<T> & ObjectPlugin<T>;
 export declare const definePayloadPlugin: typeof defineNuxtPlugin;
 /** @since 3.0.0 */
-export declare function isNuxtPlugin(plugin: unknown): plugin is Function & Record<"__nuxt_plugin", unknown>;
+export declare function isNuxtPlugin(plugin: unknown): plugin is Plugin;
 /**
  * Ensures that the setup function passed in has access to the Nuxt instance via `useNuxtApp`.
  * @param nuxt A Nuxt instance
  * @param setup The function to call
  * @since 3.0.0
  */
-export declare function callWithNuxt<T extends (...args: any[]) => any>(nuxt: NuxtApp | _NuxtApp, setup: T, args?: Parameters<T>): ReturnType<T> | Promise<ReturnType<T>>;
+export declare function callWithNuxt<T extends (...args: any[]) => any>(nuxt: NuxtApp | _NuxtApp, setup: T, args?: Parameters<T>): Promise<ReturnType<T>>;
 /**
  * Returns the current Nuxt instance.
  *

package/dist/app/utils.d.ts

@@ -1,13 +1,10 @@
 /** @since 3.9.0 */
 export declare function toArray<T>(value: T | T[]): T[];
-export declare function getUserTrace(): {
+type Trace = {
     source: string;
-    column?: number;
-    function?: string;
     line?: number;
-}[];
-export declare function getUserCaller(): {
-    source: string;
-    line: number | undefined;
-    column: number | undefined;
-} | null;
+    column?: number;
+};
+export declare function getUserTrace(): Trace[];
+export declare function getUserCaller(): Trace | null;
+export {};

package/dist/index.d.mts

@@ -4,6 +4,6 @@ import { NuxtOptions, Nuxt } from 'nuxt/schema';
 declare function createNuxt(options: NuxtOptions): Nuxt;
 declare function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt>;
 
-declare function build(nuxt: Nuxt): Promise<any>;
+declare function build(nuxt: Nuxt): Promise<void>;
 
 export { build, createNuxt, loadNuxt };

package/dist/index.d.ts

@@ -4,6 +4,6 @@ import { NuxtOptions, Nuxt } from 'nuxt/schema';
 declare function createNuxt(options: NuxtOptions): Nuxt;
 declare function loadNuxt(opts: LoadNuxtOptions): Promise<Nuxt>;
 
-declare function build(nuxt: Nuxt): Promise<any>;
+declare function build(nuxt: Nuxt): Promise<void>;
 
 export { build, createNuxt, loadNuxt };