@nuxt/nitro-server-nightly 4.3.0-29435909.323f27bc → 4.3.0-29436247.ecea7a86

package/dist/index.mjs

@@ -4,10 +4,12 @@ import { cpus } from 'node:os';
 import process from 'node:process';
 import { readFile, mkdir, writeFile } from 'node:fs/promises';
 import { randomUUID } from 'node:crypto';
+import { findAllRoutes, createRouter, addRoute } from 'rou3';
+import { compileRouterToString } from 'rou3/compiler';
 import { dirname, relative, resolve, join, isAbsolute } from 'pathe';
 import { readPackageJSON } from 'pkg-types';
-import { toRouteMatcher, createRouter, exportMatcher } from 'radix3';
 import { withTrailingSlash, joinURL } from 'ufo';
+import { hash } from 'ohash';
 import { createNitro, scanHandlers, writeTypes, copyPublicAssets, prepare, build, prerender, createDevServer } from 'nitropack';
 import { getLayerDirectories, getDirectory, resolveNuxtModule, addTemplate, resolveAlias, addPlugin, resolveIgnorePatterns, createIsIgnored, addVitePlugin, logger, findPath } from '@nuxt/kit';
 import escapeRE from 'escape-string-regexp';
@@ -17,7 +19,7 @@ import { isWindows } from 'std-env';
 import { ImpoundPlugin } from 'impound';
 import { resolveModulePath } from 'exsolve';
 
-const version = "4.3.0-29435909.323f27bc";
+const version = "4.3.0-29436247.ecea7a86";
 const nitroBuilder = {
 	version: version};
 
@@ -445,6 +447,56 @@ async function bundle(nuxt) {
     ...resolveIgnorePatterns(nitroConfig.srcDir),
     `!${join(nuxt.options.buildDir, "dist/client", nuxt.options.app.buildAssetsDir, "**/*")}`
   );
