@qwik.dev/router 2.0.0-beta.36 → 2.0.0-beta.37

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

@@ -1,73 +1,13 @@
-import { Q as Q_ROUTE, m as resolveRouteConfig, n as QLOADER_KEY, h as QFN_KEY, j as QACTION_KEY, o as isPromise, k as QDATA_KEY, b as loadRoute } from '../../chunks/routing.qwik.mjs';
-import { isDev, _UNINITIALIZED, _deserialize, _verifySerializable, _serialize, _getAsyncLocalStorage } from '@qwik.dev/core/internal';
-import { inlinedQrl } from '@qwik.dev/core';
-import { R as RedirectMessage, A as AbortMessage } from '../../chunks/redirect-handler.mjs';
-import { isServer } from '@qwik.dev/core/build';
+import { n as getRouteLoaderCtx, o as getRouteLoaderValues, i as Q_ROUTE, p as loadRouteLoader, q as setRouteLoaders, S as ServerError, t as RedirectMessage, k as QFN_KEY, Q as QACTION_KEY, A as AbortMessage, l as QDATA_KEY, _ as _asyncRequestStore, F as FULLPATH_HEADER } from '../../chunks/deepFreeze.qwik.mjs';
+import { d as resolveRouteConfig, e as isPromise, l as loadRoute } from '../../chunks/head.qwik.mjs';
+import { I as IsQLoader, Q as QLoaderId, a as QActionId, b as IsQAction, t as trimRecognizedInternalPathname, r as recognizeRequest, c as resolveValidInternalFullPathname, d as trimInternalPathname, L as LOADER_REGEX } from '../../chunks/request-path.mjs';
+import { g as getRequestRoute, a as getRequestMode, R as RequestRouteName, b as RequestEvSharedNonce, c as RequestEvSharedActionId, d as RequestEvSharedActionFormData, e as RequestEvHttpStatusMessage, j as jsonRequestWrapper, l as loaderHandler, f as actionHandler, h as hash, n as normalizeETag, p as performETagMatch, s as setETagHeader, i as setCachedLoader, k as setCachedSsr, r as resolveETag, m as resolveCacheKey, M as MAX_CACHE_SIZE, o as getCachedLoader, q as getCachedSsr, t as defaultLoaderCacheKey, u as defaultSsrCacheKey, v as RequestEvShareServerTiming, w as RequestEvETagCacheKey, x as createRequestEventWithDeps } from '../../chunks/action-handler.mjs';
+export { y as clearLoaderCache, z as clearSsrCache } from '../../chunks/action-handler.mjs';
+import { isDev, inlinedQrl } from '@qwik.dev/core';
+import { _verifySerializable, _serialize, isDev as isDev$1 } from '@qwik.dev/core/internal';
+import { e as ensureSlash } from '../../chunks/pathname.mjs';
 import { g as getErrorHtml, m as minimalHtmlResponse } from '../../chunks/error-handler.mjs';
 
-const IsQData = "@isQData";
-const QDATA_JSON = "/q-data.json";
-function getRouteMatchPathname(pathname) {
-  const isInternal = pathname.endsWith(QDATA_JSON);
-  if (isInternal) {
-    const trimEnd = pathname.length - QDATA_JSON.length + (globalThis.__NO_TRAILING_SLASH__ ? 0 : 1);
-    pathname = pathname.slice(0, trimEnd);
-    if (pathname === "") {
-      pathname = "/";
-    }
-  }
-  return {
-    pathname,
-    isInternal
-  };
-}
-
-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";
@@ -133,457 +73,12 @@ var HttpStatus = /* @__PURE__ */ (function(HttpStatus2) {
   return HttpStatus2;
 })({});
 
