@qwik.dev/router 2.0.0-beta.27 → 2.0.0-beta.29

package/lib/middleware/request-handler/index.mjs

@@ -1,13 +1,57 @@
 import { isServer } from '@qwik.dev/core/build';
-import { i as isPromise, j as QDATA_KEY, Q as Q_ROUTE, f as QFN_KEY, k as QLOADER_KEY, h as QACTION_KEY, d as loadRoute } from '../../chunks/routing.qwik.mjs';
+import { k as isPromise, j as QDATA_KEY, Q as Q_ROUTE, f as QFN_KEY, m as QLOADER_KEY, h as QACTION_KEY, n as resolveRouteConfig, d as loadRoute } from '../../chunks/routing.qwik.mjs';
 import { inlinedQrl } from '@qwik.dev/core';
 import { _serialize, isDev, _UNINITIALIZED, _deserialize, _verifySerializable } from '@qwik.dev/core/internal';
-import { L as LoadedRouteProp } from '../../chunks/types.qwik.mjs';
 import { _asyncRequestStore as _asyncRequestStore$1, ServerError as ServerError$1, RedirectMessage as RedirectMessage$1, RewriteMessage as RewriteMessage$1, AbortMessage as AbortMessage$1 } from '@qwik.dev/router/middleware/request-handler';
 import { g as getErrorHtml, m as minimalHtmlResponse } from '../../chunks/error-handler.mjs';
-import '@qwik.dev/core/preloader';
 
