nuxt-nightly 4.2.0-29333853.4751a6ac → 4.2.0-29334442.191bcb7e

package/dist/index.mjs

@@ -2348,8 +2348,7 @@ async function scanComponents(dirs, srcDir) {
         preload: Boolean(dir.preload),
         // specific to the file
         filePath,
-        // Use declarationPath from directory config if available, otherwise default to filePath
-        declarationPath: dir.declarationPath || filePath,
+        declarationPath: filePath,
         pascalName,
         kebabName,
         chunkName,
@@ -2538,7 +2537,7 @@ function findComponent(components, name, mode) {
   return otherModeComponent;
 }
 
-const SCRIPT_RE$2 = /<script[^>]*>/i;
+const SCRIPT_RE$3 = /<script[^>]*>/i;
 const SCRIPT_RE_GLOBAL = /<script[^>]*>/gi;
 const HAS_SLOT_OR_CLIENT_RE = /<slot[^>]*>|nuxt-client/;
 const TEMPLATE_RE$1 = /<template>[\s\S]*<\/template>/;
@@ -2581,7 +2580,7 @@ const IslandsTransformPlugin = (options) => createUnplugin((_options, meta) => {
         }
         const startingIndex = template.index || 0;
         const s = new MagicString(code);
-        if (!SCRIPT_RE$2.test(code)) {
+        if (!SCRIPT_RE$3.test(code)) {
           s.prepend("<script setup>" + IMPORT_CODE + "<\/script>");
         } else {
           s.replace(SCRIPT_RE_GLOBAL, (full) => {
@@ -3133,7 +3132,7 @@ const ComponentNamePlugin = (options) => createUnplugin(() => {
   };
 });
 
-const SCRIPT_RE$1 = /(?<=<script[^>]*>)[\s\S]*?(?=<\/script>)/gi;
+const SCRIPT_RE$2 = /(?<=<script[^>]*>)[\s\S]*?(?=<\/script>)/gi;
 const TEMPLATE_RE = /<template>([\s\S]*)<\/template>/;
 const hydrationStrategyMap = {
   hydrateOnIdle: "Idle",
@@ -3173,7 +3172,7 @@ const LazyHydrationTransformPlugin = (options) => createUnplugin(() => {
         try {
           const ast = parse(template);
           const scopeTracker = new ScopeTracker({ preserveExitedScopes: true });
-          for (const { 0: script } of code.matchAll(SCRIPT_RE$1)) {
+          for (const { 0: script } of code.matchAll(SCRIPT_RE$2)) {
             if (!script) {
               continue;
             }
@@ -3832,7 +3831,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.2.0-29333853.4751a6ac";
+const version = "4.2.0-29334442.191bcb7e";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];
@@ -5064,8 +5063,8 @@ const AsyncContextInjectionPlugin = (nuxt) => createUnplugin(() => {
 
 const stringTypes = ["Literal", "TemplateLiteral"];
 const NUXT_LIB_RE = /node_modules\/(?:nuxt|nuxt3|nuxt-nightly)\//;
-const SUPPORTED_EXT_RE = /\.(?:m?[jt]sx?|vue)/;
-const SCRIPT_RE = /(?<=<script[^>]*>)[\s\S]*?(?=<\/script>)/i;
+const SUPPORTED_EXT_RE$1 = /\.(?:m?[jt]sx?|vue)/;
+const SCRIPT_RE$1 = /(?<=<script[^>]*>)[\s\S]*?(?=<\/script>)/i;
 const ComposableKeysPlugin = (options) => createUnplugin(() => {
   const composableMeta = {};
   const composableLengths = /* @__PURE__ */ new Set();
@@ -5082,14 +5081,14 @@ const ComposableKeysPlugin = (options) => createUnplugin(() => {
     enforce: "post",
     transformInclude(id) {
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
-      return !NUXT_LIB_RE.test(pathname) && SUPPORTED_EXT_RE.test(pathname) && parseQuery(search).type !== "style" && !parseQuery(search).macro;
+      return !NUXT_LIB_RE.test(pathname) && SUPPORTED_EXT_RE$1.test(pathname) && parseQuery(search).type !== "style" && !parseQuery(search).macro;
     },
     transform: {
       filter: {
         code: { include: KEYED_FUNCTIONS_RE }
       },
       handler(code, id) {
-        const { 0: script = code, index: codeIndex = 0 } = code.match(SCRIPT_RE) || { index: 0, 0: code };
+        const { 0: script = code, index: codeIndex = 0 } = code.match(SCRIPT_RE$1) || { index: 0, 0: code };
         const s = new MagicString(code);
         let imports;
         let count = 0;
@@ -5382,6 +5381,140 @@ function PrehydrateTransformPlugin(options = {}) {
   }));
 }
 
+const functionsToExtract = /* @__PURE__ */ new Set(["useAsyncData", "useLazyAsyncData"]);
+const FUNCTIONS_RE = /\buse(?:Lazy)?AsyncData\b/;
+const SUPPORTED_EXT_RE = /\.(?:m?[jt]sx?|vue)$/;
+const SCRIPT_RE = /(?<=<script[^>]*>)[\s\S]*?(?=<\/script>)/i;
+const ExtractAsyncDataHandlersPlugin = (options) => createUnplugin(() => {
+  const asyncDatas = {};
+  let count = 0;
+  return {
+    name: "nuxt:extract-async-data-handlers",
+    enforce: "post",
+    resolveId(source) {
+      if (source in asyncDatas) {
+        return source;
+      }
+    },
+    load(id) {
+      if (id in asyncDatas) {
+        return asyncDatas[id];
+      }
+    },
+    transformInclude(id) {
+      const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
+      return SUPPORTED_EXT_RE.test(pathname) && parseQuery(search).type !== "style" && !parseQuery(search).macro;
+    },
+    transform: {
+      filter: {
+        id: {
+          exclude: [/nuxt\/(src|dist)\/app/]
+        },
+        code: { include: FUNCTIONS_RE }
+      },
+      handler(code, id) {
+        const { 0: script = code, index: codeIndex = 0 } = code.match(SCRIPT_RE) || { index: 0, 0: code };
+        let s;
+        const scopeTracker = new ScopeTracker({ preserveExitedScopes: true });
+        const parseResult = parseAndWalk(script, id, { scopeTracker });
+        scopeTracker.freeze();
+        walk(parseResult.program, {
+          scopeTracker,
+          enter(node) {
+            if (node.type !== "CallExpression" || node.callee.type !== "Identifier" || !functionsToExtract.has(node.callee.name)) {
+              return;
+            }
+            const callExpression = node;
+            const fetcherFunction = callExpression.arguments.find((fn) => fn.type === "ArrowFunctionExpression" || fn.type === "FunctionExpression");
+            if (!fetcherFunction || fetcherFunction.type !== "ArrowFunctionExpression" && fetcherFunction.type !== "FunctionExpression" || !fetcherFunction.body) {
+              return;
+            }
+            s ||= new MagicString(code);
+            const referencedVariables = /* @__PURE__ */ new Set();
+            const imports = /* @__PURE__ */ new Set();
+            walk(fetcherFunction.body, {
+              scopeTracker,
+              enter(innerNode, parent) {
+                if (innerNode.type !== "Identifier") {
+                  return;
+                }
+                if (parent) {
+                  if (parent.type === "MemberExpression" && parent.property === innerNode && parent.computed === false) {
+                    return;
+                  }
+                  if (parent.type === "Property" && parent.key === innerNode && parent.computed === false) {
+                    return;
+                  }
+                  if (parent.type === "MethodDefinition" && parent.key === innerNode && parent.computed === false) {
+                    return;
+                  }
+                  if (parent.type === "PropertyDefinition" && parent.key === innerNode && parent.computed === false) {
+                    return;
+                  }
+                }
+                const declaration = scopeTracker.getDeclaration(innerNode.name);
+                if (!declaration) {
+                  return;
+                }
+                if (declaration.type === "Import") {
+                  imports.add(innerNode.name);
+                } else if (declaration.type !== "FunctionParam") {
+                  const functionBodyStart = fetcherFunction.body.start;
+                  const functionBodyEnd = fetcherFunction.body.end;
+                  if (declaration.start < functionBodyStart || declaration.end > functionBodyEnd) {
+                    referencedVariables.add(innerNode.name);
+                  }
+                }
+              }
+            });
+            const importStatements = /* @__PURE__ */ new Set();
+            walk(parseResult.program, {
+              enter(importDecl) {
+                if (importDecl.type !== "ImportDeclaration") {
+                  return;
+                }
+                if (importDecl.specifiers?.some((spec) => spec.local && imports.has(spec.local.name))) {
+                  importStatements.add(script.slice(importDecl.start, importDecl.end));
+                }
+              }
+            });
+            const imps = Array.from(importStatements).join("\n");
+            const key = `${dirname(id)}/async-data-chunk-${count++}.js`;
+            const isBlockStatement = fetcherFunction.body.type === "BlockStatement";
+            const startOffset = codeIndex + fetcherFunction.body.start;
+            const endOffset = codeIndex + fetcherFunction.body.end;
+            const chunk = s.clone();
+            const parameters = [...referencedVariables].join(", ");
+            const returnPrefix = isBlockStatement ? "" : "return ";
+            const preface = `${imps}
+export default async function (${parameters}) { ${returnPrefix}`;
+            const suffix = ` }`;
+            if (isBlockStatement) {
+              chunk.overwrite(0, startOffset + 1, preface);
+              chunk.overwrite(endOffset - 1, code.length, suffix);
+            } else {
+              chunk.overwrite(0, startOffset, preface);
+              chunk.overwrite(endOffset, code.length, suffix);
+            }
+            asyncDatas[key] = {
+              code: chunk.toString(),
+              map: options.sourcemap ? chunk.generateMap({ hires: true }) : void 0
+            };
+            const importCall = `() => import('${key}').then(r => (r.default || r)(${parameters}))`;
+            s.overwrite(codeIndex + fetcherFunction.start, codeIndex + fetcherFunction.end, importCall);
+          }
+        });
+        if (s?.hasChanged()) {
+          return {
+            code: s.toString(),
+            map: options.sourcemap ? s.generateMap({ hires: true }) : void 0
+          };
+        }
+      }
+    }
+  };
+});
+
 const PREFIX = "virtual:nuxt:";
 const PREFIX_RE = /^\/?virtual:nuxt:/;
 const RELATIVE_ID_RE = /^\.{1,2}[\\/]/;
@@ -5710,6 +5843,12 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
     addBuildPlugin(DevOnlyPlugin({
       sourcemap: !!nuxt.options.sourcemap.server || !!nuxt.options.sourcemap.client
     }));
+    if (nuxt.options.experimental.extractAsyncDataHandlers) {
+      addBuildPlugin(ExtractAsyncDataHandlersPlugin({
+        sourcemap: !!nuxt.options.sourcemap.client,
+        rootDir: nuxt.options.rootDir
+      }), { server: false });
+    }
   }
   if (nuxt.options.dev) {
     addPlugin(resolve(nuxt.options.appDir, "plugins/check-if-layout-used"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.2.0-29333853.4751a6ac",
+  "version": "4.2.0-29334442.191bcb7e",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -68,10 +68,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.2.0-29333853.4751a6ac",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29333853.4751a6ac",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.0-29334442.191bcb7e",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29334442.191bcb7e",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.2.0-29333853.4751a6ac",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.2.0-29334442.191bcb7e",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.22",
     "c12": "^3.3.0",