nuxt-nightly 4.1.2-29293784.656066cd → 4.1.2-29293810.0dcc386e

package/dist/app/composables/asyncData.js

@@ -114,7 +114,7 @@ You can use a different key or move the call to a composable to ensure the optio
       initialFetch();
     }
     const hasScope = getCurrentScope();
-    const unsubExecute = watch([key, ...options.watch || []], ([newKey], [oldKey]) => {
+    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;
@@ -136,13 +136,16 @@ You can use a different key or move the call to a composable to ensure the optio
         if (options.immediate || hasRun || isRunning) {
           nuxtApp._asyncData[newKey].execute(initialFetchOptions2);
         }
-      } else {
-        asyncData._execute({ cause: "watch", dedupe: options.dedupe });
       }
     }, { flush: "sync" });
+    const unsubWatcher = options.watch ? watch(options.watch, () => {
+      asyncData._execute({ cause: "watch", dedupe: options.dedupe });
+    }) : () => {
+    };
     if (hasScope) {
       onScopeDispose(() => {
-        unsubExecute();
+        unsubKeyWatcher();
+        unsubWatcher();
         unregister(key.value);
       });
     }

package/dist/index.mjs

@@ -3650,26 +3650,11 @@ const importsModule = defineNuxtModule({
     virtualImports: ["#imports"],
     polyfills: true
   }),
-  async setup(options, nuxt) {
+  setup(options, nuxt) {
     const presets = JSON.parse(JSON.stringify(options.presets));
     if (options.polyfills) {
       presets.push(...appCompatPresets);
     }
-    await nuxt.callHook("imports:sources", presets);
-    const { addons: inlineAddons, ...rest } = options;
-    const [addons, addonsOptions] = Array.isArray(inlineAddons) ? [inlineAddons] : [[], inlineAddons];
-    const ctx = createUnimport({
-      injectAtEnd: true,
-      ...rest,
-      addons: {
-        addons,
-        vueTemplate: options.autoImport,
-        vueDirectives: options.autoImport === false ? void 0 : true,
-        ...addonsOptions
-      },
-      presets
-    });
-    await nuxt.callHook("imports:context", ctx);
     let composablesDirs = [];
     if (options.scan) {
       for (const layer of nuxt.options._layers) {
@@ -3683,14 +3668,15 @@ const importsModule = defineNuxtModule({
           resolve(layer.config.rootDir, layer.config.dir?.shared ?? "shared", "types")
         );
         for (const dir of layer.config.imports?.dirs ?? []) {
-          if (!dir) {
-            continue;
+          if (dir) {
+            composablesDirs.push(resolve(layer.config.srcDir, dir));
           }
-          composablesDirs.push(resolve(layer.config.srcDir, dir));
         }
       }
-      await nuxt.callHook("imports:dirs", composablesDirs);
-      composablesDirs = composablesDirs.map((dir) => normalize(dir));
+      nuxt.hook("modules:done", async () => {
+        await nuxt.callHook("imports:dirs", composablesDirs);
+        composablesDirs = composablesDirs.map((dir) => normalize(dir));
+      });
       nuxt.hook("builder:watch", (event, relativePath) => {
         if (!["addDir", "unlinkDir"].includes(event)) {
           return;
@@ -3702,12 +3688,34 @@ const importsModule = defineNuxtModule({
         }
       });
     }
+    let ctx;
+    nuxt.hook("modules:done", async () => {
+      await nuxt.callHook("imports:sources", presets);
+      const { addons: inlineAddons, ...rest } = options;
+      const [addons, addonsOptions] = Array.isArray(inlineAddons) ? [inlineAddons] : [[], inlineAddons];
+      ctx = createUnimport({
+        injectAtEnd: true,
+        ...rest,
+        addons: {
+          addons,
+          vueTemplate: options.autoImport,
+          vueDirectives: options.autoImport === false ? void 0 : true,
+          ...addonsOptions
+        },
+        presets
+      });
+      await nuxt.callHook("imports:context", ctx);
+    });
     addTemplate({
       filename: "imports.mjs",
       getContents: async () => toExports(await ctx.getImports()) + '\nif (import.meta.dev) { console.warn("[nuxt] `#imports` should be transformed with real imports. There seems to be something wrong with the imports plugin.") }'
     });
     nuxt.options.alias["#imports"] = join(nuxt.options.buildDir, "imports");
-    addBuildPlugin(TransformPlugin({ ctx, options, sourcemap: !!nuxt.options.sourcemap.server || !!nuxt.options.sourcemap.client }));
+    addBuildPlugin(TransformPlugin({
+      ctx: { injectImports: (code, id, options2) => ctx.injectImports(code, id, options2) },
+      options,
+      sourcemap: !!nuxt.options.sourcemap.server || !!nuxt.options.sourcemap.client
+    }));
     const priorities = getLayerDirectories(nuxt).map((dirs, i) => [dirs.app, -i]).sort(([a], [b]) => b.length - a.length);
     const IMPORTS_TEMPLATE_RE = /\/imports\.(?:d\.ts|mjs)$/;
     function isImportsTemplate(template) {
@@ -3744,8 +3752,11 @@ const importsModule = defineNuxtModule({
         filter: isImportsTemplate
       });
     };
-    await regenerateImports();
-    addDeclarationTemplates(ctx, options);
+    nuxt.hook("modules:done", () => regenerateImports());
+    addDeclarationTemplates({
+      generateTypeDeclarations: (options2) => ctx.generateTypeDeclarations(options2),
+      getImports: () => ctx.getImports()
+    }, options);
     nuxt.hook("builder:watch", async (_, relativePath) => {
       const path = resolve(nuxt.options.srcDir, relativePath);
       if (options.scan && composablesDirs.some((dir) => dir === path || path.startsWith(dir + "/"))) {
@@ -3811,7 +3822,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.2-29293784.656066cd";
+const version = "4.1.2-29293810.0dcc386e";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.2-29293784.656066cd",
+  "version": "4.1.2-29293810.0dcc386e",
   "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.2-29293784.656066cd",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.2-29293784.656066cd",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.2-29293810.0dcc386e",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.2-29293810.0dcc386e",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.2-29293784.656066cd",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.2-29293810.0dcc386e",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.21",
     "c12": "^3.2.0",