nuxt-nightly 4.1.3-29329120.ce0fe6f6 → 4.1.3-29329366.5eb356e7

package/dist/app/composables/asyncData.js

@@ -56,14 +56,17 @@ ${warnings.map((w) => `- ${w}`).join("\n")}
 You can use a different key or move the call to a composable to ensure the options are shared across calls.`);
     }
   }
-  const initialFetchOptions = { 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 = { 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;
   if (import.meta.server && fetchOnServer && options.immediate) {
     const promise = initialFetch();
@@ -120,14 +123,14 @@ You can use a different key or move the call to a composable to ensure the optio
         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 };
+        const initialFetchOptions = { cause: "initial", dedupe: options.dedupe };
         if (!nuxtApp._asyncData[newKey]?._init) {
           let initialValue;
           if (oldKey && hadData) {
             initialValue = nuxtApp._asyncData[oldKey].data.value;
           } else {
             initialValue = options.getCachedData(newKey, nuxtApp, { cause: "initial" });
-            initialFetchOptions2.cachedData = initialValue;
+            initialFetchOptions.cachedData = initialValue;
           }
           nuxtApp._asyncData[newKey] = createAsyncData(nuxtApp, newKey, _handler, options, initialValue);
         }
@@ -136,7 +139,7 @@ You can use a different key or move the call to a composable to ensure the optio
           unregister(oldKey);
         }
         if (options.immediate || hadData || wasRunning) {
-          nuxtApp._asyncData[newKey].execute(initialFetchOptions2);
+          nuxtApp._asyncData[newKey].execute(initialFetchOptions);
         }
         queuePostFlushCb(() => {
           keyChanging = false;
@@ -163,8 +166,14 @@ You can use a different key or move the call to a composable to ensure the optio
     pending: writableComputedRef(() => nuxtApp._asyncData[key.value]?.pending),
     status: writableComputedRef(() => nuxtApp._asyncData[key.value]?.status),
     error: writableComputedRef(() => nuxtApp._asyncData[key.value]?.error),
-    refresh: (...args2) => nuxtApp._asyncData[key.value].execute(...args2),
-    execute: (...args2) => nuxtApp._asyncData[key.value].execute(...args2),
+    refresh: (...args2) => {
+      if (!nuxtApp._asyncData[key.value]?._init) {
+        const initialFetch2 = createInitialFetch();
+        return initialFetch2();
+      }
+      return nuxtApp._asyncData[key.value].execute(...args2);
+    },
+    execute: (...args2) => asyncReturn.refresh(...args2),
     clear: () => clearNuxtDataByKey(nuxtApp, key.value)
   };
   const asyncDataPromise = Promise.resolve(nuxtApp._asyncDataPromises[key.value]).then(() => asyncReturn);

package/dist/index.mjs

@@ -3548,7 +3548,7 @@ const componentsModule = defineNuxtModule({
           }
         }
       }, { server: false });
-      addBuildPlugin(IslandsTransformPlugin({ getComponents, selectiveClient }), { client: false });
+      addBuildPlugin(IslandsTransformPlugin({ getComponents, selectiveClient }), { client: false, prepend: true });
       if (selectiveClient && nuxt.options.builder === "@nuxt/vite-builder") {
         addVitePlugin(() => ComponentsChunkPlugin({ dev: nuxt.options.dev, getComponents }));
       } else {
@@ -3830,7 +3830,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.3-29329120.ce0fe6f6";
+const version = "4.1.3-29329366.5eb356e7";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];
@@ -4551,18 +4551,13 @@ async function initNitro(nuxt) {
     return nuxt.callHook("prerender:routes", { routes });
   });
   if (nuxt.options.vue.runtimeCompiler) {
-    nuxt.hook("vite:extendConfig", (config, { isClient }) => {
-      if (isClient) {
-        if (Array.isArray(config.resolve.alias)) {
-          config.resolve.alias.push({
-            find: "vue",
-            replacement: "vue/dist/vue.esm-bundler"
-          });
-        } else {
-          config.resolve.alias = {
-            ...config.resolve.alias,
-            vue: "vue/dist/vue.esm-bundler"
-          };
+    addVitePlugin({
+      name: "nuxt:vue:runtime-compiler",
+      applyToEnvironment: (environment) => environment.name === "client",
+      enforce: "pre",
+      resolveId(id, importer) {
+        if (id === "vue") {
+          return this.resolve("vue/dist/vue.esm-bundler", importer, { skipSelf: true });
         }
       }
     });
@@ -5200,24 +5195,24 @@ function detectImportNames(code, composableMeta) {
 const VIRTUAL_RE = /^\0?virtual:(?:nuxt:)?/;
 function ResolveDeepImportsPlugin(nuxt) {
   const exclude = ["virtual:", "\0virtual:", "/__skip_vite", "@vitest/"];
-  let conditions;
+  const conditions = {};
+  function resolveConditions(environment) {
+    const resolvedConditions = /* @__PURE__ */ new Set([nuxt.options.dev ? "development" : "production", ...environment.config.resolve.conditions]);
+    if (resolvedConditions.has("browser")) {
+      resolvedConditions.add("web");
+      resolvedConditions.add("import");
+      resolvedConditions.add("module");
+      resolvedConditions.add("default");
+    }
+    if (environment.config.mode === "test") {
+      resolvedConditions.add("import");
+      resolvedConditions.add("require");
+    }
+    return [...resolvedConditions];
+  }
   return {
     name: "nuxt:resolve-bare-imports",
     enforce: "post",
-    configResolved(config) {
-      const resolvedConditions = /* @__PURE__ */ new Set([nuxt.options.dev ? "development" : "production", ...config.resolve.conditions]);
-      if (resolvedConditions.has("browser")) {
-        resolvedConditions.add("web");
-        resolvedConditions.add("import");
-        resolvedConditions.add("module");
-        resolvedConditions.add("default");
-      }
-      if (config.mode === "test") {
-        resolvedConditions.add("import");
-        resolvedConditions.add("require");
-      }
-      conditions = [...resolvedConditions];
-    },
     async resolveId(id, importer) {
       if (!importer || isAbsolute(id) || !isAbsolute(importer) && !VIRTUAL_RE.test(importer) || exclude.some((e) => id.startsWith(e))) {
         return;
@@ -5239,10 +5234,11 @@ function ResolveDeepImportsPlugin(nuxt) {
       if (res !== void 0 && res !== null) {
         return res;
       }
+      const environmentConditions = conditions[this.environment.name] ||= resolveConditions(this.environment);
       const path = resolveModulePath(id, {
         from: [dir, ...nuxt.options.modulesDir].map((d) => directoryToURL(d)),
         suffixes: ["", "index"],
-        conditions,
+        conditions: environmentConditions,
         try: true
       });
       if (!path) {
@@ -5276,28 +5272,31 @@ const runtimeDependencies = [
 
 function ResolveExternalsPlugin(nuxt) {
   let external = /* @__PURE__ */ new Set();
+  const nitro = useNitro();
   return {
     name: "nuxt:resolve-externals",
     enforce: "pre",
-    async configResolved() {
-      if (!nuxt.options.dev) {
-        const { runtimeDependencies: runtimeNitroDependencies = [] } = await tryImportModule("nitropack/runtime/meta", {
-          url: new URL(import.meta.url)
-        }) || {};
-        external = /* @__PURE__ */ new Set([
-          // explicit dependencies we use in our ssr renderer - these can be inlined (if necessary) in the nitro build
-          "unhead",
-          "@unhead/vue",
-          "@nuxt/devalue",
-          "rou3",
-          "unstorage",
-          // ensure we only have one version of vue if nitro is going to inline anyway
-          ...nuxt._nitro.options.inlineDynamicImports ? ["vue", "@vue/server-renderer"] : [],
-          ...runtimeDependencies,
-          // dependencies we might share with nitro - these can be inlined (if necessary) in the nitro build
-          ...runtimeNitroDependencies
-        ]);
+    async applyToEnvironment(environment) {
+      if (nuxt.options.dev || environment.name !== "ssr") {
+        return false;
       }
+      const { runtimeDependencies: runtimeNitroDependencies = [] } = await tryImportModule("nitropack/runtime/meta", {
+        url: new URL(import.meta.url)
+      }) || {};
+      external = /* @__PURE__ */ new Set([
+        // explicit dependencies we use in our ssr renderer - these can be inlined (if necessary) in the nitro build
+        "unhead",
+        "@unhead/vue",
+        "@nuxt/devalue",
+        "rou3",
+        "unstorage",
+        // ensure we only have one version of vue if nitro is going to inline anyway
+        ...nitro.options.inlineDynamicImports ? ["vue", "@vue/server-renderer"] : [],
+        ...runtimeDependencies,
+        // dependencies we might share with nitro - these can be inlined (if necessary) in the nitro build
+        ...runtimeNitroDependencies
+      ]);
+      return true;
     },
     async resolveId(id, importer) {
       if (!external.has(id)) {
@@ -5667,9 +5666,8 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
   addVitePlugin(() => Object.assign(ImpoundPlugin.vite({ ...nuxtProtectionConfig, error: false }), { name: "nuxt:import-protection" }), { client: false });
   addVitePlugin(() => Object.assign(ImpoundPlugin.vite({ ...nuxtProtectionConfig, error: true }), { name: "nuxt:import-protection" }), { server: false });
   addWebpackPlugin(() => ImpoundPlugin.webpack(nuxtProtectionConfig));
-  addVitePlugin(() => ResolveDeepImportsPlugin(nuxt), { client: false });
-  addVitePlugin(() => ResolveDeepImportsPlugin(nuxt), { server: false });
-  addVitePlugin(() => ResolveExternalsPlugin(nuxt), { client: false, prepend: true });
+  addVitePlugin(() => ResolveDeepImportsPlugin(nuxt));
+  addVitePlugin(() => ResolveExternalsPlugin(nuxt), { prepend: true });
   addBuildPlugin(PrehydrateTransformPlugin({ sourcemap: !!nuxt.options.sourcemap.server || !!nuxt.options.sourcemap.client }));
   if (nuxt.options.experimental.localLayerAliases) {
     addBuildPlugin(LayerAliasingPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.3-29329120.ce0fe6f6",
+  "version": "4.1.3-29329366.5eb356e7",
   "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.5",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.3-29329120.ce0fe6f6",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.3-29329120.ce0fe6f6",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.3-29329366.5eb356e7",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.3-29329366.5eb356e7",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.3-29329120.ce0fe6f6",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.3-29329366.5eb356e7",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.22",
     "c12": "^3.3.0",