+  const validManifestKeys = ["prerender", "redirect", "appMiddleware"];
+  function getRouteRulesRouter() {
+    const routeRulesRouter = createRouter();
+    if (nuxt._nitro) {
+      for (const [route, rules] of Object.entries(nuxt._nitro.options.routeRules)) {
+        if (route === "/__nuxt_error") {
+          continue;
+        }
+        if (validManifestKeys.every((key) => !(key in rules))) {
+          continue;
+        }
+        addRoute(routeRulesRouter, void 0, route, rules);
+      }
+    }
+    return routeRulesRouter;
+  }
+  const cachedMatchers = {};
+  addTemplate({
+    filename: "route-rules.mjs",
+    getContents() {
+      const key = hash(nuxt._nitro?.options.routeRules || {});
+      if (cachedMatchers[key]) {
+        return cachedMatchers[key];
+      }
+      return cachedMatchers[key] = `export default ${compileRouterToString(getRouteRulesRouter(), "", {
+        matchAll: true,
+        serialize(routeRules) {
+          return `{${Object.entries(routeRules).filter(([name, value]) => value !== void 0 && validManifestKeys.includes(name)).map(([name, value]) => {
+            if (name === "redirect") {
+              const redirectOptions = value;
+              value = typeof redirectOptions === "string" ? redirectOptions : redirectOptions.to;
+            }
+            if (name === "appMiddleware") {
+              const appMiddlewareOptions = value;
+              if (typeof appMiddlewareOptions === "string") {
+                value = { [appMiddlewareOptions]: true };
+              } else if (Array.isArray(appMiddlewareOptions)) {
+                const normalizedRules = {};
+                for (const middleware of appMiddlewareOptions) {
+                  normalizedRules[middleware] = true;
+                }
+                value = normalizedRules;
+              }
+            }
+            return `${name}: ${JSON.stringify(value)}`;
+          }).join(",")}}`;
+        }
+      })}`;
+    }
+  });
   if (nuxt.options.experimental.appManifest) {
     const buildId = nuxt.options.runtimeConfig.app.buildId ||= nuxt.options.buildId;
     const buildTimestamp = Date.now();
@@ -477,59 +529,17 @@ async function bundle(nuxt) {
     nuxt.hook("nitro:config", (config) => {
       config.alias ||= {};
       config.alias["#app-manifest"] = join(tempDir, `meta/${buildId}.json`);
-      const rules = config.routeRules;
-      for (const rule in rules) {
-        if (!rules[rule].appMiddleware) {
-          continue;
-        }
-        const value = rules[rule].appMiddleware;
-        if (typeof value === "string") {
-          rules[rule].appMiddleware = { [value]: true };
-        } else if (Array.isArray(value)) {
-          const normalizedRules = {};
-          for (const middleware of value) {
-            normalizedRules[middleware] = true;
-          }
-          rules[rule].appMiddleware = normalizedRules;
-        }
-      }
     });
     nuxt.hook("nitro:init", (nitro2) => {
       nitro2.hooks.hook("rollup:before", async (nitro3) => {
-        const routeRules = {};
-        const _routeRules = nitro3.options.routeRules;
-        const validManifestKeys = /* @__PURE__ */ new Set(["prerender", "redirect", "appMiddleware"]);
-        for (const key in _routeRules) {
-          if (key === "/__nuxt_error") {
-            continue;
-          }
-          let hasRules = false;
-          const filteredRules = {};
-          for (const routeKey in _routeRules[key]) {
-            const value = _routeRules[key][routeKey];
-            if (value && validManifestKeys.has(routeKey)) {
-              if (routeKey === "redirect") {
-                filteredRules[routeKey] = typeof value === "string" ? value : value.to;
-              } else {
-                filteredRules[routeKey] = value;
-              }
-              hasRules = true;
-            }
-          }
-          if (hasRules) {
-            routeRules[key] = filteredRules;
-          }
-        }
         const prerenderedRoutes = /* @__PURE__ */ new Set();
-        const routeRulesMatcher = toRouteMatcher(
-          createRouter({ routes: routeRules })
-        );
+        const routeRulesMatcher = getRouteRulesRouter();
         if (nitro3._prerenderedRoutes?.length) {
           const payloadSuffix = nuxt.options.experimental.renderJsonPayloads ? "/_payload.json" : "/_payload.js";
           for (const route of nitro3._prerenderedRoutes) {
             if (!route.error && route.route.endsWith(payloadSuffix)) {
               const url = route.route.slice(0, -payloadSuffix.length) || "/";
-              const rules = defu({}, ...routeRulesMatcher.matchAll(url).reverse());
+              const rules = defu({}, ...findAllRoutes(routeRulesMatcher, void 0, url).reverse());
               if (!rules.prerender) {
                 prerenderedRoutes.add(url);
               }
@@ -539,7 +549,6 @@ async function bundle(nuxt) {
         const manifest = {
           id: buildId,
           timestamp: buildTimestamp,
-          matcher: exportMatcher(routeRulesMatcher),
           prerendered: nuxt.options.dev ? [] : [...prerenderedRoutes]
         };
         await promises.mkdir(join(tempDir, "meta"), { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/nitro-server-nightly",
-  "version": "4.3.0-29435909.323f27bc",
+  "version": "4.3.0-29436247.ecea7a86",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^2.0.2",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29435909.323f27bc",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29436247.ecea7a86",
     "@unhead/vue": "^2.0.19",
     "@vue/shared": "^3.5.25",
     "consola": "^3.4.2",
@@ -34,9 +34,10 @@
     "klona": "^2.0.6",
     "mocked-exports": "^0.1.1",
     "nitropack": "^2.12.9",
+    "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.0",
-    "radix3": "^1.1.2",
+    "rou3": "^0.7.12",
     "std-env": "^3.10.0",
     "ufo": "^1.6.1",
     "unctx": "^2.4.1",
@@ -46,11 +47,11 @@
     "vue-devtools-stub": "^0.1.0"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@4.3.0-29435909.323f27bc"
+    "nuxt": "npm:nuxt-nightly@4.3.0-29436247.ecea7a86"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29435909.323f27bc",
-    "nuxt": "npm:nuxt-nightly@4.3.0-29435909.323f27bc",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29436247.ecea7a86",
+    "nuxt": "npm:nuxt-nightly@4.3.0-29436247.ecea7a86",
     "unbuild": "3.6.1",
     "vitest": "3.2.4"
   },