-var HttpStatus = /* @__PURE__ */ ((HttpStatus2) => {
+const MAX_CACHE_SIZE = typeof globalThis.__SSR_CACHE_SIZE__ === "number" ? globalThis.__SSR_CACHE_SIZE__ : 50;
+const ssrCache = /* @__PURE__ */ new Map();
+function resolveETag(eTagExport, headProps) {
+  if (eTagExport === void 0) {
+    return null;
+  }
+  if (typeof eTagExport === "function") {
+    return eTagExport(headProps);
+  }
+  return eTagExport;
+}
+function resolveCacheKey(cacheKeyExport, status, eTag, pathname) {
+  if (cacheKeyExport === true) {
+    return `${status}|${eTag}|${pathname}`;
+  }
+  if (typeof cacheKeyExport !== "function") {
+    return null;
+  }
+  return cacheKeyExport(status, eTag, pathname);
+}
+function getCachedHtml(key) {
+  const html = ssrCache.get(key);
+  if (html !== void 0) {
+    ssrCache.delete(key);
+    ssrCache.set(key, html);
+  }
+  return html;
+}
+function setCachedHtml(key, html) {
+  if (MAX_CACHE_SIZE <= 0) {
+    return;
+  }
+  if (ssrCache.size >= MAX_CACHE_SIZE) {
+    const firstKey = ssrCache.keys().next().value;
+    ssrCache.delete(firstKey);
+  }
+  ssrCache.set(key, html);
+}
+function clearSsrCache(cacheKey) {
+  if (cacheKey != null) {
+    ssrCache.delete(cacheKey);
+  } else {
+    ssrCache.clear();
+  }
+}
+
+var HttpStatus = /* @__PURE__ */ (function(HttpStatus2) {
   HttpStatus2[HttpStatus2["Continue"] = 100] = "Continue";
   HttpStatus2[HttpStatus2["SwitchingProtocols"] = 101] = "SwitchingProtocols";
   HttpStatus2[HttpStatus2["Processing"] = 102] = "Processing";
@@ -70,7 +114,7 @@ var HttpStatus = /* @__PURE__ */ ((HttpStatus2) => {
   HttpStatus2[HttpStatus2["NotExtended"] = 510] = "NotExtended";
   HttpStatus2[HttpStatus2["NetworkAuthenticationRequired"] = 511] = "NetworkAuthenticationRequired";
   return HttpStatus2;
-})(HttpStatus || {});
+})({});
 
 function createCacheControl(cacheControl) {
   const controls = [];
@@ -149,35 +193,6 @@ const UNIT = {
   days: 1 * 60 * 60 * 24,
   weeks: 1 * 60 * 60 * 24 * 7
 };
-const createSetCookieValue = (cookieName, cookieValue, options) => {
-  const c = [`${cookieName}=${cookieValue}`];
-  if (typeof options.domain === "string") {
-    c.push(`Domain=${options.domain}`);
-  }
-  if (typeof options.maxAge === "number") {
-    c.push(`Max-Age=${options.maxAge}`);
-  } else if (Array.isArray(options.maxAge)) {
-    c.push(`Max-Age=${options.maxAge[0] * UNIT[options.maxAge[1]]}`);
-  } else if (typeof options.expires === "number" || typeof options.expires == "string") {
-    c.push(`Expires=${options.expires}`);
-  } else if (options.expires instanceof Date) {
-    c.push(`Expires=${options.expires.toUTCString()}`);
-  }
-  if (options.httpOnly) {
-    c.push("HttpOnly");
-  }
-  if (typeof options.path === "string") {
-    c.push(`Path=${options.path}`);
-  }
-  const sameSite = resolveSameSite(options.sameSite);
-  if (sameSite) {
-    c.push(`SameSite=${sameSite}`);
-  }
-  if (options.secure) {
-    c.push("Secure");
-  }
-  return c.join("; ");
-};
 function tryDecodeUriComponent(str) {
   try {
     return decodeURIComponent(str);
@@ -210,6 +225,37 @@ function resolveSameSite(sameSite) {
   }
   return void 0;
 }
+const createSetCookieValue = (cookieName, cookieValue, options) => {
+  const c = [
+    `${cookieName}=${cookieValue}`
+  ];
+  if (typeof options.domain === "string") {
+    c.push(`Domain=${options.domain}`);
+  }
+  if (typeof options.maxAge === "number") {
+    c.push(`Max-Age=${options.maxAge}`);
+  } else if (Array.isArray(options.maxAge)) {
+    c.push(`Max-Age=${options.maxAge[0] * UNIT[options.maxAge[1]]}`);
+  } else if (typeof options.expires === "number" || typeof options.expires == "string") {
+    c.push(`Expires=${options.expires}`);
+  } else if (options.expires instanceof Date) {
+    c.push(`Expires=${options.expires.toUTCString()}`);
+  }
+  if (options.httpOnly) {
+    c.push("HttpOnly");
+  }
+  if (typeof options.path === "string") {
+    c.push(`Path=${options.path}`);
+  }
+  const sameSite = resolveSameSite(options.sameSite);
+  if (sameSite) {
+    c.push(`SameSite=${sameSite}`);
+  }
+  if (options.secure) {
+    c.push("Secure");
+  }
+  return c.join("; ");
+};
 const REQ_COOKIE = /* @__PURE__ */ Symbol("request-cookies");
 const RES_COOKIE = /* @__PURE__ */ Symbol("response-cookies");
 const LIVE_COOKIE = /* @__PURE__ */ Symbol("live-cookies");
@@ -220,7 +266,9 @@ class Cookie {
   appendCounter = 0;
   constructor(cookieString) {
     this[REQ_COOKIE] = parseCookieString(cookieString);
-    this[LIVE_COOKIE] = { ...this[REQ_COOKIE] };
+    this[LIVE_COOKIE] = {
+      ...this[REQ_COOKIE]
+    };
   }
   get(cookieName, live = true) {
     const value = this[live ? LIVE_COOKIE : REQ_COOKIE][cookieName];
@@ -238,13 +286,10 @@ class Cookie {
     };
   }
   getAll(live = true) {
-    return Object.keys(this[live ? LIVE_COOKIE : REQ_COOKIE]).reduce(
-      (cookies, cookieName) => {
-        cookies[cookieName] = this.get(cookieName);
-        return cookies;
-      },
-      {}
-    );
+    return Object.keys(this[live ? LIVE_COOKIE : REQ_COOKIE]).reduce((cookies, cookieName) => {
+      cookies[cookieName] = this.get(cookieName);
+      return cookies;
+    }, {});
   }
   has(cookieName, live = true) {
     return !!this[live ? LIVE_COOKIE : REQ_COOKIE][cookieName];
@@ -257,14 +302,13 @@ class Cookie {
   append(cookieName, cookieValue, options = {}) {
     this[LIVE_COOKIE][cookieName] = typeof cookieValue === "string" ? cookieValue : JSON.stringify(cookieValue);
     const resolvedValue = typeof cookieValue === "string" ? cookieValue : encodeURIComponent(JSON.stringify(cookieValue));
-    this[RES_COOKIE][++this.appendCounter] = createSetCookieValue(
-      cookieName,
-      resolvedValue,
-      options
-    );
+    this[RES_COOKIE][++this.appendCounter] = createSetCookieValue(cookieName, resolvedValue, options);
   }
   delete(name, options) {
-    this.set(name, "deleted", { ...options, maxAge: 0 });
+    this.set(name, "deleted", {
+      ...options,
+      maxAge: 0
+    });
     this[LIVE_COOKIE][name] = null;
   }
   headers() {
@@ -283,22 +327,6 @@ const mergeHeadersCookies = (headers, cookies) => {
   return headers;
 };
 
-function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, basePathname = "/") {
-  let resolve;
-  const responsePromise = new Promise((r) => resolve = r);
-  const requestEv = createRequestEvent(
-    serverRequestEv,
-    loadedRoute,
-    requestHandlers,
-    basePathname,
-    resolve
-  );
-  return {
-    response: responsePromise,
-    requestEv,
-    completion: _asyncRequestStore$1 ? _asyncRequestStore$1.run(requestEv, runNext, requestEv, rebuildRouteInfo, resolve) : runNext(requestEv, rebuildRouteInfo, resolve)
-  };
-}
 async function runNext(requestEv, rebuildRouteInfo, resolve) {
   try {
     const isValidURL = (url) => new URL(url.pathname + url.search, url);
@@ -347,7 +375,9 @@ async function runNext(requestEv, rebuildRouteInfo, resolve) {
         try {
           if (!requestEv.headersSent) {
             requestEv.headers.set("content-type", "text/html; charset=utf-8");
-            requestEv.cacheControl({ noCache: true });
+            requestEv.cacheControl({
+              noCache: true
+            });
             requestEv.status(500);
           }
           const stream = requestEv.getWritableStream();
@@ -371,6 +401,18 @@ async function runNext(requestEv, rebuildRouteInfo, resolve) {
     }
   }
 }
+function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, basePathname = "/") {
+  let resolve;
+  const responsePromise = new Promise((r) => resolve = r);
+  const requestEv = createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, basePathname, resolve);
+  return {
+    response: responsePromise,
+    requestEv,
+    completion: _asyncRequestStore$1 ? _asyncRequestStore$1.run(requestEv, runNext, requestEv, rebuildRouteInfo, resolve) : runNext(requestEv, rebuildRouteInfo, resolve)
+  };
+}
+const IsQData = "@isQData";
+const QDATA_JSON = "/q-data.json";
 function getRouteMatchPathname(pathname) {
   const isInternal = pathname.endsWith(QDATA_JSON);
   if (isInternal) {
@@ -380,24 +422,144 @@ function getRouteMatchPathname(pathname) {
       pathname = "/";
     }
   }
-  return { pathname, isInternal };
+  return {
+    pathname,
+    isInternal
+  };
 }
-const IsQData = "@isQData";
-const QDATA_JSON = "/q-data.json";
 
 const RequestEvLoaders = /* @__PURE__ */ Symbol("RequestEvLoaders");
 const RequestEvMode = /* @__PURE__ */ Symbol("RequestEvMode");
 const RequestEvRoute = /* @__PURE__ */ Symbol("RequestEvRoute");
-const RequestEvLoaderSerializationStrategyMap = /* @__PURE__ */ Symbol(
-  "RequestEvLoaderSerializationStrategyMap"
-);
+const RequestEvLoaderSerializationStrategyMap = /* @__PURE__ */ Symbol("RequestEvLoaderSerializationStrategyMap");
 const RequestRouteName = "@routeName";
 const RequestEvSharedActionId = "@actionId";
 const RequestEvSharedActionFormData = "@actionFormData";
 const RequestEvSharedNonce = "@nonce";
 const RequestEvIsRewrite = "@rewrite";
 const RequestEvShareServerTiming = "@serverTiming";
+const RequestEvETagCacheKey = "@eTagCacheKey";
+const RequestEvHttpStatusMessage = "@httpStatusMessage";
 const RequestEvShareQData = "qData";
+function getRequestLoaders(requestEv) {
+  return requestEv[RequestEvLoaders];
+}
+function getRequestLoaderSerializationStrategyMap(requestEv) {
+  return requestEv[RequestEvLoaderSerializationStrategyMap];
+}
+function getRequestRoute(requestEv) {
+  return requestEv[RequestEvRoute];
+}
+function getRequestMode(requestEv) {
+  return requestEv[RequestEvMode];
+}
+const ABORT_INDEX = Number.MAX_SAFE_INTEGER;
+const isDangerousKey = (k) => k === "__proto__" || k === "constructor" || k === "prototype";
+const isArrayIndexKey = (k) => /^(0|[1-9]\d*)$/.test(k);
+const getArrayPaths = (formData) => {
+  const arrayCandidates = /* @__PURE__ */ new Map();
+  for (const [name] of formData) {
+    const keys = name.split(".");
+    let hasDangerousKey = false;
+    for (const key of keys) {
+      if (isDangerousKey(key)) {
+        hasDangerousKey = true;
+        break;
+      }
+    }
+    if (hasDangerousKey) {
+      continue;
+    }
+    let path = "";
+    for (let i = 0; i < keys.length - 1; i++) {
+      const key = keys[i];
+      if (key.endsWith("[]")) {
+        break;
+      }
+      path = path ? `${path}.${key}` : key;
+      if (!arrayCandidates.has(path)) {
+        arrayCandidates.set(path, true);
+      }
+      if (!isArrayIndexKey(keys[i + 1])) {
+        arrayCandidates.set(path, false);
+      }
+    }
+  }
+  return new Set(Array.from(arrayCandidates.entries()).filter(([, isArrayPath]) => isArrayPath).map(([path]) => path));
+};
+const formToObj = (formData) => {
+  const values = /* @__PURE__ */ Object.create(null);
+  const arrayPaths = getArrayPaths(formData);
+  for (const [name, value] of formData) {
+    const keys = name.split(".");
+    let hasDangerousKey = false;
+    for (let i = 0; i < keys.length; i++) {
+      if (isDangerousKey(keys[i])) {
+        hasDangerousKey = true;
+        break;
+      }
+    }
+    if (hasDangerousKey) {
+      continue;
+    }
+    let object = values;
+    let path = "";
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      if (key.endsWith("[]")) {
+        const arrayKey = key.slice(0, -2);
+        if (isDangerousKey(arrayKey)) {
+          break;
+        }
+        const existingValue = object[arrayKey];
+        if (existingValue !== void 0 && !Array.isArray(existingValue)) {
+          break;
+        }
+        object[arrayKey] = existingValue || [];
+        object[arrayKey].push(value);
+        break;
+      }
+      if (Array.isArray(object) && !isArrayIndexKey(key)) {
+        break;
+      }
+      if (i < keys.length - 1) {
+        path = path ? `${path}.${key}` : key;
+        const nextValue = object[key];
+        if (nextValue !== void 0) {
+          object = nextValue;
+          continue;
+        }
+        object = object[key] = arrayPaths.has(path) ? [] : /* @__PURE__ */ Object.create(null);
+      } else {
+        object[key] = value;
+      }
+    }
+  }
+  return values;
+};
+const parseRequest = async ({ request, method, query }, sharedMap) => {
+  const type = getContentType(request.headers);
+  if (type === "application/x-www-form-urlencoded" || type === "multipart/form-data") {
+    const formData = await request.formData();
+    sharedMap.set(RequestEvSharedActionFormData, formData);
+    return formToObj(formData);
+  } else if (type === "application/json") {
+    const data = await request.json();
+    return data;
+  } else if (type === "application/qwik-json") {
+    if (method === "GET" && query.has(QDATA_KEY)) {
+      const data = query.get(QDATA_KEY);
+      if (data) {
+        try {
+          return _deserialize(decodeURIComponent(data));
+        } catch {
+        }
+      }
+    }
+    return _deserialize(await request.text());
+  }
+  return void 0;
+};
 function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, basePathname, resolved) {
   const { request, platform, env } = serverRequestEv;
   const sharedMap = /* @__PURE__ */ new Map();
@@ -413,7 +575,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
   let writableStream = null;
   let requestData = void 0;
   let locale = serverRequestEv.locale;
-  let status = 200;
+  let status = loadedRoute?.$notFound$ ? 404 : 200;
   const next = async () => {
     routeModuleIndex++;
     while (routeModuleIndex < requestHandlers.length) {
@@ -427,6 +589,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
   };
   const resetRoute = (_loadedRoute, _requestHandlers, _url = url) => {
     loadedRoute = _loadedRoute;
+    status = loadedRoute?.$notFound$ ? 404 : 200;
     requestHandlers = _requestHandlers;
     url.pathname = _url.pathname;
     url.search = _url.search;
@@ -490,7 +653,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
     signal: request.signal,
     originalUrl: new URL(url),
     get params() {
-      return loadedRoute?.[LoadedRouteProp.Params] ?? {};
+      return loadedRoute?.$params$ ?? {};
     },
     get pathname() {
       return url.pathname;
@@ -519,20 +682,18 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
       check();
       headers.set(target, createCacheControl(cacheControl));
     },
-    resolveValue: (async (loaderOrAction) => {
+    resolveValue: async (loaderOrAction) => {
       const id = loaderOrAction.__id;
       if (loaderOrAction.__brand === "server_loader") {
         if (!(id in loaders)) {
-          throw new Error(
-            "You can not get the returned data of a loader that has not been executed for this request."
-          );
+          throw new Error("You can not get the returned data of a loader that has not been executed for this request.");
         }
         if (loaders[id] === _UNINITIALIZED) {
           await getRouteLoaderPromise(loaderOrAction, loaders, requestEv);
         }
       }
       return loaders[id];
-    }),
+    },
     status: (statusCode) => {
       if (typeof statusCode === "number") {
         check();
@@ -576,10 +737,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
     rewrite: (pathname2) => {
       check();
       if (pathname2.startsWith("http")) {
-        throw new ServerError$1(
-          400,
-          isDev ? "Rewrite does not support absolute urls" : "Bad Request"
-        );
+        throw new ServerError$1(400, isDev ? "Rewrite does not support absolute urls" : "Bad Request");
       }
       sharedMap.set(RequestEvIsRewrite, true);
       return exit(new RewriteMessage$1(pathname2.replace(/\/+/g, "/")));
@@ -623,113 +781,32 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
         if (isDev) {
           const serverTiming = sharedMap.get(RequestEvShareServerTiming);
           if (serverTiming) {
-            headers.set(
-              "Server-Timing",
-              serverTiming.map(([name, duration]) => `${name};dur=${duration}`).join(",")
-            );
+            headers.set("Server-Timing", serverTiming.map(([name, duration]) => `${name};dur=${duration}`).join(","));
           }
         }
-        writableStream = serverRequestEv.getWritableStream(
-          status,
-          headers,
-          cookie,
-          resolved,
-          requestEv
-        );
+        writableStream = serverRequestEv.getWritableStream(status, headers, cookie, resolved, requestEv);
       }
       return writableStream;
     }
   };
   return requestEv;
 }
-function getRequestLoaders(requestEv) {
-  return requestEv[RequestEvLoaders];
-}
-function getRequestLoaderSerializationStrategyMap(requestEv) {
-  return requestEv[RequestEvLoaderSerializationStrategyMap];
-}
-function getRequestRoute(requestEv) {
-  return requestEv[RequestEvRoute];
-}
-function getRequestMode(requestEv) {
-  return requestEv[RequestEvMode];
-}
-const ABORT_INDEX = Number.MAX_SAFE_INTEGER;
-const parseRequest = async ({ request, method, query }, sharedMap) => {
-  const type = getContentType(request.headers);
-  if (type === "application/x-www-form-urlencoded" || type === "multipart/form-data") {
-    const formData = await request.formData();
-    sharedMap.set(RequestEvSharedActionFormData, formData);
-    return formToObj(formData);
-  } else if (type === "application/json") {
-    const data = await request.json();
-    return data;
-  } else if (type === "application/qwik-json") {
-    if (method === "GET" && query.has(QDATA_KEY)) {
-      const data = query.get(QDATA_KEY);
-      if (data) {
-        try {
-          return _deserialize(decodeURIComponent(data));
-        } catch {
-        }
-      }
-    }
-    return _deserialize(await request.text());
-  }
-  return void 0;
-};
-const isDangerousKey = (k) => k === "__proto__" || k === "constructor" || k === "prototype";
-const formToObj = (formData) => {
-  const values = /* @__PURE__ */ Object.create(null);
-  for (const [name, value] of formData) {
-    const keys = name.split(".");
-    let hasDangerousKey = false;
-    for (let i = 0; i < keys.length; i++) {
-      if (isDangerousKey(keys[i])) {
-        hasDangerousKey = true;
-        break;
-      }
-    }
-    if (hasDangerousKey) {
-      continue;
-    }
-    let object = values;
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i];
-      if (key.endsWith("[]")) {
-        const arrayKey = key.slice(0, -2);
-        if (isDangerousKey(arrayKey)) {
-          break;
-        }
-        object[arrayKey] = object[arrayKey] || [];
-        object[arrayKey].push(value);
-        break;
-      }
-      if (i < keys.length - 1) {
-        object = object[key] = object[key] || (Number.isNaN(+keys[i + 1]) ? /* @__PURE__ */ Object.create(null) : []);
-      } else {
-        object[key] = value;
-      }
-    }
-  }
-  return values;
-};
-
-function getQwikRouterServerData(requestEv) {
-  const { params, request, status, locale, originalUrl } = requestEv;
-  const requestHeaders = {};
-  request.headers.forEach((value, key) => requestHeaders[key] = value);
-  const action = requestEv.sharedMap.get(RequestEvSharedActionId);
-  const formData = requestEv.sharedMap.get(RequestEvSharedActionFormData);
-  const routeName = requestEv.sharedMap.get(RequestRouteName);
-  const nonce = requestEv.sharedMap.get(RequestEvSharedNonce);
-  const headers = requestEv.request.headers;
-  const reconstructedUrl = new URL(originalUrl.pathname + originalUrl.search, originalUrl);
-  const host = headers.get("X-Forwarded-Host");
-  const protocol = headers.get("X-Forwarded-Proto");
-  if (host) {
-    reconstructedUrl.port = "";
-    reconstructedUrl.host = host;
+
+function getQwikRouterServerData(requestEv) {
+  const { params, request, status, locale, originalUrl } = requestEv;
+  const requestHeaders = {};
+  request.headers.forEach((value, key) => requestHeaders[key] = value);
+  const action = requestEv.sharedMap.get(RequestEvSharedActionId);
+  const formData = requestEv.sharedMap.get(RequestEvSharedActionFormData);
+  const routeName = requestEv.sharedMap.get(RequestRouteName);
+  const nonce = requestEv.sharedMap.get(RequestEvSharedNonce);
+  const headers = requestEv.request.headers;
+  const reconstructedUrl = new URL(originalUrl.pathname + originalUrl.search, originalUrl);
+  const host = headers.get("X-Forwarded-Host");
+  const protocol = headers.get("X-Forwarded-Proto");
+  if (host) {
+    reconstructedUrl.port = "";
+    reconstructedUrl.host = host;
   }
   if (protocol) {
     reconstructedUrl.protocol = protocol;
@@ -747,10 +824,13 @@ function getQwikRouterServerData(requestEv) {
     qwikrouter: {
       routeName,
       ev: requestEv,
-      params: { ...params },
+      params: {
+        ...params
+      },
       loadedRoute: getRequestRoute(requestEv),
       response: {
         status: status(),
+        statusMessage: requestEv.sharedMap.get(RequestEvHttpStatusMessage),
         loaders,
         loadersSerializationStrategy,
         action,
@@ -760,62 +840,6 @@ function getQwikRouterServerData(requestEv) {
   };
 }
 
-const resolveRequestHandlers = (serverPlugins, route, method, checkOrigin, renderHandler, isInternal) => {
-  const routeLoaders = [];
-  const routeActions = [];
-  const requestHandlers = [];
-  const isPageRoute = !!(route && isLastModulePageRoute(route[LoadedRouteProp.Mods]));
-  if (isInternal) {
-    requestHandlers.push(handleQDataRedirect);
-  }
-  if (serverPlugins) {
-    _resolveRequestHandlers(
-      routeLoaders,
-      routeActions,
-      requestHandlers,
-      serverPlugins,
-      isPageRoute,
-      method
-    );
-  }
-  if (route) {
-    const routeModules = route[LoadedRouteProp.Mods];
-    _resolveRequestHandlers(
-      routeLoaders,
-      routeActions,
-      requestHandlers,
-      routeModules,
-      isPageRoute,
-      method
-    );
-    const routeName = route[LoadedRouteProp.RouteName];
-    if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
-      if (checkOrigin === "lax-proto") {
-        requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
-      } else {
-        requestHandlers.unshift(csrfCheckMiddleware);
-      }
-    }
-    if (isPageRoute) {
-      if (method === "POST" || method === "GET") {
-        requestHandlers.push(runServerFunction);
-      }
-      requestHandlers.push(fixTrailingSlash);
-      if (isInternal) {
-        requestHandlers.push(renderQData);
-      }
-    }
-    if (isPageRoute) {
-      requestHandlers.push((ev) => {
-        ev.sharedMap.set(RequestRouteName, routeName);
-      });
-      requestHandlers.push(actionsMiddleware(routeActions));
-      requestHandlers.push(loadersMiddleware(routeLoaders));
-      requestHandlers.push(renderHandler);
-    }
-  }
-  return requestHandlers;
-};
 const _resolveRequestHandlers = (routeLoaders, routeActions, requestHandlers, routeModules, collectActions, method) => {
   for (const routeModule of routeModules) {
     if (typeof routeModule.onRequest === "function") {
@@ -872,185 +896,111 @@ const _resolveRequestHandlers = (routeLoaders, routeActions, requestHandlers, ro
     }
   }
 };
-function actionsMiddleware(routeActions) {
-  return async (requestEvent) => {
-    const requestEv = requestEvent;
+function eTagMiddleware(route) {
+  return (requestEv) => {
     if (requestEv.headersSent) {
-      requestEv.exit();
       return;
     }
-    const { method } = requestEv;
-    const loaders = getRequestLoaders(requestEv);
-    if (isDev && method === "GET") {
-      if (requestEv.query.has(QACTION_KEY)) {
-        console.warn(
-          'Seems like you are submitting a Qwik Action via GET request. Qwik Actions should be submitted via POST request.\nMake sure your <form> has method="POST" attribute, like this: <form method="POST">'
-        );
+    if (requestEv.method !== "GET" || requestEv.sharedMap.has(IsQData)) {
+      return;
+    }
+    const mods = route.$mods$;
+    const hasETag = mods.some((m) => {
+      if (!m) {
+        return false;
+      }
+      if (m.routeConfig) {
+        return typeof m.routeConfig === "function" || m.routeConfig.eTag !== void 0;
       }
+      return m.eTag !== void 0;
+    });
+    if (!hasETag) {
+      return;
     }
-    if (method === "POST") {
-      const selectedActionId = requestEv.query.get(QACTION_KEY);
-      if (selectedActionId) {
-        const serverActionsMap = globalThis._qwikActionsMap;
-        const action = routeActions.find((action2) => action2.__id === selectedActionId) ?? serverActionsMap?.get(selectedActionId);
-        if (action) {
-          requestEv.sharedMap.set(RequestEvSharedActionId, selectedActionId);
-          const data = await requestEv.parseBody();
-          if (!data || typeof data !== "object") {
-            throw new Error(
-              `Expected request data for the action id ${selectedActionId} to be an object`
-            );
-          }
-          const result = await runValidators(requestEv, action.__validators, data);
-          if (!result.success) {
-            loaders[selectedActionId] = requestEv.fail(result.status ?? 500, result.error);
-          } else {
-            const actionResolved = isDev ? await measure(
-              requestEv,
-              action.__qrl.getHash(),
-              () => action.__qrl.call(requestEv, result.data, requestEv)
-            ) : await action.__qrl.call(requestEv, result.data, requestEv);
-            if (isDev) {
-              verifySerializable(actionResolved, action.__qrl);
-            }
-            loaders[selectedActionId] = actionResolved;
-          }
-        }
+    const loaders = getRequestLoaders(requestEv);
+    const getData = (loaderOrAction) => {
+      const id = loaderOrAction.__id;
+      if (loaderOrAction.__brand === "server_loader" && !(id in loaders)) {
+        throw new Error("Loader not executed for this request.");
+      }
+      const data = loaders[id];
+      if (data instanceof Promise) {
+        throw new Error("Loaders returning a promise cannot be resolved for the eTag function.");
       }
+      return data;
+    };
+    const routeLocation = {
+      params: requestEv.params,
+      url: requestEv.url,
+      isNavigating: false,
+      prevUrl: void 0
+    };
+    const status = requestEv.status();
+    const config = resolveRouteConfig(getData, routeLocation, mods, "", status);
+    const headProps = {
+      head: config.head,
+      status,
+      withLocale: (fn) => fn(),
+      resolveValue: getData,
+      ...routeLocation
+    };
+    const eTag = resolveETag(config.eTag, headProps);
+    if (!eTag) {
+      return;
     }
-  };
-}
-function loadersMiddleware(routeLoaders) {
-  return async (requestEvent) => {
-    const requestEv = requestEvent;
-    if (requestEv.headersSent) {
-      requestEv.exit();
+    requestEv.headers.set("ETag", eTag);
+    const ifNoneMatch = requestEv.request.headers.get("If-None-Match");
+    if (ifNoneMatch && (ifNoneMatch === eTag || ifNoneMatch === `W/${eTag}` || `W/${ifNoneMatch}` === eTag)) {
+      requestEv.status(304);
+      requestEv.send(304, "");
       return;
     }
-    const loaders = getRequestLoaders(requestEv);
-    if (routeLoaders.length > 0) {
-      const resolvedLoadersPromises = routeLoaders.map(
-        (loader) => getRouteLoaderPromise(loader, loaders, requestEv)
-      );
-      await Promise.all(resolvedLoadersPromises);
+    if (MAX_CACHE_SIZE <= 0) {
+      return;
     }
-  };
-}
-async function getRouteLoaderPromise(loader, loaders, requestEv) {
-  const loaderId = loader.__id;
-  loaders[loaderId] = runValidators(
-    requestEv,
-    loader.__validators,
-    void 0
-    // data
-  ).then((res) => {
-    if (res.success) {
-      if (isDev) {
-        return measure(
-          requestEv,
-          loader.__qrl.getHash(),
-          () => loader.__qrl.call(requestEv, requestEv)
-        );
-      } else {
-        return loader.__qrl.call(requestEv, requestEv);
-      }
-    } else {
-      return requestEv.fail(res.status ?? 500, res.error);
+    const cacheKey = resolveCacheKey(config.cacheKey, status, eTag, requestEv.url.pathname);
+    if (!cacheKey) {
+      return;
     }
-  }).then((resolvedLoader) => {
-    if (typeof resolvedLoader === "function") {
-      loaders[loaderId] = resolvedLoader();
-    } else {
-      if (isDev) {
-        verifySerializable(resolvedLoader, loader.__qrl);
-      }
-      loaders[loaderId] = resolvedLoader;
+    const cachedHtml = getCachedHtml(cacheKey);
+    if (cachedHtml) {
+      requestEv.headers.set("Content-Type", "text/html; charset=utf-8");
+      requestEv.headers.set("X-SSR-Cache", "HIT");
+      requestEv.send(status, cachedHtml);
+      return;
     }
-    return resolvedLoader;
-  });
-  const loadersSerializationStrategy = getRequestLoaderSerializationStrategyMap(requestEv);
-  loadersSerializationStrategy.set(loaderId, loader.__serializationStrategy);
-  return loaders[loaderId];
-}
-async function runValidators(requestEv, validators, data) {
-  let lastResult = {
-    success: true,
-    data
+    requestEv.sharedMap.set(RequestEvETagCacheKey, cacheKey);
   };
-  if (validators) {
-    for (const validator of validators) {
-      if (isDev) {
-        lastResult = await measure(
-          requestEv,
-          `validator$`,
-          () => validator.validate(requestEv, data)
-        );
-      } else {
-        lastResult = await validator.validate(requestEv, data);
-      }
-      if (!lastResult.success) {
-        return lastResult;
-      } else {
-        data = lastResult.data;
-      }
-    }
-  }
-  return lastResult;
-}
-function isAsyncIterator(obj) {
-  return obj ? typeof obj === "object" && Symbol.asyncIterator in obj : false;
 }
-async function runServerFunction(ev) {
-  const serverFnHash = ev.query.get(QFN_KEY);
-  if (serverFnHash && ev.request.headers.get("X-QRL") === serverFnHash && ev.request.headers.get("Content-Type") === "application/qwik-json") {
-    ev.exit();
-    const data = await ev.parseBody();
-    if (!Array.isArray(data) || !(Array.isArray(data[0]) || data[0] === void 0)) {
-      throw ev.error(500, "Invalid request");
-    }
-    const qrl = inlinedQrl(null, serverFnHash, data.slice(1));
-    let result;
+function serverErrorMiddleware(route, renderHandler) {
+  return async (requestEv) => {
     try {
-      if (isDev) {
-        result = await measure(
-          ev,
-          `server_${serverFnHash}`,
-          () => qrl.apply(ev, data[0])
-        );
-      } else {
-        result = await qrl.apply(ev, data[0]);
+      await requestEv.next();
+    } catch (e) {
+      if (!(e instanceof ServerError$1) || requestEv.headersSent) {
+        throw e;
       }
-    } catch (err) {
-      if (err instanceof ServerError$1) {
-        throw ev.error(err.status, err.data);
+      if (requestEv.sharedMap.has(IsQData)) {
+        throw e;
       }
-      console.error(`Server function ${serverFnHash} failed:`, err);
-      throw ev.error(500, "Invalid request");
-    }
-    if (isAsyncIterator(result)) {
-      ev.headers.set("Content-Type", "text/qwik-json-stream");
-      const writable = ev.getWritableStream();
-      const stream = writable.getWriter();
-      for await (const item of result) {
-        if (isDev) {
-          verifySerializable(item, qrl);
-        }
-        const message = await _serialize(item);
-        if (ev.signal.aborted) {
-          break;
-        }
-        await stream.write(encoder.encode(`${message}
-`));
+      const accept = requestEv.request.headers.get("Accept");
+      if (accept && !accept.includes("text/html")) {
+        throw e;
       }
-      stream.close();
-    } else {
-      verifySerializable(result, qrl);
-      ev.headers.set("Content-Type", "application/qwik-json");
-      const message = await _serialize(result);
-      ev.send(200, message);
+      const status = e.status;
+      requestEv.status(status);
+      const errorLoader = route.$errorLoader$;
+      const errorModule = errorLoader ? await errorLoader() : await import('../../chunks/http-error.qwik.mjs');
+      route.$mods$ = [
+        errorModule
+      ];
+      requestEv.sharedMap.set(RequestEvHttpStatusMessage, typeof e.data === "string" ? e.data : "Server Error");
+      await renderHandler(requestEv);
     }
-    return;
-  }
+  };
+}
+function isAsyncIterator(obj) {
+  return obj ? typeof obj === "object" && Symbol.asyncIterator in obj : false;
 }
 function fixTrailingSlash(ev) {
   const { basePathname, originalUrl, sharedMap } = ev;
@@ -1070,10 +1020,7 @@ function fixTrailingSlash(ev) {
       }
     } else {
       if (pathname.endsWith("/")) {
-        throw ev.redirect(
-          HttpStatus.MovedPermanently,
-          pathname.slice(0, pathname.length - 1) + search
-        );
+        throw ev.redirect(HttpStatus.MovedPermanently, pathname.slice(0, pathname.length - 1) + search);
       }
     }
   }
@@ -1110,36 +1057,6 @@ function getPathname(url) {
   return `${url.pathname}${search ? `?${search}` : ""}${url.hash}`;
 }
 const encoder = /* @__PURE__ */ new TextEncoder();
-function csrfLaxProtoCheckMiddleware(requestEv) {
-  checkCSRF(requestEv, "lax-proto");
-}
-function csrfCheckMiddleware(requestEv) {
-  checkCSRF(requestEv);
-}
-function checkCSRF(requestEv, laxProto) {
-  const contentType = requestEv.request.headers.get("content-type");
-  const isSimpleRequest = !contentType || isContentType(
-    requestEv.request.headers,
-    "application/x-www-form-urlencoded",
-    "multipart/form-data",
-    "text/plain"
-  );
-  if (isSimpleRequest) {
-    const inputOrigin = requestEv.request.headers.get("origin");
-    const origin = requestEv.url.origin;
-    let forbidden = inputOrigin !== origin;
-    if (forbidden && laxProto && inputOrigin?.replace(/^http(s)?/g, "") === origin.replace(/^http(s)?/g, "")) {
-      forbidden = false;
-    }
-    if (forbidden) {
-      throw requestEv.error(
-        403,
-        `CSRF check failed. Cross-site ${requestEv.method} form submissions are forbidden.
-The request origin "${inputOrigin}" does not match the server origin "${origin}".`
-      );
-    }
-  }
-}
 function renderQwikMiddleware(render) {
   return async (requestEv) => {
     if (requestEv.headersSent) {
@@ -1154,10 +1071,25 @@ function renderQwikMiddleware(render) {
     if (!responseHeaders.has("Content-Type")) {
       responseHeaders.set("Content-Type", "text/html; charset=utf-8");
     }
+    const eTagCacheKey = requestEv.sharedMap.get(RequestEvETagCacheKey);
     const { readable, writable } = new TextEncoderStream();
     const writableStream = requestEv.getWritableStream();
-    const pipe = readable.pipeTo(writableStream, { preventClose: true });
-    const stream = writable.getWriter();
+    let cacheChunks;
+    let pipeSource = readable;
+    if (eTagCacheKey) {
+      cacheChunks = [];
+      const capture = new TransformStream({
+        transform(chunk, controller) {
+          cacheChunks.push(chunk);
+          controller.enqueue(chunk);
+        }
+      });
+      pipeSource = readable.pipeThrough(capture);
+    }
+    const pipe = pipeSource.pipeTo(writableStream, {
+      preventClose: true
+    });
+    const stream = writable.getWriter();
     const status = requestEv.status();
     try {
       const isStatic = getRequestMode(requestEv) === "static";
@@ -1186,35 +1118,19 @@ function renderQwikMiddleware(render) {
       await stream.close();
       await pipe;
     }
+    if (eTagCacheKey && cacheChunks && cacheChunks.length > 0) {
+      const totalLength = cacheChunks.reduce((sum, chunk) => sum + chunk.length, 0);
+      const combined = new Uint8Array(totalLength);
+      let offset = 0;
+      for (const chunk of cacheChunks) {
+        combined.set(chunk, offset);
+        offset += chunk.length;
+      }
+      setCachedHtml(eTagCacheKey, new TextDecoder().decode(combined));
+    }
     await writableStream.close();
   };
 }
-async function handleQDataRedirect(requestEv) {
-  try {
-    await requestEv.next();
-  } catch (err) {
-    if (!(err instanceof RedirectMessage$1)) {
-      throw err;
-    }
-  }
-  if (requestEv.headersSent) {
-    return;
-  }
-  const status = requestEv.status();
-  const location = requestEv.headers.get("Location");
-  const isRedirect = status >= 301 && status <= 308 && location;
-  if (isRedirect) {
-    const adaptedLocation = makeQDataPath(location);
-    if (adaptedLocation) {
-      requestEv.headers.set("Location", adaptedLocation);
-      requestEv.getWritableStream().close();
-      return;
-    } else {
-      requestEv.status(200);
-      requestEv.headers.delete("Location");
-    }
-  }
-}
 async function renderQData(requestEv) {
   await requestEv.next();
   if (requestEv.headersSent || requestEv.exited) {
@@ -1266,6 +1182,32 @@ function makeQDataPath(href) {
     return void 0;
   }
 }
+async function handleQDataRedirect(requestEv) {
+  try {
+    await requestEv.next();
+  } catch (err) {
+    if (!(err instanceof RedirectMessage$1)) {
+      throw err;
+    }
+  }
+  if (requestEv.headersSent) {
+    return;
+  }
+  const status = requestEv.status();
+  const location = requestEv.headers.get("Location");
+  const isRedirect = status >= 301 && status <= 308 && location;
+  if (isRedirect) {
+    const adaptedLocation = makeQDataPath(location);
+    if (adaptedLocation) {
+      requestEv.headers.set("Location", adaptedLocation);
+      requestEv.getWritableStream().close();
+      return;
+    } else {
+      requestEv.status(200);
+      requestEv.headers.delete("Location");
+    }
+  }
+}
 function now() {
   return typeof performance !== "undefined" ? performance.now() : 0;
 }
@@ -1279,7 +1221,165 @@ async function measure(requestEv, name, fn) {
     if (!measurements) {
       requestEv.sharedMap.set(RequestEvShareServerTiming, measurements = []);
     }
-    measurements.push([name, duration]);
+    measurements.push([
+      name,
+      duration
+    ]);
+  }
+}
+async function runValidators(requestEv, validators, data) {
+  let lastResult = {
+    success: true,
+    data
+  };
+  if (validators) {
+    for (const validator of validators) {
+      if (isDev) {
+        lastResult = await measure(requestEv, `validator$`, () => validator.validate(requestEv, data));
+      } else {
+        lastResult = await validator.validate(requestEv, data);
+      }
+      if (!lastResult.success) {
+        return lastResult;
+      } else {
+        data = lastResult.data;
+      }
+    }
+  }
+  return lastResult;
+}
+function actionsMiddleware(routeActions) {
+  return async (requestEvent) => {
+    const requestEv = requestEvent;
+    if (requestEv.headersSent) {
+      requestEv.exit();
+      return;
+    }
+    const { method } = requestEv;
+    const loaders = getRequestLoaders(requestEv);
+    if (isDev && method === "GET") {
+      if (requestEv.query.has(QACTION_KEY)) {
+        console.warn('Seems like you are submitting a Qwik Action via GET request. Qwik Actions should be submitted via POST request.\nMake sure your <form> has method="POST" attribute, like this: <form method="POST">');
+      }
+    }
+    if (method === "POST") {
+      const selectedActionId = requestEv.query.get(QACTION_KEY);
+      if (selectedActionId) {
+        const serverActionsMap = globalThis._qwikActionsMap;
+        const action = routeActions.find((action2) => action2.__id === selectedActionId) ?? serverActionsMap?.get(selectedActionId);
+        if (action) {
+          requestEv.sharedMap.set(RequestEvSharedActionId, selectedActionId);
+          const data = await requestEv.parseBody();
+          if (!data || typeof data !== "object") {
+            throw new Error(`Expected request data for the action id ${selectedActionId} to be an object`);
+          }
+          const result = await runValidators(requestEv, action.__validators, data);
+          if (!result.success) {
+            loaders[selectedActionId] = requestEv.fail(result.status ?? 500, result.error);
+          } else {
+            const actionResolved = isDev ? await measure(requestEv, action.__qrl.getHash(), () => action.__qrl.call(requestEv, result.data, requestEv)) : await action.__qrl.call(requestEv, result.data, requestEv);
+            if (isDev) {
+              verifySerializable(actionResolved, action.__qrl);
+            }
+            loaders[selectedActionId] = actionResolved;
+          }
+        }
+      }
+    }
+  };
+}
+async function getRouteLoaderPromise(loader, loaders, requestEv) {
+  const loaderId = loader.__id;
+  loaders[loaderId] = runValidators(
+    requestEv,
+    loader.__validators,
+    void 0
+    // data
+  ).then((res) => {
+    if (res.success) {
+      if (isDev) {
+        return measure(requestEv, loader.__qrl.getHash(), () => loader.__qrl.call(requestEv, requestEv));
+      } else {
+        return loader.__qrl.call(requestEv, requestEv);
+      }
+    } else {
+      return requestEv.fail(res.status ?? 500, res.error);
+    }
+  }).then((resolvedLoader) => {
+    if (typeof resolvedLoader === "function") {
+      loaders[loaderId] = resolvedLoader();
+    } else {
+      if (isDev) {
+        verifySerializable(resolvedLoader, loader.__qrl);
+      }
+      loaders[loaderId] = resolvedLoader;
+    }
+    return resolvedLoader;
+  });
+  const loadersSerializationStrategy = getRequestLoaderSerializationStrategyMap(requestEv);
+  loadersSerializationStrategy.set(loaderId, loader.__serializationStrategy);
+  return loaders[loaderId];
+}
+function loadersMiddleware(routeLoaders) {
+  return async (requestEvent) => {
+    const requestEv = requestEvent;
+    if (requestEv.headersSent) {
+      requestEv.exit();
+      return;
+    }
+    const loaders = getRequestLoaders(requestEv);
+    if (routeLoaders.length > 0) {
+      const resolvedLoadersPromises = routeLoaders.map((loader) => getRouteLoaderPromise(loader, loaders, requestEv));
+      await Promise.all(resolvedLoadersPromises);
+    }
+  };
+}
+async function runServerFunction(ev) {
+  const serverFnHash = ev.query.get(QFN_KEY);
+  if (serverFnHash && ev.request.headers.get("X-QRL") === serverFnHash && ev.request.headers.get("Content-Type") === "application/qwik-json") {
+    ev.exit();
+    const data = await ev.parseBody();
+    if (!Array.isArray(data) || !(Array.isArray(data[0]) || data[0] === void 0)) {
+      throw ev.error(500, "Invalid request");
+    }
+    const qrl = inlinedQrl(null, serverFnHash, data.slice(1));
+    let result;
+    try {
+      if (isDev) {
+        result = await measure(ev, `server_${serverFnHash}`, () => qrl.apply(ev, data[0]));
+      } else {
+        result = await qrl.apply(ev, data[0]);
+      }
+    } catch (err) {
+      if (err instanceof ServerError$1) {
+        throw ev.error(err.status, err.data);
+      }
+      console.error(`Server function ${serverFnHash} failed:`, err);
+      throw ev.error(500, "Invalid request");
+    }
+    if (isAsyncIterator(result)) {
+      ev.headers.set("Content-Type", "text/qwik-json-stream");
+      const writable = ev.getWritableStream();
+      const stream = writable.getWriter();
+      for await (const item of result) {
+        if (isDev) {
+          verifySerializable(item, qrl);
+        }
+        const message = await _serialize(item);
+        if (ev.signal.aborted) {
+          break;
+        }
+        await stream.write(encoder.encode(`${message}
+`));
+      }
+      stream.close();
+    } else {
+      verifySerializable(result, qrl);
+      ev.headers.set("Content-Type", "application/qwik-json");
+      const message = await _serialize(result);
+      ev.send(200, message);
+    }
+    return;
   }
 }
 function getContentType(headers) {
@@ -1294,19 +1394,93 @@ function isContentType(headers, ...types) {
   }
   return false;
 }
+function checkCSRF(requestEv, laxProto) {
+  const contentType = requestEv.request.headers.get("content-type");
+  const isSimpleRequest = !contentType || isContentType(requestEv.request.headers, "application/x-www-form-urlencoded", "multipart/form-data", "text/plain");
+  if (isSimpleRequest) {
+    const inputOrigin = requestEv.request.headers.get("origin");
+    const origin = requestEv.url.origin;
+    let forbidden = inputOrigin !== origin;
+    if (forbidden && laxProto && inputOrigin?.replace(/^http(s)?/g, "") === origin.replace(/^http(s)?/g, "")) {
+      forbidden = false;
+    }
+    if (forbidden) {
+      throw requestEv.error(403, `CSRF check failed. Cross-site ${requestEv.method} form submissions are forbidden.
+The request origin "${inputOrigin}" does not match the server origin "${origin}".`);
+    }
+  }
+}
+function csrfLaxProtoCheckMiddleware(requestEv) {
+  checkCSRF(requestEv, "lax-proto");
+}
+function csrfCheckMiddleware(requestEv) {
+  checkCSRF(requestEv);
+}
+const resolveRequestHandlers = (serverPlugins, route, method, checkOrigin, renderHandler, isInternal) => {
+  const routeLoaders = [];
+  const routeActions = [];
+  const requestHandlers = [];
+  const isPageRoute = !!(route && isLastModulePageRoute(route.$mods$));
+  if (isInternal) {
+    requestHandlers.push(handleQDataRedirect);
+  }
+  if (isPageRoute) {
+    requestHandlers.push(serverErrorMiddleware(route, renderHandler));
+  }
+  if (serverPlugins) {
+    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, serverPlugins, isPageRoute, method);
+  }
+  if (route) {
+    const routeModules = route.$mods$;
+    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
+    const routeName = route.$routeName$;
+    if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
+      if (checkOrigin === "lax-proto") {
+        requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
+      } else {
+        requestHandlers.unshift(csrfCheckMiddleware);
+      }
+    }
+    if (isPageRoute) {
+      if (method === "POST" || method === "GET") {
+        requestHandlers.push(runServerFunction);
+      }
+      requestHandlers.push(fixTrailingSlash);
+      if (isInternal) {
+        requestHandlers.push(renderQData);
+      }
+    }
+    if (isPageRoute) {
+      requestHandlers.push((ev) => {
+        ev.sharedMap.set(RequestRouteName, routeName);
+      });
+      requestHandlers.push(actionsMiddleware(routeActions));
+      requestHandlers.push(loadersMiddleware(routeLoaders));
+      requestHandlers.push(eTagMiddleware(route));
+      requestHandlers.push(renderHandler);
+    }
+  }
+  return requestHandlers;
+};
 
 let _asyncRequestStore;
 if (isServer) {
   import('node:async_hooks').then((module) => {
     _asyncRequestStore = new module.AsyncLocalStorage();
   }).catch((err) => {
-    console.warn(
-      "\n=====================\n  Qwik Router Warning:\n    AsyncLocalStorage is not available, continuing without it.\n    This impacts concurrent async server calls, where they lose access to the ServerRequestEv object.\n=====================\n\n",
-      err
-    );
+    console.warn("\n=====================\n  Qwik Router Warning:\n    AsyncLocalStorage is not available, continuing without it.\n    This impacts concurrent async server calls, where they lose access to the ServerRequestEv object.\n=====================\n\n", err);
   });
 }
 let qwikRouterConfigActual;
+async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrigin, renderFn, isInternal) {
+  const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
+  const loadedRoute = await loadRoute(routes, cacheModules, pathname, isInternal);
+  const requestHandlers = resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn), isInternal);
+  return {
+    loadedRoute,
+    requestHandlers
+  };
+}
 async function requestHandler(serverRequestEv, opts) {
   const { render, checkOrigin } = opts;
   let { qwikRouterConfig } = opts;
@@ -1323,58 +1497,15 @@ async function requestHandler(serverRequestEv, opts) {
   if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) {
     return null;
   }
-  const routeAndHandlers = await loadRequestHandlers(
-    qwikRouterConfig,
-    pathname,
-    serverRequestEv.request.method,
-    checkOrigin ?? true,
-    render,
-    isInternal
-  );
-  if (routeAndHandlers) {
-    const [route, requestHandlers] = routeAndHandlers;
-    const rebuildRouteInfo = async (url) => {
-      const { pathname: pathname2 } = getRouteMatchPathname(url.pathname);
-      const routeAndHandlers2 = await loadRequestHandlers(
-        qwikRouterConfig,
-        pathname2,
-        serverRequestEv.request.method,
-        checkOrigin ?? true,
-        render,
-        isInternal
-      );
-      if (routeAndHandlers2) {
-        const [loadedRoute, requestHandlers2] = routeAndHandlers2;
-        return { loadedRoute, requestHandlers: requestHandlers2 };
-      } else {
-        return { loadedRoute: null, requestHandlers: [] };
-      }
-    };
-    return runQwikRouter(
-      serverRequestEv,
-      route,
-      requestHandlers,
-      rebuildRouteInfo,
-      qwikRouterConfig.basePathname
-    );
-  }
-  return null;
-}
-async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrigin, renderFn, isInternal) {
-  const { routes, serverPlugins, menus, cacheModules } = qwikRouterConfig;
-  const route = await loadRoute(routes, menus, cacheModules, pathname, isInternal);
-  const requestHandlers = resolveRequestHandlers(
-    serverPlugins,
-    route,
-    method,
-    checkOrigin,
-    renderQwikMiddleware(renderFn),
-    isInternal
-  );
-  if (requestHandlers.length > 0) {
-    return [route, requestHandlers];
+  const { loadedRoute, requestHandlers } = await loadRequestHandlers(qwikRouterConfig, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+  if (qwikRouterConfig.fallthrough && loadedRoute.$notFound$) {
+    return null;
   }
-  return null;
+  const rebuildRouteInfo = async (url) => {
+    const { pathname: pathname2 } = getRouteMatchPathname(url.pathname);
+    return loadRequestHandlers(qwikRouterConfig, pathname2, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+  };
+  return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, qwikRouterConfig.basePathname);
 }
 
 const notFounds = [
@@ -1390,7 +1521,9 @@ function getNotFound(prefix) {
   return minimalHtmlResponse(404, "Resource Not Found");
 }
 
-const staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
+const staticPaths = /* @__PURE__ */ new Set([
+  "__QWIK_ROUTER_STATIC_PATHS_ARRAY__"
+]);
 function isStaticPath(method, url) {
   if (method.toUpperCase() !== "GET") {
     return false;
@@ -1418,10 +1551,10 @@ function isStaticPath(method, url) {
 }
 
 class ServerError extends Error {
+  status;
+  data;
   constructor(status, data) {
-    super(typeof data === "string" ? data : void 0);
-    this.status = status;
-    this.data = data;
+    super(typeof data === "string" ? data : void 0), this.status = status, this.data = data;
   }
 }
 
@@ -1431,9 +1564,9 @@ class RedirectMessage extends AbortMessage {
 }
 
 class RewriteMessage extends AbortMessage {
+  pathname;
   constructor(pathname) {
-    super();
-    this.pathname = pathname;
+    super(), this.pathname = pathname;
   }
 }
 
@@ -1472,7 +1605,11 @@ class _TextEncoderStream_polyfill {
     },
     flush: (controller) => {
       if (this.#pendingHighSurrogate !== null) {
-        controller.enqueue(new Uint8Array([239, 191, 189]));
+        controller.enqueue(new Uint8Array([
+          239,
+          191,
+          189
+        ]));
       }
     }
   });
@@ -1490,4 +1627,4 @@ class _TextEncoderStream_polyfill {
   }
 }
 
-export { AbortMessage, RedirectMessage, RequestEvShareQData, RewriteMessage, ServerError, _TextEncoderStream_polyfill, _asyncRequestStore, getErrorHtml, getNotFound, isStaticPath, mergeHeadersCookies, requestHandler };
+export { AbortMessage, RedirectMessage, RequestEvShareQData, RewriteMessage, ServerError, _TextEncoderStream_polyfill, _asyncRequestStore, clearSsrCache, getErrorHtml, getNotFound, isStaticPath, mergeHeadersCookies, requestHandler };