-const RequestEvLoaders = /* @__PURE__ */ Symbol("RequestEvLoaders");
-const RequestEvMode = /* @__PURE__ */ Symbol("RequestEvMode");
-const RequestEvRoute = /* @__PURE__ */ Symbol("RequestEvRoute");
-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 (deps, { request, method, query }, sharedMap) => {
-  const type = deps.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(deps.QDATA_KEY)) {
-      const data = query.get(deps.QDATA_KEY);
-      if (data) {
-        try {
-          return _deserialize(decodeURIComponent(data));
-        } catch {
-        }
-      }
-    }
-    return _deserialize(await request.text());
-  }
-  return void 0;
-};
-function createRequestEventWithDeps(deps, serverRequestEv, loadedRoute, requestHandlers, basePathname, resolved) {
-  const { request, platform, env } = serverRequestEv;
-  const sharedMap = /* @__PURE__ */ new Map();
-  const cookie = new deps.Cookie(request.headers.get("cookie"));
-  const headers = new Headers();
-  const url = new URL(request.url);
-  const { pathname, isInternal } = deps.getRouteMatchPathname(url.pathname);
-  if (isInternal) {
-    url.pathname = pathname;
-    sharedMap.set(deps.IsQData, true);
-  }
-  let routeModuleIndex = -1;
-  let writableStream = null;
-  let requestData = void 0;
-  let locale = serverRequestEv.locale;
-  let status = loadedRoute?.$notFound$ ? 404 : 200;
-  const next = async () => {
-    routeModuleIndex++;
-    while (routeModuleIndex < requestHandlers.length) {
-      const moduleRequestHandler = requestHandlers[routeModuleIndex];
-      const result = moduleRequestHandler(requestEv);
-      if (deps.isPromise(result)) {
-        await result;
-      }
-      routeModuleIndex++;
-    }
-  };
-  const resetRoute = (_loadedRoute, _requestHandlers, _url = url) => {
-    loadedRoute = _loadedRoute;
-    status = loadedRoute?.$notFound$ ? 404 : 200;
-    requestHandlers = _requestHandlers;
-    url.pathname = _url.pathname;
-    url.search = _url.search;
-    routeModuleIndex = -1;
-  };
-  const check = () => {
-    if (writableStream !== null) {
-      throw new Error("Response already sent");
-    }
-  };
-  const send = (statusOrResponse, body) => {
-    check();
-    if (typeof statusOrResponse === "number") {
-      status = statusOrResponse;
-      const writableStream2 = requestEv.getWritableStream();
-      const writer = writableStream2.getWriter();
-      writer.write(typeof body === "string" ? deps.encoder.encode(body) : body);
-      writer.close();
-    } else {
-      status = statusOrResponse.status;
-      statusOrResponse.headers.forEach((value, key) => {
-        if (key.toLowerCase() === "set-cookie") {
-          return;
-        }
-        headers.append(key, value);
-      });
-      statusOrResponse.headers.getSetCookie().forEach((ck) => {
-        const index = ck.indexOf("=");
-        if (index === -1) {
-          return;
-        }
-        const key = ck.slice(0, index).trim();
-        const value = ck.slice(index + 1).trim();
-        cookie.set(key, value);
-      });
-      if (statusOrResponse.body) {
-        const writableStream2 = requestEv.getWritableStream();
-        statusOrResponse.body.pipeTo(writableStream2);
-      } else {
-        requestEv.getWritableStream().getWriter().close();
-      }
-    }
-    return exit();
-  };
-  const exit = (message = new deps.AbortMessage()) => {
-    routeModuleIndex = ABORT_INDEX;
-    return message;
-  };
-  const loaders = {};
-  const requestEv = {
-    [RequestEvLoaders]: loaders,
-    [RequestEvLoaderSerializationStrategyMap]: /* @__PURE__ */ new Map(),
-    [RequestEvMode]: serverRequestEv.mode,
-    get [RequestEvRoute]() {
-      return loadedRoute;
-    },
-    cookie,
-    headers,
-    env,
-    method: request.method,
-    signal: request.signal,
-    originalUrl: new URL(url),
-    get params() {
-      return loadedRoute?.$params$ ?? {};
-    },
-    get pathname() {
-      return url.pathname;
-    },
-    platform,
-    get query() {
-      return url.searchParams;
-    },
-    request,
-    url,
-    basePathname,
-    sharedMap,
-    get headersSent() {
-      return writableStream !== null;
-    },
-    get exited() {
-      return routeModuleIndex >= ABORT_INDEX;
-    },
-    get clientConn() {
-      return serverRequestEv.getClientConn();
-    },
-    next,
-    resetRoute,
-    exit,
-    cacheControl: (cacheControl, target = "Cache-Control") => {
-      check();
-      headers.set(target, deps.createCacheControl(cacheControl));
-    },
-    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.");
-        }
-        if (loaders[id] === _UNINITIALIZED) {
-          await deps.getRouteLoaderPromise(loaderOrAction, loaders, requestEv[RequestEvLoaderSerializationStrategyMap], requestEv);
-        }
-      }
-      return loaders[id];
-    },
-    status: (statusCode) => {
-      if (typeof statusCode === "number") {
-        check();
-        status = statusCode;
-        return statusCode;
-      }
-      return status;
-    },
-    locale: (_locale) => {
-      if (typeof _locale === "string") {
-        locale = _locale;
-      }
-      return locale || "";
-    },
-    error: (statusCode, message) => {
-      status = statusCode;
-      headers.delete("Cache-Control");
-      return new deps.ServerError(statusCode, message);
-    },
-    redirect: (statusCode, url2) => {
-      check();
-      status = statusCode;
-      if (url2) {
-        if (
-          // //test.com
-          /^\/\//.test(url2) || // /test//path
-          /([^:])\/\/+/.test(url2)
-        ) {
-          const fixedURL = url2.replace(/^\/\/+/, "/").replace(/([^:])\/\/+/g, "$1/");
-          console.warn(`Redirect URL ${url2} is invalid, fixing to ${fixedURL}`);
-          url2 = fixedURL;
-        }
-        headers.set("Location", url2);
-      }
-      headers.delete("Cache-Control");
-      if (statusCode > 301) {
-        headers.set("Cache-Control", "no-store");
-      }
-      return exit(new deps.RedirectMessage());
-    },
-    rewrite: (pathname2) => {
-      check();
-      if (pathname2.startsWith("http")) {
-        throw new deps.ServerError(400, isDev ? "Rewrite does not support absolute urls" : "Bad Request");
-      }
-      sharedMap.set(RequestEvIsRewrite, true);
-      return exit(new deps.RewriteMessage(pathname2.replace(/\/+/g, "/")));
-    },
-    defer: (returnData) => {
-      return typeof returnData === "function" ? returnData : () => returnData;
-    },
-    fail: (statusCode, data) => {
-      check();
-      status = statusCode;
-      headers.delete("Cache-Control");
-      return {
-        failed: true,
-        ...data
-      };
-    },
-    text: (statusCode, text) => {
-      headers.set("Content-Type", "text/plain; charset=utf-8");
-      return send(statusCode, text);
-    },
-    html: (statusCode, html) => {
-      headers.set("Content-Type", "text/html; charset=utf-8");
-      return send(statusCode, html);
-    },
-    parseBody: async () => {
-      if (requestData !== void 0) {
-        return requestData;
-      }
-      return requestData = parseRequest(deps, requestEv, sharedMap);
-    },
-    json: (statusCode, data) => {
-      headers.set("Content-Type", "application/json; charset=utf-8");
-      return send(statusCode, JSON.stringify(data));
-    },
-    send,
-    isDirty: () => {
-      return writableStream !== null;
-    },
-    getWritableStream: () => {
-      if (writableStream === null) {
-        if (isDev) {
-          const serverTiming = sharedMap.get(RequestEvShareServerTiming);
-          if (serverTiming) {
-            headers.set("Server-Timing", serverTiming.map(([name, duration]) => `${name};dur=${duration}`).join(","));
-          }
-        }
-        writableStream = serverRequestEv.getWritableStream(status, headers, cookie, resolved, requestEv);
-      }
-      return writableStream;
-    }
-  };
-  return requestEv;
-}
-
-function verifySerializable(data, qrl) {
-  try {
-    _verifySerializable(data, void 0);
-  } catch (e) {
-    if (e instanceof Error && qrl.dev) {
-      e.loc = qrl.dev;
-    }
-    throw e;
-  }
-}
-function now() {
-  return typeof performance !== "undefined" ? performance.now() : 0;
-}
-async function measure(requestEv, name, fn) {
-  const start = now();
-  try {
-    return await fn();
-  } finally {
-    const duration = now() - start;
-    let measurements = requestEv.sharedMap.get("@serverTiming");
-    if (!measurements) {
-      requestEv.sharedMap.set("@serverTiming", measurements = []);
-    }
-    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;
-}
-async function getRouteLoaderPromise(loader, loaders, loadersSerializationStrategy, 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;
-  });
-  loadersSerializationStrategy.set(loaderId, loader.__serializationStrategy);
-  return loaders[loaderId];
-}
-
 function getQwikRouterServerDataWithDeps(deps, requestEv) {
   const { params, request, status, locale, originalUrl } = requestEv;
   const requestHeaders = {};
   request.headers.forEach((value, key) => requestHeaders[key] = value);
   const action = requestEv.sharedMap.get(deps.RequestEvSharedActionId);
+  const actionResult = requestEv.sharedMap.get("@actionResult");
   const formData = requestEv.sharedMap.get(deps.RequestEvSharedActionFormData);
   const routeName = requestEv.sharedMap.get(deps.RequestRouteName);
   const nonce = requestEv.sharedMap.get(deps.RequestEvSharedNonce);
@@ -598,8 +93,8 @@ function getQwikRouterServerDataWithDeps(deps, requestEv) {
   if (protocol) {
     reconstructedUrl.protocol = protocol;
   }
-  const loaders = deps.getRequestLoaders(requestEv);
-  const loadersSerializationStrategy = deps.getRequestLoaderSerializationStrategyMap(requestEv);
+  const routeLoaderCtx = getRouteLoaderCtx(requestEv);
+  const loaderValues = getRouteLoaderValues(requestEv);
   return {
     url: reconstructedUrl.href,
     requestHeaders,
@@ -616,12 +111,13 @@ function getQwikRouterServerDataWithDeps(deps, requestEv) {
         ...params
       },
       loadedRoute: deps.getRequestRoute(requestEv),
+      routeLoaderCtx,
+      loaderValues,
       response: {
         status: status(),
         statusMessage: requestEv.sharedMap.get(deps.RequestEvHttpStatusMessage),
-        loaders,
-        loadersSerializationStrategy,
         action,
+        actionResult,
         formData
       }
     }
@@ -635,8 +131,6 @@ const responsePageDeps = {
   RequestEvSharedActionId,
   RequestEvSharedNonce,
   RequestRouteName,
-  getRequestLoaders,
-  getRequestLoaderSerializationStrategyMap,
   getRequestMode,
   getRequestRoute
 };
@@ -645,22 +139,20 @@ function getQwikRouterServerData(...args) {
 }
 
 function createResolveRequestHandlers(deps) {
-  const resolveRequestHandlers = (serverPlugins, route, method, checkOrigin, renderHandler, isInternal) => {
+  const resolveRequestHandlers = (serverPlugins, route, method, checkOrigin, renderHandler) => {
     const routeLoaders = [];
     const routeActions = [];
     const requestHandlers = [];
     const isPageRoute = !!isLastModulePageRoute(route.$mods$);
-    if (isInternal) {
-      requestHandlers.push(handleQDataRedirect);
-    }
     if (isPageRoute) {
+      requestHandlers.push(jsonRequestWrapper());
       requestHandlers.push(serverErrorMiddleware(route, renderHandler));
     }
     if (serverPlugins) {
       _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, serverPlugins, isPageRoute, method);
     }
     const routeModules = route.$mods$;
-    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
+    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method, isPageRoute);
     const routeName = route.$routeName$;
     if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
       if (checkOrigin === "lax-proto") {
@@ -670,70 +162,32 @@ function createResolveRequestHandlers(deps) {
       }
     }
     if (isPageRoute) {
+      requestHandlers.push(loaderHandler(routeLoaders, route.$loaderPaths$));
+      requestHandlers.push(actionHandler(routeActions));
       if (method === "POST" || method === "GET") {
         requestHandlers.push(runServerFunction);
       }
       if (!route.$notFound$) {
         requestHandlers.push(fixTrailingSlash);
       }
-      if (isInternal) {
-        requestHandlers.push(renderQData);
-      }
     }
     if (isPageRoute) {
       requestHandlers.push((ev) => {
         ev.sharedMap.set(deps.RequestRouteName, routeName);
       });
       requestHandlers.push(actionsMiddleware(routeActions));
-      requestHandlers.push(loadersMiddleware(routeLoaders));
+      requestHandlers.push(loadersMiddleware(routeLoaders, route));
       requestHandlers.push(eTagMiddleware(route));
       requestHandlers.push(renderHandler);
     }
     return requestHandlers;
   };
-  const _resolveRequestHandlers = (routeLoaders, routeActions, requestHandlers, routeModules, collectActions, method) => {
-    for (const routeModule of routeModules) {
-      if (typeof routeModule.onRequest === "function") {
-        requestHandlers.push(routeModule.onRequest);
-      } else if (Array.isArray(routeModule.onRequest)) {
-        requestHandlers.push(...routeModule.onRequest);
-      }
-      let methodReqHandler;
-      switch (method) {
-        case "GET": {
-          methodReqHandler = routeModule.onGet;
-          break;
-        }
-        case "POST": {
-          methodReqHandler = routeModule.onPost;
-          break;
-        }
-        case "PUT": {
-          methodReqHandler = routeModule.onPut;
-          break;
-        }
-        case "PATCH": {
-          methodReqHandler = routeModule.onPatch;
-          break;
-        }
-        case "DELETE": {
-          methodReqHandler = routeModule.onDelete;
-          break;
-        }
-        case "OPTIONS": {
-          methodReqHandler = routeModule.onOptions;
-          break;
-        }
-        case "HEAD": {
-          methodReqHandler = routeModule.onHead;
-          break;
-        }
-      }
-      if (typeof methodReqHandler === "function") {
-        requestHandlers.push(methodReqHandler);
-      } else if (Array.isArray(methodReqHandler)) {
-        requestHandlers.push(...methodReqHandler);
-      }
+  function _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, collectActions, method, guardPageHandlersForLoader = false) {
+    for (let i = 0; i < routeModules.length; i++) {
+      const routeModule = routeModules[i];
+      const moduleHandlers = getModuleRequestHandlers(routeModule, method);
+      const shouldGuardPageHandlers = guardPageHandlersForLoader && i === routeModules.length - 1;
+      requestHandlers.push(...shouldGuardPageHandlers ? moduleHandlers.map((handler) => guardPageHandlerForLoader(routeModule, handler)) : moduleHandlers);
       if (collectActions) {
         for (const module of Object.values(routeModule)) {
           if (typeof module === "function") {
@@ -746,7 +200,73 @@ function createResolveRequestHandlers(deps) {
         }
       }
     }
-  };
+  }
+  function getModuleRequestHandlers(routeModule, method) {
+    const handlers = [];
+    addRequestHandlers(handlers, routeModule.onRequest);
+    let methodReqHandler;
+    switch (method) {
+      case "GET": {
+        methodReqHandler = routeModule.onGet;
+        break;
+      }
+      case "POST": {
+        methodReqHandler = routeModule.onPost;
+        break;
+      }
+      case "PUT": {
+        methodReqHandler = routeModule.onPut;
+        break;
+      }
+      case "PATCH": {
+        methodReqHandler = routeModule.onPatch;
+        break;
+      }
+      case "DELETE": {
+        methodReqHandler = routeModule.onDelete;
+        break;
+      }
+      case "OPTIONS": {
+        methodReqHandler = routeModule.onOptions;
+        break;
+      }
+      case "HEAD": {
+        methodReqHandler = routeModule.onHead;
+        break;
+      }
+    }
+    addRequestHandlers(handlers, methodReqHandler);
+    return handlers;
+  }
+  function addRequestHandlers(handlers, handler) {
+    if (typeof handler === "function") {
+      handlers.push(handler);
+    } else if (Array.isArray(handler)) {
+      handlers.push(...handler);
+    }
+  }
+  function guardPageHandlerForLoader(routeModule, handler) {
+    return (requestEv) => {
+      if (requestEv.sharedMap.has(IsQLoader)) {
+        const loaderId = requestEv.sharedMap.get(QLoaderId);
+        if (!moduleHasLoader(routeModule, loaderId)) {
+          return;
+        }
+      }
+      return handler(requestEv);
+    };
+  }
+  function moduleHasLoader(routeModule, loaderId) {
+    if (typeof loaderId !== "string") {
+      return false;
+    }
+    for (const value of Object.values(routeModule)) {
+      if (checkBrand(value, "server_loader") && value.__id === loaderId) {
+        return true;
+      }
+    }
+    return false;
+  }
   const checkBrand = (obj, brand) => {
     return obj && typeof obj === "function" && obj.__brand === brand;
   };
@@ -758,7 +278,6 @@ function createResolveRequestHandlers(deps) {
         return;
       }
       const { method } = requestEv;
-      const loaders = deps.getRequestLoaders(requestEv);
       if (isDev && method === "GET") {
         if (requestEv.query.has(deps.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">');
@@ -776,66 +295,79 @@ function createResolveRequestHandlers(deps) {
               throw new Error(`Expected request data for the action id ${selectedActionId} to be an object`);
             }
             const result = await runValidators(requestEv, action.__validators, data);
+            let actionResult;
             if (!result.success) {
-              loaders[selectedActionId] = requestEv.fail(result.status ?? 500, result.error);
+              actionResult = 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;
+              actionResult = actionResolved;
             }
+            requestEv.sharedMap.set("@actionResult", actionResult);
           }
         }
       }
     };
   }
-  function loadersMiddleware(routeLoaders) {
+  function loadersMiddleware(routeLoaders, route) {
     return async (requestEvent) => {
       const requestEv = requestEvent;
       if (requestEv.headersSent) {
         requestEv.exit();
         return;
       }
-      const loaders = deps.getRequestLoaders(requestEv);
-      const loadersSerializationStrategy = deps.getRequestLoaderSerializationStrategyMap(requestEv);
       if (routeLoaders.length > 0) {
-        const resolvedLoadersPromises = routeLoaders.map((loader) => deps.getRouteLoaderPromise(loader, loaders, loadersSerializationStrategy, requestEv));
-        await Promise.all(resolvedLoadersPromises);
+        setLoaderData(requestEv, routeLoaders, route);
+        const loaderValues = getRouteLoaderValues(requestEv);
+        await Promise.all(routeLoaders.map(async (loader) => {
+          loaderValues[loader.__id] = await loadRouteLoader(loader, requestEv);
+        }));
       }
     };
   }
+  function setLoaderData(requestEv, routeLoaders, route) {
+    if (routeLoaders.length === 0) {
+      return;
+    }
+    const routeLoaderCtx = getRouteLoaderCtx(requestEv);
+    if (route.$loaderPaths$) {
+      Object.assign(routeLoaderCtx.loaderPaths, route.$loaderPaths$);
+    }
+    setRouteLoaders(requestEv, routeLoaders);
+  }
   function eTagMiddleware(route) {
     return (requestEv) => {
       if (requestEv.headersSent) {
         return;
       }
-      if (requestEv.method !== "GET" || requestEv.sharedMap.has(deps.IsQData)) {
+      if (requestEv.method !== "GET") {
         return;
       }
       const mods = route.$mods$;
-      const hasETag = mods.some((m) => {
+      const hasCachingConfig = mods.some((m) => {
         if (!m) {
           return false;
         }
         if (m.routeConfig) {
-          return typeof m.routeConfig === "function" || m.routeConfig.eTag !== void 0;
+          return typeof m.routeConfig === "function" || m.routeConfig.eTag !== void 0 || m.routeConfig.cacheKey !== void 0;
         }
-        return m.eTag !== void 0;
+        return m.eTag !== void 0 || m.cacheKey !== void 0;
       });
-      if (!hasETag) {
+      if (!hasCachingConfig) {
         return;
       }
-      const loaders = deps.getRequestLoaders(requestEv);
+      const loaderValues = getRouteLoaderValues(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.");
-        }
-        if (loaders[id] instanceof Promise) {
-          throw new Error("Loaders returning a promise cannot be resolved for the eTag function.");
+        if (loaderOrAction.__brand === "server_loader") {
+          if (!(id in loaderValues)) {
+            throw new Error("Loader not executed for this request.");
+          }
+          return loaderValues[id];
         }
-        return loaders[id];
+        return requestEv.sharedMap.get(deps.RequestEvSharedActionId) === id ? requestEv.sharedMap.get("@actionResult") : void 0;
       };
       const routeLocation = {
         params: requestEv.params,
@@ -852,32 +384,36 @@ function createResolveRequestHandlers(deps) {
         resolveValue: getData,
         ...routeLocation
       };
-      const eTag = deps.resolveETag(config.eTag, headProps);
-      if (!eTag) {
-        return;
-      }
-      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, "");
+      const resolvedETag = deps.resolveETag(config.eTag, headProps);
+      const normalizedETag = resolvedETag !== null ? normalizeETag(resolvedETag) : "";
+      if (normalizedETag && performETagMatch(requestEv, normalizedETag)) {
         return;
       }
       if (deps.MAX_CACHE_SIZE <= 0) {
         return;
       }
-      const cacheKey = deps.resolveCacheKey(config.cacheKey, status, eTag, requestEv.url.pathname);
+      const cacheKey = deps.resolveCacheKey(config.cacheKey, deps.defaultSsrCacheKey, requestEv, normalizedETag);
       if (!cacheKey) {
         return;
       }
-      const cachedHtml = deps.getCachedHtml(cacheKey);
-      if (cachedHtml) {
+      const cached = deps.getCachedSsr(cacheKey);
+      if (cached) {
         requestEv.headers.set("Content-Type", "text/html; charset=utf-8");
         requestEv.headers.set("X-SSR-Cache", "HIT");
-        requestEv.send(status, cachedHtml);
+        if (!normalizedETag) {
+          if (performETagMatch(requestEv, cached.eTag)) {
+            return;
+          }
+        } else {
+          setETagHeader(requestEv, cached.eTag);
+        }
+        requestEv.send(status, cached.body);
         return;
       }
-      requestEv.sharedMap.set(deps.RequestEvETagCacheKey, cacheKey);
+      requestEv.sharedMap.set(deps.RequestEvETagCacheKey, {
+        key: cacheKey,
+        eTag: normalizedETag
+      });
     };
   }
   function serverErrorMiddleware(route, renderHandler) {
@@ -888,9 +424,6 @@ function createResolveRequestHandlers(deps) {
         if (!(e instanceof deps.ServerError) || requestEv.headersSent) {
           throw e;
         }
-        if (requestEv.sharedMap.has(deps.IsQData)) {
-          throw e;
-        }
         const accept = requestEv.request.headers.get("Accept");
         if (accept && !accept.includes("text/html")) {
           throw e;
@@ -980,16 +513,15 @@ function createResolveRequestHandlers(deps) {
     }
   }
   function fixTrailingSlash(ev) {
-    const { basePathname, originalUrl, sharedMap } = ev;
+    const { basePathname, originalUrl } = ev;
     const { pathname, search } = originalUrl;
-    const isQData = sharedMap.has(deps.IsQData);
     if (!pathname.startsWith("/") || pathname.startsWith("//")) {
       return;
     }
-    if (!isQData && pathname !== basePathname && !pathname.endsWith(".html")) {
+    if (pathname !== basePathname && !pathname.endsWith(".html")) {
       if (!globalThis.__NO_TRAILING_SLASH__) {
         if (!pathname.endsWith("/")) {
-          throw ev.redirect(deps.HttpStatus.MovedPermanently, pathname + "/" + search);
+          throw ev.redirect(deps.HttpStatus.MovedPermanently, ensureSlash(pathname) + search);
         }
       } else {
         if (pathname.endsWith("/")) {
@@ -1017,12 +549,9 @@ function createResolveRequestHandlers(deps) {
   }
   function getPathname(url) {
     url = new URL(url);
-    if (url.pathname.endsWith(deps.QDATA_JSON)) {
-      url.pathname = url.pathname.slice(0, -deps.QDATA_JSON.length);
-    }
     if (!globalThis.__NO_TRAILING_SLASH__) {
       if (!url.pathname.endsWith("/")) {
-        url.pathname += "/";
+        url.pathname = ensureSlash(url.pathname);
       }
     } else {
       if (url.pathname.endsWith("/")) {
@@ -1059,19 +588,16 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
       if (requestEv.headersSent) {
         return;
       }
-      if (requestEv.sharedMap.has(deps.IsQData)) {
-        return;
-      }
       const responseHeaders = requestEv.headers;
       if (!responseHeaders.has("Content-Type")) {
         responseHeaders.set("Content-Type", "text/html; charset=utf-8");
       }
-      const eTagCacheKey = requestEv.sharedMap.get(deps.RequestEvETagCacheKey);
+      const cachePlan = requestEv.sharedMap.get(deps.RequestEvETagCacheKey);
       const { readable, writable } = new TextEncoderStream();
       const writableStream = requestEv.getWritableStream();
       let cacheChunks;
       let pipeSource = readable;
-      if (eTagCacheKey) {
+      if (cachePlan) {
         cacheChunks = [];
         const capture = new TransformStream({
           transform(chunk, controller) {
@@ -1088,7 +614,6 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
         pipeError = error;
       });
       const stream = writable.getWriter();
-      const status = requestEv.status();
       try {
         const isStatic = deps.getRequestMode(requestEv) === "static";
         const serverData = deps.getQwikRouterServerData(requestEv);
@@ -1104,16 +629,9 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
             ...serverData.containerAttributes
           }
         });
-        const qData = {
-          loaders: deps.getRequestLoaders(requestEv),
-          action: requestEv.sharedMap.get(deps.RequestEvSharedActionId),
-          status: status !== 200 ? status : 200,
-          href: getPathname(requestEv.url)
-        };
         if (typeof result.html === "string") {
           await stream.write(result.html);
         }
-        requestEv.sharedMap.set(deps.RequestEvShareQData, qData);
       } finally {
         await stream.ready;
         await stream.close();
@@ -1122,7 +640,7 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
       if (pipeError) {
         throw pipeError;
       }
-      if (eTagCacheKey && cacheChunks && cacheChunks.length > 0) {
+      if (cachePlan && cacheChunks && cacheChunks.length > 0) {
         const totalLength = cacheChunks.reduce((sum, chunk) => sum + chunk.length, 0);
         const combined = new Uint8Array(totalLength);
         let offset = 0;
@@ -1130,86 +648,16 @@ The request origin "${inputOrigin}" does not match the server origin "${origin}"
           combined.set(chunk, offset);
           offset += chunk.length;
         }
-        deps.setCachedHtml(eTagCacheKey, new TextDecoder().decode(combined));
+        const html = new TextDecoder().decode(combined);
+        const cachedETag = cachePlan.eTag || hash(html);
+        deps.setCachedSsr(cachePlan.key, {
+          eTag: cachedETag,
+          body: html
+        });
       }
       await writableStream.close();
     };
   }
-  async function handleQDataRedirect(requestEv) {
-    try {
-      await requestEv.next();
-    } catch (err) {
-      if (!(err instanceof deps.RedirectMessage)) {
-        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) {
-      return;
-    }
-    const status = requestEv.status();
-    const redirectLocation = requestEv.headers.get("Location");
-    requestEv.headers.set("Content-Type", "application/json; charset=utf-8");
-    let loaders = deps.getRequestLoaders(requestEv);
-    const selectedLoaderIds = requestEv.query.getAll(deps.QLOADER_KEY);
-    const hasCustomLoaders = selectedLoaderIds.length > 0;
-    if (hasCustomLoaders) {
-      const selectedLoaders = {};
-      for (const loaderId of selectedLoaderIds) {
-        const loader = loaders[loaderId];
-        selectedLoaders[loaderId] = loader;
-      }
-      loaders = selectedLoaders;
-    }
-    const qData = hasCustomLoaders ? {
-      loaders,
-      status: status !== 200 ? status : 200,
-      href: getPathname(requestEv.url)
-    } : {
-      loaders,
-      action: requestEv.sharedMap.get(deps.RequestEvSharedActionId),
-      status: status !== 200 ? status : 200,
-      href: getPathname(requestEv.url),
-      redirect: redirectLocation ?? void 0,
-      isRewrite: requestEv.sharedMap.get(deps.RequestEvIsRewrite)
-    };
-    const writer = requestEv.getWritableStream().getWriter();
-    const data = await _serialize(qData);
-    writer.write(deps.encoder.encode(data));
-    requestEv.sharedMap.set(deps.RequestEvShareQData, qData);
-    writer.close();
-  }
-  function makeQDataPath(href) {
-    if (href.startsWith("/")) {
-      if (!href.includes(deps.QDATA_JSON)) {
-        const url = new URL(href, "http://localhost");
-        const pathname = url.pathname.endsWith("/") ? url.pathname.slice(0, -1) : url.pathname;
-        return pathname + deps.QDATA_JSON + url.search;
-      }
-      return href;
-    } else {
-      return void 0;
-    }
-  }
   function now() {
     return typeof performance !== "undefined" ? performance.now() : 0;
   }
@@ -1259,24 +707,11 @@ function isContentType(headers, ...types) {
   return false;
 }
 
-class ServerError extends Error {
-  status;
-  data;
-  constructor(status, data) {
-    super(typeof data === "string" ? data : void 0), this.status = status, this.data = data;
-  }
-}
-
 const requestHandlers = createResolveRequestHandlers({
   QACTION_KEY,
   QFN_KEY,
-  QLOADER_KEY,
-  QDATA_JSON,
-  IsQData,
   RequestEvETagCacheKey,
   RequestEvHttpStatusMessage,
-  RequestEvIsRewrite,
-  RequestEvShareQData,
   RequestEvShareServerTiming,
   RequestEvSharedActionId,
   RequestRouteName,
@@ -1285,31 +720,22 @@ const requestHandlers = createResolveRequestHandlers({
   HttpStatus,
   encoder,
   isContentType,
-  getCachedHtml,
+  defaultSsrCacheKey,
+  defaultLoaderCacheKey,
+  getCachedSsr,
+  getCachedLoader,
   getQwikRouterServerData,
-  getRequestLoaderSerializationStrategyMap,
-  getRequestLoaders,
   getRequestMode,
-  getRouteLoaderPromise,
   loadHttpError: () => import('../../chunks/http-error.qwik.mjs'),
   MAX_CACHE_SIZE,
   resolveCacheKey,
   resolveETag,
   resolveRouteConfig,
-  setCachedHtml
+  setCachedSsr,
+  setCachedLoader
 });
 const { renderQwikMiddleware, resolveRequestHandlers} = requestHandlers;
 
-let _asyncRequestStore;
-if (isServer) {
-  const AsyncLocalStorage = _getAsyncLocalStorage();
-  if (AsyncLocalStorage) {
-    _asyncRequestStore = new AsyncLocalStorage();
-  } else {
-    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");
-  }
-}
-
 function createCacheControl(cacheControl) {
   const controls = [];
   if (cacheControl === "day") {
@@ -1530,6 +956,7 @@ class RewriteMessage extends AbortMessage {
 
 const requestEventDeps = {
   QDATA_KEY,
+  QACTION_KEY,
   isPromise,
   createCacheControl,
   Cookie,
@@ -1537,9 +964,12 @@ const requestEventDeps = {
   RedirectMessage,
   RewriteMessage,
   ServerError,
-  getRouteLoaderPromise,
-  getRouteMatchPathname,
-  IsQData,
+  recognizeRequest,
+  trimRecognizedInternalPathname,
+  IsQLoader,
+  IsQAction,
+  QLoaderId,
+  QActionId,
   encoder,
   getContentType
 };
@@ -1590,7 +1020,7 @@ async function runNextWithDeps(requestEv, rebuildRouteInfo, resolve, deps) {
         }
         return e;
       }
-      if (!isDev) {
+      if (!isDev$1) {
         try {
           if (!requestEv.headersSent) {
             requestEv.headers.set("content-type", "text/html; charset=utf-8");
@@ -1651,10 +1081,21 @@ async function getConfig() {
   }
   return qwikRouterConfig;
 }
-async function loadRequestHandlers(qwikRouterConfig2, pathname, method, checkOrigin, renderFn, isInternal) {
+function getRequestHandlerPathname(serverRequestEv) {
+  const recognized = recognizeRequest(serverRequestEv.url.pathname);
+  if (!recognized) {
+    return serverRequestEv.url.pathname;
+  }
+  const loaderPathname = trimRecognizedInternalPathname(serverRequestEv.url.pathname, recognized);
+  if (recognized.type !== IsQLoader) {
+    return loaderPathname;
+  }
+  return resolveValidInternalFullPathname(loaderPathname, serverRequestEv.request.headers.get(FULLPATH_HEADER)) ?? loaderPathname;
+}
+async function loadRequestHandlers(qwikRouterConfig2, pathname, method, checkOrigin, renderFn) {
   const { routes, serverPlugins, cacheModules } = qwikRouterConfig2;
-  const loadedRoute = await loadRoute(routes, cacheModules, pathname, isInternal);
-  const requestHandlers = resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn), isInternal);
+  const loadedRoute = await loadRoute(routes, cacheModules, pathname);
+  const requestHandlers = resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn));
   return {
     loadedRoute,
     requestHandlers
@@ -1663,17 +1104,17 @@ async function loadRequestHandlers(qwikRouterConfig2, pathname, method, checkOri
 async function requestHandler(serverRequestEv, opts) {
   const { render, checkOrigin } = opts;
   const config = await getConfig();
-  const { pathname, isInternal } = getRouteMatchPathname(serverRequestEv.url.pathname);
+  const pathname = getRequestHandlerPathname(serverRequestEv);
   if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) {
     return null;
   }
-  const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+  const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render);
   if (config.fallthrough && loadedRoute.$notFound$) {
     return null;
   }
   const rebuildRouteInfo = async (url) => {
-    const { pathname: pathname2 } = getRouteMatchPathname(url.pathname);
-    return loadRequestHandlers(config, pathname2, serverRequestEv.request.method, checkOrigin ?? true, render, isInternal);
+    const cleanPathname = trimInternalPathname(url.pathname);
+    return loadRequestHandlers(config, cleanPathname, serverRequestEv.request.method, checkOrigin ?? true, render);
   };
   return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
 }
@@ -1708,12 +1149,10 @@ function isStaticPath(method, url) {
   if (staticPaths.has(p)) {
     return true;
   }
-  if (p.endsWith("/q-data.json")) {
-    const pWithoutQdata = p.replace(/\/q-data.json$/, "");
-    if (staticPaths.has(pWithoutQdata + "/")) {
-      return true;
-    }
-    if (staticPaths.has(pWithoutQdata)) {
+  const loaderMatch = p.match(LOADER_REGEX);
+  if (loaderMatch) {
+    const pWithoutLoader = p.slice(0, p.length - loaderMatch[0].length);
+    if (staticPaths.has(pWithoutLoader + "/") || staticPaths.has(pWithoutLoader)) {
       return true;
     }
   }
@@ -1777,4 +1216,4 @@ class _TextEncoderStream_polyfill {
   }
 }
 
-export { AbortMessage, RedirectMessage, RequestEvShareQData, RewriteMessage, ServerError, _TextEncoderStream_polyfill, _asyncRequestStore, clearSsrCache, getErrorHtml, getNotFound, isStaticPath, mergeHeadersCookies, requestHandler };
+export { AbortMessage, RedirectMessage, RewriteMessage, ServerError, _TextEncoderStream_polyfill, _asyncRequestStore, getErrorHtml, getNotFound, isStaticPath, mergeHeadersCookies, requestHandler };