nuxt-nightly 4.3.0-29436426.3cbdaef5 → 4.3.0-29437273.f9c092c5

package/dist/app/components/nuxt-layout.js

@@ -6,6 +6,8 @@ import { LayoutMetaSymbol, PageRouteSymbol } from "./injections.js";
 import { useRoute as useVueRouterRoute } from "#build/pages";
 import layouts from "#build/layouts";
 import { appLayoutTransition as defaultLayoutTransition } from "#build/nuxt.config.mjs";
+import _routeRulesMatcher from "#build/route-rules.mjs";
+const routeRulesMatcher = _routeRulesMatcher;
 const LayoutLoader = defineComponent({
   name: "LayoutLoader",
   inheritAttrs: false,
@@ -37,7 +39,7 @@ export default defineComponent({
     const shouldUseEagerRoute = !injectedRoute || injectedRoute === useRoute();
     const route = shouldUseEagerRoute ? useVueRouterRoute() : injectedRoute;
     const layout = computed(() => {
-      let layout2 = unref(props.name) ?? route?.meta.layout ?? "default";
+      let layout2 = unref(props.name) ?? route?.meta.layout ?? routeRulesMatcher(route?.path).appLayout ?? "default";
       if (layout2 && !(layout2 in layouts)) {
         if (import.meta.dev && layout2 !== "default") {
           console.warn(`Invalid layout \`${layout2}\` selected.`);
@@ -112,7 +114,7 @@ const LayoutProvider = defineComponent({
     const name = props.name;
     if (props.shouldProvide) {
       provide(LayoutMetaSymbol, {
-        isCurrent: (route) => name === (route.meta.layout ?? "default")
+        isCurrent: (route) => name === (route.meta.layout ?? routeRulesMatcher(route.path).appLayout ?? "default")
       });
     }
     const injectedRoute = inject(PageRouteSymbol);

package/dist/app/composables/manifest.js

@@ -1,4 +1,3 @@
-import { defu } from "defu";
 import { useNuxtApp, useRuntimeConfig } from "../nuxt.js";
 import { appManifest as isAppManifestEnabled } from "#build/nuxt.config.mjs";
 import { buildAssetsURL } from "#internal/nuxt/paths";
@@ -37,7 +36,7 @@ export function getAppManifest() {
 export function getRouteRules(arg) {
   const path = typeof arg === "string" ? arg : arg.path;
   try {
-    return defu({}, ...routeRulesMatcher("", path).map((r) => r.data).reverse());
+    return routeRulesMatcher(path);
   } catch (e) {
     console.error("[nuxt] Error matching route rules.", e);
     return {};

package/dist/index.mjs

@@ -3880,7 +3880,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.3.0-29436426.3cbdaef5";
+const version = "4.3.0-29437273.f9c092c5";
 const pkg = {
 	version: version};
 
@@ -5181,6 +5181,30 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
       }
     }
   });
+  addTypeTemplate({
+    filename: "types/nitro-layouts.d.ts",
+    getContents: ({ app }) => {
+      return [
+        `export type LayoutKey = ${Object.keys(app.layouts).map((name) => genString(name)).join(" | ") || "string"}`,
+        "declare module 'nitropack' {",
+        "  interface NitroRouteConfig {",
+        "    appLayout?: LayoutKey | false",
+        "  }",
+        "  interface NitroRouteRules {",
+        "    appLayout?: LayoutKey | false",
+        "  }",
+        "}",
+        "declare module 'nitropack/types' {",
+        "  interface NitroRouteConfig {",
+        "    appLayout?: LayoutKey | false",
+        "  }",
+        "  interface NitroRouteRules {",
+        "    appLayout?: LayoutKey | false",
+        "  }",
+        "}"
+      ].join("\n");
+    }
+  }, { nuxt: true, nitro: true, node: true });
   if (nuxt.options.typescript.builder !== false) {
     const envMap = {
       // defaults from `builder` based on package name

package/dist/pages/runtime/plugins/prerender.server.js

@@ -1,5 +1,4 @@
 import { joinURL } from "ufo";
-import { defu } from "defu";
 import { defineNuxtPlugin } from "#app/nuxt";
 import { prerenderRoutes } from "#app/composables/ssr";
 import _routes from "#build/routes";
@@ -21,7 +20,7 @@ export default defineNuxtPlugin(async () => {
 });
 const OPTIONAL_PARAM_RE = /^\/?:.*(?:\?|\(\.\*\)\*)$/;
 function shouldPrerender(path) {
-  return crawlLinks || defu({}, ...routeRulesMatcher("", path).map((r) => r.data).reverse()).prerender;
+  return crawlLinks || !!routeRulesMatcher(path).prerender;
 }
 function processRoutes(routes2, currentPath = "/", routesToPrerender = /* @__PURE__ */ new Set()) {
   for (const route of routes2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.3.0-29436426.3cbdaef5",
+  "version": "4.3.0-29437273.f9c092c5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,11 +67,11 @@
     "@dxup/nuxt": "^0.3.2",
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devtools": "^3.1.1",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29436426.3cbdaef5",
-    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.3.0-29436426.3cbdaef5",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29436426.3cbdaef5",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29437273.f9c092c5",
+    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.3.0-29437273.f9c092c5",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29437273.f9c092c5",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.3.0-29436426.3cbdaef5",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.3.0-29437273.f9c092c5",
     "@unhead/vue": "^2.0.19",
     "@vue/shared": "^3.5.25",
     "c12": "^3.3.2",