nuxt-nightly 4.1.3-29323687.53d177a2 → 4.1.3-29323971.d6df732e

package/dist/app/composables/asyncData.js

@@ -1,4 +1,4 @@
-import { computed, getCurrentInstance, getCurrentScope, inject, isShallow, nextTick, onBeforeMount, onScopeDispose, onServerPrefetch, onUnmounted, ref, shallowRef, toRef, toValue, unref, watch } from "vue";
+import { computed, getCurrentInstance, getCurrentScope, inject, isShallow, nextTick, onBeforeMount, onScopeDispose, onServerPrefetch, onUnmounted, queuePostFlushCb, ref, shallowRef, toRef, toValue, unref, watch } from "vue";
 import { debounce } from "perfect-debounce";
 import { hash } from "ohash";
 import { useNuxtApp } from "../nuxt.js";
@@ -13,6 +13,7 @@ export function useAsyncData(...args) {
     args.unshift(autoKey);
   }
   let [_key, _handler, options = {}] = args;
+  let keyChanging = false;
   const key = computed(() => toValue(_key));
   if (typeof key.value !== "string") {
     throw new TypeError("[nuxt] [useAsyncData] key must be a string.");
@@ -116,36 +117,43 @@ You can use a different key or move the call to a composable to ensure the optio
     const hasScope = getCurrentScope();
     const unsubKeyWatcher = watch(key, (newKey, oldKey) => {
       if ((newKey || oldKey) && newKey !== oldKey) {
-        const hasRun = nuxtApp._asyncData[oldKey]?.data.value !== void 0;
-        const isRunning = nuxtApp._asyncDataPromises[oldKey] !== void 0;
-        if (oldKey) {
-          unregister(oldKey);
-        }
+        keyChanging = true;
+        const hadData = nuxtApp._asyncData[oldKey]?.data.value !== void 0;
+        const wasRunning = nuxtApp._asyncDataPromises[oldKey] !== void 0;
         const initialFetchOptions2 = { cause: "initial", dedupe: options.dedupe };
         if (!nuxtApp._asyncData[newKey]?._init) {
-          let value;
-          if (oldKey && hasRun) {
-            value = nuxtApp._asyncData[oldKey]?.data.value;
+          let initialValue;
+          if (oldKey && hadData) {
+            initialValue = nuxtApp._asyncData[oldKey].data.value;
           } else {
-            value = options.getCachedData(newKey, nuxtApp, { cause: "initial" });
-            initialFetchOptions2.cachedData = value;
+            initialValue = options.getCachedData(newKey, nuxtApp, { cause: "initial" });
+            initialFetchOptions2.cachedData = initialValue;
           }
-          nuxtApp._asyncData[newKey] = createAsyncData(nuxtApp, newKey, _handler, options, value);
+          nuxtApp._asyncData[newKey] = createAsyncData(nuxtApp, newKey, _handler, options, initialValue);
         }
         nuxtApp._asyncData[newKey]._deps++;
-        if (options.immediate || hasRun || isRunning) {
+        if (oldKey) {
+          unregister(oldKey);
+        }
+        if (options.immediate || hadData || wasRunning) {
           nuxtApp._asyncData[newKey].execute(initialFetchOptions2);
         }
+        queuePostFlushCb(() => {
+          keyChanging = false;
+        });
       }
     }, { flush: "sync" });
-    const unsubWatcher = options.watch ? watch(options.watch, () => {
+    const unsubParamsWatcher = options.watch ? watch(options.watch, () => {
+      if (keyChanging) {
+        return;
+      }
       asyncData._execute({ cause: "watch", dedupe: options.dedupe });
     }) : () => {
     };
     if (hasScope) {
       onScopeDispose(() => {
         unsubKeyWatcher();
-        unsubWatcher();
+        unsubParamsWatcher();
         unregister(key.value);
       });
     }

package/dist/index.mjs

@@ -3830,7 +3830,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.3-29323687.53d177a2";
+const version = "4.1.3-29323971.d6df732e";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];
@@ -6485,7 +6485,7 @@ const middlewareTemplate = {
       ] : [
         `const _globalMiddleware = ${genObjectFromRawEntries(globalMiddleware.map((mw) => [reverseResolveAlias(mw.path, alias).pop() || mw.path, genSafeVariableName(mw.name)]))}`,
         `for (const path in _globalMiddleware) {`,
-        `  Object.defineProperty(_globalMiddleware[path], '_path', { value: path })`,
+        `  Object.defineProperty(_globalMiddleware[path], '_path', { value: path, configurable: true })`,
         `}`,
         `export const globalMiddleware = Object.values(_globalMiddleware)`,
         `const _namedMiddleware = ${genArrayFromRaw(namedMiddleware.map((mw) => ({
@@ -6496,7 +6496,7 @@ const middlewareTemplate = {
         `for (const mw of _namedMiddleware) {`,
         `  const i = mw.import`,
         `  mw.import = () => i().then(r => {`,
-        `    Object.defineProperty(r.default || r, '_path', { value: mw.path })`,
+        `    Object.defineProperty(r.default || r, '_path', { value: mw.path, configurable: true })`,
         `    return r`,
         `  })`,
         `}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.3-29323687.53d177a2",
+  "version": "4.1.3-29323971.d6df732e",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,10 +67,10 @@
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devalue": "^2.0.2",
     "@nuxt/devtools": "^2.6.3",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.3-29323687.53d177a2",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.3-29323687.53d177a2",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.3-29323971.d6df732e",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.3-29323971.d6df732e",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.3-29323687.53d177a2",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.3-29323971.d6df732e",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.21",
     "c12": "^3.3.0",