nuxt-nightly 4.3.0-29435873.41a564d2 → 4.3.0-29436247.ecea7a86

package/dist/app/composables/manifest.d.ts

@@ -1,4 +1,3 @@
-import type { MatcherExport } from 'radix3';
 import type { H3Event } from 'h3';
 import type { NitroRouteRules } from 'nitropack/types';
 export interface NuxtAppManifestMeta {
@@ -6,15 +5,14 @@ export interface NuxtAppManifestMeta {
     timestamp: number;
 }
 export interface NuxtAppManifest extends NuxtAppManifestMeta {
-    matcher: MatcherExport;
     prerendered: string[];
 }
 /** @since 3.7.4 */
 export declare function getAppManifest(): Promise<NuxtAppManifest>;
 /** @since 3.7.4 */
-export declare function getRouteRules(event: H3Event): Promise<NitroRouteRules>;
+export declare function getRouteRules(event: H3Event): NitroRouteRules;
 export declare function getRouteRules(options: {
     path: string;
-}): Promise<Record<string, any>>;
+}): Record<string, any>;
 /** @deprecated use `getRouteRules({ path })` instead */
-export declare function getRouteRules(url: string): Promise<Record<string, any>>;
+export declare function getRouteRules(url: string): Record<string, any>;

package/dist/app/composables/manifest.js

@@ -1,10 +1,10 @@
-import { createMatcherFromExport, createRouter as createRadixRouter, toRouteMatcher } from "radix3";
 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";
+import _routeRulesMatcher from "#build/route-rules.mjs";
+const routeRulesMatcher = _routeRulesMatcher;
 let manifest;
-let matcher;
 function fetchManifest() {
   if (!isAppManifestEnabled) {
     throw new Error("[nuxt] app manifest should be enabled with `experimental.appManifest`");
@@ -20,9 +20,7 @@ function fetchManifest() {
       responseType: "json"
     });
   }
-  manifest.then((m) => {
-    matcher = createMatcherFromExport(m.matcher);
-  }).catch((e) => {
+  manifest.catch((e) => {
     console.error("[nuxt] Error fetching app manifest.", e);
   });
   return manifest;
@@ -36,22 +34,10 @@ export function getAppManifest() {
   }
   return manifest || fetchManifest();
 }
-export async function getRouteRules(arg) {
+export function getRouteRules(arg) {
   const path = typeof arg === "string" ? arg : arg.path;
-  if (import.meta.server) {
-    useNuxtApp().ssrContext["~preloadManifest"] = true;
-    const _routeRulesMatcher = toRouteMatcher(
-      createRadixRouter({ routes: useRuntimeConfig().nitro.routeRules })
-    );
-    return defu({}, ..._routeRulesMatcher.matchAll(path).reverse());
-  }
-  await getAppManifest();
-  if (!matcher) {
-    console.error("[nuxt] Error creating app manifest matcher.", matcher);
-    return {};
-  }
   try {
-    return defu({}, ...matcher.matchAll(path).reverse());
+    return defu({}, ...routeRulesMatcher("", path).map((r) => r.data).reverse());
   } catch (e) {
     console.error("[nuxt] Error matching route rules.", e);
     return {};

package/dist/app/composables/payload.js

@@ -82,18 +82,19 @@ async function _importPayload(payloadURL) {
 }
 export async function isPrerendered(url = useRoute().path) {
   const nuxtApp = useNuxtApp();
+  const rules = getRouteRules({ path: url });
+  if (rules.redirect) {
+    return false;
+  }
+  if (rules.prerender) {
+    return true;
+  }
   if (!appManifest) {
     return !!nuxtApp.payload.prerenderedAt;
   }
   url = url === "/" ? url : url.replace(/\/$/, "");
   const manifest = await getAppManifest();
-  if (manifest.prerendered.includes(url)) {
-    return true;
-  }
-  return nuxtApp.runWithContext(async () => {
-    const rules = await getRouteRules({ path: url });
-    return !!rules.prerender && !rules.redirect;
-  });
+  return manifest.prerendered.includes(url);
 }
 let payloadCache = null;
 export async function getNuxtClientPayload() {

package/dist/app/middleware/{manifest-route-rule.js → route-rules.js}

@@ -1,11 +1,11 @@
 import { hasProtocol } from "ufo";
 import { defineNuxtRouteMiddleware } from "../composables/router.js";
 import { getRouteRules } from "../composables/manifest.js";
-export default defineNuxtRouteMiddleware(async (to) => {
+export default defineNuxtRouteMiddleware((to) => {
   if (import.meta.server || import.meta.test) {
     return;
   }
-  const rules = await getRouteRules({ path: to.path });
+  const rules = getRouteRules({ path: to.path });
   if (rules.redirect) {
     const path = rules.redirect.includes("#") ? rules.redirect : rules.redirect + to.hash;
     if (hasProtocol(path, { acceptRelative: true })) {

package/dist/app/plugins/router.js

@@ -6,7 +6,6 @@ import { getRouteRules } from "../composables/manifest.js";
 import { clearError, showError } from "../composables/error.js";
 import { navigateTo } from "../composables/router.js";
 import { globalMiddleware } from "#build/middleware";
-import { appManifest as isAppManifestEnabled } from "#build/nuxt.config.mjs";
 function getRouteFromPath(fullPath) {
   const route = fullPath && typeof fullPath === "object" ? fullPath : {};
   if (typeof fullPath === "object") {
@@ -161,19 +160,17 @@ export default defineNuxtPlugin({
         nuxtApp._processingMiddleware = true;
         if (import.meta.client || !nuxtApp.ssrContext?.islandContext) {
           const middlewareEntries = /* @__PURE__ */ new Set([...globalMiddleware, ...nuxtApp._middleware.global]);
-          if (isAppManifestEnabled) {
-            const routeRules = await nuxtApp.runWithContext(() => getRouteRules({ path: to.path }));
-            if (routeRules.appMiddleware) {
-              for (const key in routeRules.appMiddleware) {
-                const guard = nuxtApp._middleware.named[key];
-                if (!guard) {
-                  return;
-                }
-                if (routeRules.appMiddleware[key]) {
-                  middlewareEntries.add(guard);
-                } else {
-                  middlewareEntries.delete(guard);
-                }
+          const routeRules = getRouteRules({ path: to.path });
+          if (routeRules.appMiddleware) {
+            for (const key in routeRules.appMiddleware) {
+              const guard = nuxtApp._middleware.named[key];
+              if (!guard) {
+                continue;
+              }
+              if (routeRules.appMiddleware[key]) {
+                middlewareEntries.add(guard);
+              } else {
+                middlewareEntries.delete(guard);
               }
             }
           }

package/dist/index.mjs

@@ -25,7 +25,7 @@ import { addDependency } from 'nypm';
 import { reverseResolveAlias, filename, resolveAlias } from 'pathe/utils';
 import { createRoutesContext } from 'unplugin-vue-router';
 import { resolveOptions } from 'unplugin-vue-router/options';
-import { toRouteMatcher, createRouter } from 'radix3';
+import { createRouter, addRoute, findAllRoutes } from 'rou3';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { runInNewContext } from 'node:vm';
 import { klona } from 'klona';
@@ -1460,9 +1460,12 @@ const pagesModule = defineNuxtModule({
         ...toRou3Patterns(nuxt.apps.default?.pages || [])
       ];
       if (!nitro.options.static && !nitro.options.prerender.crawlLinks) {
-        const routeRulesMatcher = toRouteMatcher(createRouter({ routes: nitro.options.routeRules }));
+        const routeRulesRouter = createRouter();
+        for (const [route, rules] of Object.entries(nitro.options.routeRules)) {
+          addRoute(routeRulesRouter, void 0, route, rules);
+        }
         for (const route of prerenderRoutes) {
-          const rules = defu({}, ...routeRulesMatcher.matchAll(route).reverse());
+          const rules = defu({}, ...findAllRoutes(routeRulesRouter, void 0, route).reverse());
           if (rules.prerender) {
             nitro.options.prerender.routes.push(route);
           }
@@ -1497,26 +1500,24 @@ const pagesModule = defineNuxtModule({
         });
       });
     }
-    if (nuxt.options.experimental.appManifest) {
-      nuxt.hook("pages:extend", (routes) => {
-        const nitro = useNitro();
-        let resolvedRoutes;
-        for (const [path, rule] of Object.entries(nitro.options.routeRules)) {
-          if (!rule.redirect) {
-            continue;
-          }
-          resolvedRoutes ||= routes.flatMap((route) => resolveRoutePaths(route));
-          if (resolvedRoutes.includes(path)) {
-            continue;
-          }
-          routes.push({
-            _sync: true,
-            path: path.replace(/\/[^/]*\*\*/, "/:pathMatch(.*)"),
-            file: componentStubPath
-          });
+    nuxt.hook("pages:extend", (routes) => {
+      const nitro = useNitro();
+      let resolvedRoutes;
+      for (const [path, rule] of Object.entries(nitro.options.routeRules)) {
+        if (!rule.redirect) {
+          continue;
         }
-      });
-    }
+        resolvedRoutes ||= routes.flatMap((route) => resolveRoutePaths(route));
+        if (resolvedRoutes.includes(path)) {
+          continue;
+        }
+        routes.push({
+          _sync: true,
+          path: path.replace(/\/[^/]*\*\*/, "/:pathMatch(.*)"),
+          file: componentStubPath
+        });
+      }
+    });
     const extraPageMetaExtractionKeys = nuxt.options?.experimental?.extraPageMetaExtractionKeys || [];
     const extractedKeys = [
       ...defaultExtractionKeys,
@@ -3845,7 +3846,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.3.0-29435873.41a564d2";
+const version = "4.3.0-29436247.ecea7a86";
 const pkg = {
 	version: version};
 
@@ -4675,7 +4676,6 @@ const runtimeDependencies = [
   "unctx",
   "cookie-es",
   "perfect-debounce",
-  "radix3",
   "ohash",
   "pathe",
   "uncrypto"
@@ -5446,12 +5446,12 @@ Using \`${fallbackCompatibilityDate}\` as fallback. More info at: ${colors.under
     addPlugin(resolve(nuxt.options.appDir, "plugins/revive-payload.client"));
     addPlugin(resolve(nuxt.options.appDir, "plugins/revive-payload.server"));
   }
+  addRouteMiddleware({
+    name: "manifest-route-rule",
+    path: resolve(nuxt.options.appDir, "middleware/route-rules"),
+    global: true
+  });
   if (nuxt.options.experimental.appManifest) {
-    addRouteMiddleware({
-      name: "manifest-route-rule",
-      path: resolve(nuxt.options.appDir, "middleware/manifest-route-rule"),
-      global: true
-    });
     if (nuxt.options.experimental.checkOutdatedBuildInterval !== false) {
       addPlugin(resolve(nuxt.options.appDir, "plugins/check-outdated-build.client"));
     }

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

@@ -1,13 +1,13 @@
 import { joinURL } from "ufo";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
 import { defu } from "defu";
-import { defineNuxtPlugin, useRuntimeConfig } from "#app/nuxt";
+import { defineNuxtPlugin } from "#app/nuxt";
 import { prerenderRoutes } from "#app/composables/ssr";
 import _routes from "#build/routes";
 import routerOptions, { hashMode } from "#build/router.options.mjs";
 import { crawlLinks } from "#build/nuxt.config.mjs";
+import _routeRulesMatcher from "#build/route-rules.mjs";
+const routeRulesMatcher = _routeRulesMatcher;
 let routes;
-let _routeRulesMatcher = void 0;
 export default defineNuxtPlugin(async () => {
   if (!import.meta.server || !import.meta.prerender || hashMode) {
     return;
@@ -15,17 +15,13 @@ export default defineNuxtPlugin(async () => {
   if (routes && !routes.length) {
     return;
   }
-  const routeRules = useRuntimeConfig().nitro.routeRules;
-  if (!crawlLinks && routeRules && Object.values(routeRules).some((r) => r.prerender)) {
-    _routeRulesMatcher = toRouteMatcher(createRadixRouter({ routes: routeRules }));
-  }
   routes ||= Array.from(processRoutes(await routerOptions.routes?.(_routes) ?? _routes));
   const batch = routes.splice(0, 10);
   prerenderRoutes(batch);
 });
 const OPTIONAL_PARAM_RE = /^\/?:.*(?:\?|\(\.\*\)\*)$/;
 function shouldPrerender(path) {
-  return !_routeRulesMatcher || defu({}, ..._routeRulesMatcher.matchAll(path).reverse()).prerender;
+  return crawlLinks || defu({}, ...routeRulesMatcher("", path).map((r) => r.data).reverse()).prerender;
 }
 function processRoutes(routes2, currentPath = "/", routesToPrerender = /* @__PURE__ */ new Set()) {
   for (const route of routes2) {

package/dist/pages/runtime/plugins/router.js

@@ -6,7 +6,6 @@ import { getRouteRules } from "#app/composables/manifest";
 import { defineNuxtPlugin, useRuntimeConfig } from "#app/nuxt";
 import { clearError, createError, isNuxtError, showError, useError } from "#app/composables/error";
 import { navigateTo } from "#app/composables/router";
-import { appManifest as isAppManifestEnabled } from "#build/nuxt.config.mjs";
 import _routes, { handleHotUpdate } from "#build/routes";
 import routerOptions, { hashMode } from "#build/router.options.mjs";
 import { globalMiddleware, namedMiddleware } from "#build/middleware";
@@ -143,15 +142,13 @@ const plugin = defineNuxtPlugin({
             middlewareEntries.add(entry);
           }
         }
-        if (isAppManifestEnabled) {
-          const routeRules = await nuxtApp.runWithContext(() => getRouteRules({ path: to.path }));
-          if (routeRules.appMiddleware) {
-            for (const key in routeRules.appMiddleware) {
-              if (routeRules.appMiddleware[key]) {
-                middlewareEntries.add(key);
-              } else {
-                middlewareEntries.delete(key);
-              }
+        const routeRules = getRouteRules({ path: to.path });
+        if (routeRules.appMiddleware) {
+          for (const key in routeRules.appMiddleware) {
+            if (routeRules.appMiddleware[key]) {
+              middlewareEntries.add(key);
+            } else {
+              middlewareEntries.delete(key);
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.3.0-29435873.41a564d2",
+  "version": "4.3.0-29436247.ecea7a86",
   "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-29435873.41a564d2",
-    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.3.0-29435873.41a564d2",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29435873.41a564d2",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29436247.ecea7a86",
+    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.3.0-29436247.ecea7a86",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29436247.ecea7a86",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.3.0-29435873.41a564d2",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.3.0-29436247.ecea7a86",
     "@unhead/vue": "^2.0.19",
     "@vue/shared": "^3.5.25",
     "c12": "^3.3.2",
@@ -106,7 +106,7 @@
     "pathe": "^2.0.3",
     "perfect-debounce": "^2.0.0",
     "pkg-types": "^2.3.0",
-    "radix3": "^1.1.2",
+    "rou3": "^0.7.12",
     "scule": "^1.3.0",
     "semver": "^7.7.3",
     "std-env": "^3.10.0",