@qwik.dev/router 2.0.0-beta.38 → 2.0.0-beta.39

package/lib/chunks/head.qwik.mjs

@@ -1,7 +1,7 @@
 import { e as ensureSlash } from './pathname.mjs';
 import { createContextId, isServer as isServer$1, implicit$FirstArg, isDev, createComputedQrl, inlinedQrl, _captures, withLocale } from '@qwik.dev/core';
 import * as qwikRouterConfig from '@qwik-router-config';
-import { _getAsyncLocalStorage, _getContextEvent, _resolveContextWithoutSequentialScope, _injectAsyncSignalValue, _UNINITIALIZED, _markSignalAsExternallyOwned, _deserialize, SerializerSymbol, _verifySerializable } from '@qwik.dev/core/internal';
+import { _getAsyncLocalStorage, _getContextEvent, _resolveContextWithoutSequentialScope, _injectAsyncSignalValue, _UNINITIALIZED, _deserialize, _markSignalAsExternallyOwned, SerializerSymbol, _verifySerializable } from '@qwik.dev/core/internal';
 import { isServer } from '@qwik.dev/core/build';
 import { g as getLoaderName } from './request-path.mjs';
 import { R as RedirectMessage, S as ServerError, t as throwIfControlFlowSignal } from './server-error.mjs';
@@ -578,6 +578,7 @@ const RouteActionContext = /* @__PURE__ */ createContextId("qr-a");
 const RoutePreventNavigateContext = /* @__PURE__ */ createContextId("qr-p");
 const HttpStatusContext = /* @__PURE__ */ createContextId("qr-hs");
 
+const REQUEST_ROUTE_LOADER_STATE = "@routeLoaderState";
 const REQUEST_LOADER_PATHS_STORE = "@loaderPathsStore";
 const REQUEST_ROUTE_LOADERS = "@routeLoaders";
 const REQUEST_ROUTE_LOADER_PROMISES = "@routeLoaderPromises";
@@ -586,20 +587,9 @@ const REQUEST_ROUTE_LOADER_ROOT_EVENT = "@routeLoaderRootEvent";
 const ROUTE_LOADER_VALUE_PREFIX = "__qwik_route_loader_value__";
 const FULLPATH_HEADER = "X-Qwik-fullpath";
 const ROUTE_PATH_HEADER = "X-Qwik-route-path";
-const LOADER_FETCH_CACHE_TTL = 5e3;
-const LOADER_FETCH_CACHE_MAX = 128;
-const fetchCache = /* @__PURE__ */ new Map();
-const perfNow = () => globalThis.performance?.now() ?? Date.now();
+const navFetchCache = /* @__PURE__ */ new Map();
+const clearNavFetchCache = () => navFetchCache.clear();
 const isRedirectStatus = (status) => status >= 300 && status < 400;
-const setCache = (key, entry) => {
-  fetchCache.set(key, entry);
-  if (fetchCache.size > LOADER_FETCH_CACHE_MAX) {
-    const oldestKey = fetchCache.keys().next().value;
-    if (oldestKey !== void 0) {
-      fetchCache.delete(oldestKey);
-    }
-  }
-};
 const wrapWithAbort = (promise, signal) => {
   if (signal.aborted) {
     return Promise.reject(signal.reason);
@@ -639,15 +629,9 @@ const fetchRouteLoaderData = async (loaderId, routePath, manifestHash, opts) =>
   const cacheKey = `${url}
 ${headers[FULLPATH_HEADER] ?? ""}`;
   if (!opts?.ignoreCache) {
-    const entry = fetchCache.get(cacheKey);
+    const entry = navFetchCache.get(cacheKey);
     if (entry) {
-      if (entry.promise) {
-        return opts?.signal ? wrapWithAbort(entry.promise, opts.signal) : entry.promise;
-      }
-      if (entry.expires > perfNow()) {
-        return entry.value;
-      }
-      fetchCache.delete(cacheKey);
+      return opts?.signal ? wrapWithAbort(entry, opts.signal) : entry;
     }
   }
   const request = async () => {
@@ -672,41 +656,31 @@ ${headers[FULLPATH_HEADER] ?? ""}`;
     if (!response.ok) {
       return void 0;
     }
-    const text = await response.text();
-    return await _deserialize(text) ?? void 0;
+    return {
+      raw: await response.text()
+    };
   };
   if (opts?.ignoreCache) {
     return request();
   }
   if (opts?.signal) {
     return request().then((value) => {
-      if (value !== void 0 && !fetchCache.has(cacheKey)) {
-        setCache(cacheKey, {
-          value,
-          expires: perfNow() + LOADER_FETCH_CACHE_TTL
-        });
+      if (value !== void 0 && !navFetchCache.has(cacheKey)) {
+        navFetchCache.set(cacheKey, Promise.resolve(value));
       }
       return value;
     });
   }
   const promise = request().then((value) => {
     if (value === void 0) {
-      fetchCache.delete(cacheKey);
-    } else {
-      setCache(cacheKey, {
-        value,
-        expires: perfNow() + LOADER_FETCH_CACHE_TTL
-      });
+      navFetchCache.delete(cacheKey);
     }
     return value;
   }, (err) => {
-    fetchCache.delete(cacheKey);
+    navFetchCache.delete(cacheKey);
     throw err;
   });
-  setCache(cacheKey, {
-    promise,
-    expires: perfNow() + LOADER_FETCH_CACHE_TTL
-  });
+  navFetchCache.set(cacheKey, promise);
   return promise;
 };
 const filterSearchParams = (params, allowed) => {
@@ -724,12 +698,10 @@ const filterSearchParams = (params, allowed) => {
 const getLoaderOptions = (rest) => {
   let id;
   let serializationStrategy = DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
-  let expires;
-  let poll;
+  let cacheControl;
   let eTag;
   let cacheKey;
   let search;
-  let allowStale = true;
   let blockSSR = true;
   const validators = [];
   if (rest.length === 1) {
@@ -747,11 +719,8 @@ const getLoaderOptions = (rest) => {
         if (options.validation) {
           validators.push(...options.validation);
         }
-        if ("expires" in options) {
-          expires = options.expires;
-        }
-        if ("poll" in options) {
-          poll = options.poll;
+        if ("cacheControl" in options) {
+          cacheControl = options.cacheControl;
         }
         if ("eTag" in options) {
           eTag = options.eTag;
@@ -764,9 +733,6 @@ const getLoaderOptions = (rest) => {
         } else if (globalThis.__STRICT_LOADERS__) {
           search = [];
         }
-        if (options.allowStale === false) {
-          allowStale = false;
-        }
         if (options.blockSSR === false) {
           if (!__EXPERIMENTAL__.blockSSR) {
             throw new Error('`blockSSR: false` is an experimental feature and is not enabled. Please enable the feature flag by adding `experimental: ["blockSSR"]` to your qwikVite plugin options.');
@@ -782,12 +748,10 @@ const getLoaderOptions = (rest) => {
     id,
     validators: validators.reverse(),
     serializationStrategy,
-    expires,
-    poll,
+    cacheControl,
     eTag,
     cacheKey,
     search,
-    allowStale,
     blockSSR
   };
 };
@@ -817,6 +781,14 @@ function getRouteLoaderPromises(requestEv) {
   }
   return promises;
 }
+function clearRouteLoaderData(requestEv) {
+  requestEv.sharedMap.delete(REQUEST_ROUTE_LOADER_STATE);
+  requestEv.sharedMap.delete(REQUEST_ROUTE_LOADER_VALUES);
+  requestEv.sharedMap.delete(REQUEST_ROUTE_LOADER_PROMISES);
+  requestEv.sharedMap.delete(REQUEST_ROUTE_LOADER_EVENTS);
+  requestEv.sharedMap.delete(REQUEST_ROUTE_LOADER_ROOT_EVENT);
+  requestEv.sharedMap.delete(REQUEST_ROUTE_LOADERS);
+}
 function setRouteLoaders(requestEv, loaders) {
   requestEv.sharedMap.set(REQUEST_ROUTE_LOADERS, loaders);
 }
@@ -875,6 +847,15 @@ const getModuleRouteLoaders = (mods) => {
   }
   return routeLoaders;
 };
+const immutableLoaderIds = /* @__PURE__ */ new Set();
+const isImmutableLoader = (loaderId) => immutableLoaderIds.has(loaderId);
+const invalidateNavRouteLoaders = (state) => {
+  for (const id in state) {
+    if (!id.startsWith(ROUTE_LOADER_VALUE_PREFIX) && !immutableLoaderIds.has(id)) {
+      state[id].invalidate();
+    }
+  }
+};
 const setLoaderSignalValue = (signal, value) => {
   _injectAsyncSignalValue(signal, value);
 };
@@ -907,7 +888,16 @@ ${filteredSearch}`;
   if (!loaderRequestEv) {
     url.pathname = pathname;
     url.search = filteredSearch;
+    const request = new Request(url, rootRequestEv.request);
     loaderRequestEv = Object.create(rootRequestEv, {
+      originalUrl: {
+        value: new URL(url),
+        enumerable: true
+      },
+      params: {
+        value: {},
+        enumerable: true
+      },
       pathname: {
         get: () => url.pathname,
         enumerable: true
@@ -916,6 +906,10 @@ ${filteredSearch}`;
         get: () => url.searchParams,
         enumerable: true
       },
+      request: {
+        value: request,
+        enumerable: true
+      },
       url: {
         value: url,
         enumerable: true
@@ -1082,6 +1076,7 @@ const createRouteLoaderSignal = (loader, routeLoaderCtx, state) => {
       if (!isServer$1 && resumeValueKey2 in stateValues2) {
         stateValues2[resumeValueKey2] = value;
       }
+      lastFetch2.raw = void 0;
       return value;
     }
     if (isServer$1) {
@@ -1099,24 +1094,30 @@ const createRouteLoaderSignal = (loader, routeLoaderCtx, state) => {
     }
     let fetchUrl = pageUrl;
     if (searchFilter2) {
-      const filteredSearch = filterSearchParams(pageUrl.searchParams, searchFilter2);
-      if (ctx.previous !== void 0 && filteredSearch === lastFetch2.filteredSearch && fetchRoutePath === lastFetch2.routePath) {
-        return ctx.previous;
-      }
-      lastFetch2.filteredSearch = filteredSearch;
-      lastFetch2.routePath = fetchRoutePath;
       fetchUrl = new URL(pageUrl.href);
-      fetchUrl.search = filteredSearch;
+      fetchUrl.search = filterSearchParams(pageUrl.searchParams, searchFilter2);
     }
-    const response = await fetchRouteLoaderData(id2, fetchRoutePath, mHash, {
+    const result = await fetchRouteLoaderData(id2, fetchRoutePath, mHash, {
       pageUrl: fetchUrl,
       basePath,
       ignoreCache: ctx.info === true,
       signal: ctx.abortSignal
     });
-    if (!response) {
+    if (!result) {
       throw new Error(`Loader ${id2} returned empty response`);
     }
+    let response;
+    if (result.raw === void 0) {
+      response = result;
+    } else {
+      if (result.raw === lastFetch2.raw && ctx.previous !== void 0) {
+        return ctx.previous;
+      }
+      response = await _deserialize(result.raw);
+      if (!response) {
+        throw new Error(`Loader ${id2} returned empty response`);
+      }
+    }
     if (response.r) {
       const goto = routeLoaderCtx2.goto;
       if (goto) {
@@ -1131,6 +1132,7 @@ const createRouteLoaderSignal = (loader, routeLoaderCtx, state) => {
     if (response.e) {
       throw response.e;
     }
+    lastFetch2.raw = result.raw;
     if (needsResumeFetch) {
       stateValues2[resumeValueKey2] = response.d;
     }
@@ -1144,15 +1146,15 @@ const createRouteLoaderSignal = (loader, routeLoaderCtx, state) => {
     searchFilter,
     stateValues
   ]), {
-    serializationStrategy: loader.__serializationStrategy,
-    expires: loader.__expires,
-    poll: loader.__poll,
-    allowStale: loader.__allowStale
+    serializationStrategy: loader.__serializationStrategy
   });
   _markSignalAsExternallyOwned(signal);
   return signal;
 };
 const ensureRouteLoaderSignal = (loader, state, routeLoaderCtx) => {
+  if (loader.__cacheControl === "immutable") {
+    immutableLoaderIds.add(loader.__id);
+  }
   if (isServer$1 && loader.__serializationStrategy === "never") {
     state[getRouteLoaderValueStateKey(loader.__id)] = _UNINITIALIZED;
   }
@@ -1205,7 +1207,7 @@ const getRouteLoaderResponse = async (loaderQrl, validators, requestEv) => {
   }
 };
 const routeLoaderQrl = (loaderQrl, ...rest) => {
-  const { id, validators, serializationStrategy, expires, poll, eTag, cacheKey, search, allowStale, blockSSR } = getLoaderOptions(rest);
+  const { id, validators, serializationStrategy, cacheControl, eTag, cacheKey, search, blockSSR } = getLoaderOptions(rest);
   function loader() {
     const state = _resolveContextWithoutSequentialScope(RouteStateContext);
     let signal = state[loader.__id];
@@ -1221,12 +1223,10 @@ const routeLoaderQrl = (loaderQrl, ...rest) => {
   loader.__validators = validators;
   loader.__id = id ?? loaderQrl.getHash();
   loader.__serializationStrategy = serializationStrategy;
-  loader.__expires = expires ?? 12e4;
-  loader.__poll = poll ?? false;
+  loader.__cacheControl = cacheControl;
   loader.__eTag = eTag;
   loader.__cacheKey = cacheKey;
   loader.__search = search;
-  loader.__allowStale = allowStale;
   loader.__blockSSR = blockSSR;
   Object.freeze(loader);
   return loader;
@@ -1422,4 +1422,4 @@ const resolveHead = (actionData, loaderState, routeLocation, contentModules, loc
   return resolveRouteConfig(getData, routeLocation, contentModules, locale, actionData?.status ?? 200, defaults).head;
 };
 
-export { getRouteLoaders as A, getRouteLoaderValues as B, ContentContext as C, DocumentHeadContext as D, loadRouteLoader as E, FULLPATH_HEADER as F, isPromise as G, HttpStatusContext as H, getLoaderRequestEvent as I, resolveRouteLoaderByHash as J, getRouteLoaderResponse as K, getRouteLoaderCtx as L, setRouteLoaders as M, resolveRouteConfig as N, matchesRouteLoaderId as O, QACTION_KEY as Q, ROUTE_PATH_HEADER as R, _asyncRequestStore as _, isSameOrigin as a, setLoaderSignalValue as b, createDocumentHead as c, ContentInternalContext as d, ensureRouteLoaderSignals as e, fetchRouteLoaderData as f, getClientNavPath as g, RouteLocationContext as h, isSamePath as i, RouteNavigateContext as j, RouteStateContext as k, loadRoute as l, RouteLoaderCtxContext as m, RouteActionContext as n, RoutePreventNavigateContext as o, Q_ROUTE as p, toUrl as q, resolveHead as r, shouldPreload as s, toPath as t, updateRouteLoaderPaths as u, getRequestEvent as v, QFN_KEY as w, QDATA_KEY as x, routeLoader$ as y, routeLoaderQrl as z };
+export { QFN_KEY as A, QDATA_KEY as B, ContentContext as C, DocumentHeadContext as D, routeLoader$ as E, FULLPATH_HEADER as F, routeLoaderQrl as G, HttpStatusContext as H, getRouteLoaders as I, getRouteLoaderValues as J, loadRouteLoader as K, isPromise as L, getLoaderRequestEvent as M, resolveRouteLoaderByHash as N, getRouteLoaderResponse as O, getRouteLoaderCtx as P, QACTION_KEY as Q, ROUTE_PATH_HEADER as R, setRouteLoaders as S, resolveRouteConfig as T, clearRouteLoaderData as U, matchesRouteLoaderId as V, _asyncRequestStore as _, getClientNavPath as a, isSameOrigin as b, setLoaderSignalValue as c, createDocumentHead as d, ensureRouteLoaderSignals as e, fetchRouteLoaderData as f, getModuleRouteLoaders as g, ContentInternalContext as h, isSamePath as i, RouteLocationContext as j, RouteNavigateContext as k, loadRoute as l, RouteStateContext as m, RouteLoaderCtxContext as n, RouteActionContext as o, RoutePreventNavigateContext as p, invalidateNavRouteLoaders as q, isImmutableLoader as r, shouldPreload as s, toPath as t, updateRouteLoaderPaths as u, clearNavFetchCache as v, resolveHead as w, Q_ROUTE as x, toUrl as y, getRequestEvent as z };

package/lib/chunks/use-functions.qwik.mjs

@@ -1,5 +1,5 @@
 import { useContext, implicit$FirstArg, useVisibleTaskQrl, inlinedQrl, _captures, noSerialize, useServerData } from '@qwik.dev/core';
-import { C as ContentContext, D as DocumentHeadContext, H as HttpStatusContext, h as RouteLocationContext, j as RouteNavigateContext, o as RoutePreventNavigateContext, n as RouteActionContext } from './head.qwik.mjs';
+import { C as ContentContext, D as DocumentHeadContext, H as HttpStatusContext, j as RouteLocationContext, k as RouteNavigateContext, p as RoutePreventNavigateContext, o as RouteActionContext } from './head.qwik.mjs';
 
 const useHttpStatus = () => useContext(HttpStatusContext).value;
 const useContent = () => useContext(ContentContext);

package/lib/chunks/user-response.mjs

@@ -1,6 +1,6 @@
 import { isDev as isDev$1, inlinedQrl } from '@qwik.dev/core';
 import { isDev, _deserialize, _serialize, _verifySerializable } from '@qwik.dev/core/internal';
-import { Q as QACTION_KEY, B as getRouteLoaderValues, E as loadRouteLoader, G as isPromise, x as QDATA_KEY, I as getLoaderRequestEvent, J as resolveRouteLoaderByHash, K as getRouteLoaderResponse, L as getRouteLoaderCtx, M as setRouteLoaders, F as FULLPATH_HEADER, p as Q_ROUTE, w as QFN_KEY, N as resolveRouteConfig, O as matchesRouteLoaderId, _ as _asyncRequestStore } from './head.qwik.mjs';
+import { Q as QACTION_KEY, J as getRouteLoaderValues, K as loadRouteLoader, L as isPromise, B as QDATA_KEY, M as getLoaderRequestEvent, N as resolveRouteLoaderByHash, O as getRouteLoaderResponse, P as getRouteLoaderCtx, S as setRouteLoaders, F as FULLPATH_HEADER, x as Q_ROUTE, A as QFN_KEY, T as resolveRouteConfig, U as clearRouteLoaderData, V as matchesRouteLoaderId, _ as _asyncRequestStore } from './head.qwik.mjs';
 import { e as ensureSlash } from './pathname.mjs';
 import { r as recognizeRequest, t as trimRecognizedInternalPathname, Q as QLoaderId, c as IsQAction, d as QActionId, I as IsQLoader, a as resolveValidInternalFullPathname } from './request-path.mjs';
 import { A as AbortMessage, S as ServerError, R as RedirectMessage, t as throwIfControlFlowSignal } from './server-error.mjs';
@@ -737,6 +737,20 @@ function createLoaderRequestEventFactory(requestEv) {
   return (loader) => getLoaderRequestEvent(loader, requestEv);
 }
 
+function resolveLoaderCacheControl(option, requestEv) {
+  const value = typeof option === "function" ? option(requestEv) : option;
+  return value === void 0 ? "no-cache" : value;
+}
+async function runBlockingLoadersBeforeTarget(routeLoaders, targetLoader, requestEv) {
+  for (const loader of routeLoaders) {
+    if (loader === targetLoader) {
+      return;
+    }
+    if (loader.__blockSSR) {
+      await loadRouteLoader(loader, requestEv);
+    }
+  }
+}
 function setLoaderData(requestEv, routeLoaders, loaderPaths) {
   if (loaderPaths) {
     Object.assign(getRouteLoaderCtx(requestEv).loaderPaths, loaderPaths);
@@ -761,14 +775,11 @@ function addVaryHeader(requestEv, value) {
     requestEv.headers.set("Vary", `${vary}, ${value}`);
   }
 }
-async function sendLoaderResponse(requestEv, data, loader) {
+async function sendLoaderResponse(requestEv, data, cacheControl) {
   requestEv.headers.set("Content-Type", "application/json; charset=utf-8");
   addVaryHeader(requestEv, FULLPATH_HEADER);
-  if (loader?.__expires && loader.__expires > 0) {
-    requestEv.cacheControl({
-      maxAge: Math.ceil(loader.__expires / 1e3),
-      private: true
-    });
+  if (cacheControl !== null && !requestEv.headers.has("Cache-Control")) {
+    requestEv.cacheControl(cacheControl);
   }
   requestEv.send(200, data);
 }
@@ -790,7 +801,9 @@ function loaderHandler(routeLoaders, loaderPaths) {
       return;
     }
     setLoaderData(requestEv, routeLoaders, loaderPaths);
+    await runBlockingLoadersBeforeTarget(routeLoaders, loader, requestEv);
     const loaderRequestEv = createLoaderRequestEventFactory(requestEv)(loader);
+    const cacheControl = resolveLoaderCacheControl(loader.__cacheControl, loaderRequestEv);
     const normalizedETag = loader.__eTag !== void 0 ? resolvePreETag(loader.__eTag, loaderRequestEv) : "";
     if (normalizedETag && performETagMatch(loaderRequestEv, normalizedETag)) {
       return;
@@ -809,7 +822,7 @@ function loaderHandler(routeLoaders, loaderPaths) {
         } else {
           setETagHeader(loaderRequestEv, cached.eTag);
         }
-        await sendLoaderResponse(requestEv, cached.body, loader);
+        await sendLoaderResponse(requestEv, cached.body, cacheControl);
         return;
       }
     }
@@ -827,7 +840,7 @@ function loaderHandler(routeLoaders, loaderPaths) {
     if (!normalizedETag && finalETag && performETagMatch(loaderRequestEv, finalETag)) {
       return;
     }
-    await sendLoaderResponse(requestEv, data, loader);
+    await sendLoaderResponse(requestEv, data, cacheControl);
   };
 }
 async function sendJsonResponse(requestEv, responseData, status = 200) {
@@ -1157,6 +1170,9 @@ function createResolveRequestHandlers() {
     if (serverPlugins) {
       _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, serverPlugins, isPageRoute, method);
     }
+    if (!route.$notFound$ && isPageRoute && (method === "POST" || method === "GET")) {
+      requestHandlers.push(runServerFunction);
+    }
     const routeModules = route.$mods$;
     _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method, isPageRoute);
     const routeName = route.$routeName$;
@@ -1170,9 +1186,6 @@ function createResolveRequestHandlers() {
     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(fixTrailingSlash2);
       }
@@ -1449,10 +1462,17 @@ function createResolveRequestHandlers() {
           await loadHttpError()
         ];
         requestEv.sharedMap.set(RequestEvHttpStatusMessage, typeof e.data === "string" ? e.data : "Server Error");
+        clearErrorResponseData(requestEv);
         await renderHandler(requestEv);
       }
     };
   }
+  function clearErrorResponseData(requestEv) {
+    clearRouteLoaderData(requestEv);
+    requestEv.sharedMap.delete(RequestEvSharedActionId);
+    requestEv.sharedMap.delete(RequestEvSharedActionFormData);
+    requestEv.sharedMap.delete("@actionResult");
+  }
   async function runValidators(requestEv, validators, data) {
     let lastResult = {
       success: true,

package/lib/chunks/worker-thread.mjs

@@ -2,7 +2,7 @@ import { _serialize } from '@qwik.dev/core/internal';
 import { parentPort } from 'node:worker_threads';
 import { r as runQwikRouter, a as resolveRequestHandlers, b as renderQwikMiddleware } from './user-response.mjs';
 import { b as trimInternalPathname } from './request-path.mjs';
-import { A as getRouteLoaders, B as getRouteLoaderValues, l as loadRoute } from './head.qwik.mjs';
+import { I as getRouteLoaders, J as getRouteLoaderValues, l as loadRoute } from './head.qwik.mjs';
 
 const staticWorkerThreadDeps = {
   loadRoute,
@@ -136,7 +136,7 @@ async function workerRender(sys, opts, staticRoute, pendingPromises, callback, d
                 const loaderValues = getRouteLoaderValues(requestEv);
                 const manifestHash = opts.manifest?.manifestHash || "dev";
                 for (const loader of routeLoaders) {
-                  if (loader.__expires !== 0) {
+                  if (loader.__cacheControl !== "immutable") {
                     continue;
                   }
                   const data = loaderValues[loader.__id];

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference path="./modules.d.ts" />
 
 import type { AbortMessage } from '@qwik.dev/router/middleware/request-handler';
+import type { CacheControl } from '@qwik.dev/router/middleware/request-handler';
 import { Component } from '@qwik.dev/core';
 import type { ComputedSignal } from '@qwik.dev/core';
 import { Cookie } from '@qwik.dev/router/middleware/request-handler';
@@ -594,19 +595,20 @@ declare type LoaderOptions = {
     readonly validation?: DataValidator[];
     readonly serializationStrategy?: SerializationStrategy;
     /**
-     * Time in milliseconds after which the loader data is considered stale. The server derives
-     * `Cache-Control: max-age` seconds from this value on loader responses.
+     * Cache-Control for this loader's JSON responses. The browser HTTP cache is the single source of
+     * freshness for loader data: on every client navigation the loaders re-fetch, and this header
+     * decides whether the browser serves the fetch from cache, revalidates, or hits the server.
      *
-     * On the client, the loader's ComputedSignal `expires` is set to this value. If `poll` is true,
-     * the signal auto-refetches when expired. If `poll` is false (default), the data is marked stale
-     * but not auto-refetched.
-     */
-    readonly expires?: number;
-    /**
-     * When true AND `expires` is set, the loader data is automatically refetched when it expires
-     * (polling behavior). When false (default), expired data is marked stale but not auto-refetched.
+     * Accepts any `cacheControl()` value (`'immutable'`, `'no-cache'`, a max-age number, an options
+     * object) or a function of the request event; the function may return `null` to skip the header.
+     * A `Cache-Control` header set inside the loader function wins over this option.
+     *
+     * Defaults to `no-cache` (always revalidate; combine with `eTag` for cheap 304s).
+     *
+     * The literal value `'immutable'` also marks the loader's data as static, so SSG writes a
+     * per-loader JSON file at build time.
      */
-    readonly poll?: boolean;
+    readonly cacheControl?: CacheControl | ((ev: RequestEvent) => CacheControl | null);
     /**
      * Enable ETag-based caching for this loader's JSON responses.
      *
@@ -654,14 +656,6 @@ declare type LoaderOptions = {
      * triggers a re-fetch.
      */
     readonly search?: string[];
-    /**
-     * When true (default), the previous value is kept while the loader re-fetches after navigation,
-     * so components see stale data until the new response arrives.
-     *
-     * When false, the value is cleared on re-fetch, causing reads to suspend (show a loading
-     * boundary). This is useful when showing old data during navigation would be confusing.
-     */
-    readonly allowStale?: boolean;
     /**
      * When true (default), the loader is awaited before SSR renders, so its redirect or error can
      * short-circuit the response and its value is ready for synchronous reads (e.g. in the head).
@@ -1040,10 +1034,9 @@ export declare interface RouteData {
  *   sent in the request and changes to other params are ignored. During SSR and loader JSON
  *   requests, the loader's request event is filtered to those params too. `search: []` means no
  *   search params are sent and only route path changes trigger a re-fetch.
- * - `allowStale: false`: Clears the previous value when re-fetching, so components see a loading
- *   state instead of stale data during navigation. Useful when old data would be confusing.
  * - `eTag`: Enable ETag-based caching. Can be `true` (auto-hash), a string, or a function.
- * - `expires` / `poll`: Control client-side caching and polling behavior.
+ * - `cacheControl`: Cache-Control for loader JSON responses; the browser HTTP cache controls
+ *   client-side freshness. `'immutable'` additionally lets SSG write the loader file.
  *
  * The `strictLoaders` Vite plugin option applies `search: []` globally for all loaders that don't
  * specify an explicit `search` option.

package/lib/index.qwik.mjs

@@ -3,8 +3,8 @@ import { Fragment } from '@qwik.dev/core/jsx-runtime';
 import * as qwikRouterConfig from '@qwik-router-config';
 import { p } from '@qwik.dev/core/preloader';
 import { e as ensureSlash } from './chunks/pathname.mjs';
-import { l as loadRoute, f as fetchRouteLoaderData, g as getClientNavPath, s as shouldPreload, i as isSamePath, t as toPath, a as isSameOrigin, Q as QACTION_KEY, e as ensureRouteLoaderSignals, b as setLoaderSignalValue, c as createDocumentHead, C as ContentContext, d as ContentInternalContext, D as DocumentHeadContext, H as HttpStatusContext, h as RouteLocationContext, j as RouteNavigateContext, k as RouteStateContext, m as RouteLoaderCtxContext, n as RouteActionContext, o as RoutePreventNavigateContext, u as updateRouteLoaderPaths, r as resolveHead, p as Q_ROUTE, q as toUrl, v as getRequestEvent, w as QFN_KEY, x as QDATA_KEY } from './chunks/head.qwik.mjs';
-export { y as routeLoader$, z as routeLoaderQrl } from './chunks/head.qwik.mjs';
+import { l as loadRoute, g as getModuleRouteLoaders, f as fetchRouteLoaderData, a as getClientNavPath, s as shouldPreload, i as isSamePath, t as toPath, b as isSameOrigin, Q as QACTION_KEY, e as ensureRouteLoaderSignals, c as setLoaderSignalValue, d as createDocumentHead, C as ContentContext, h as ContentInternalContext, D as DocumentHeadContext, H as HttpStatusContext, j as RouteLocationContext, k as RouteNavigateContext, m as RouteStateContext, n as RouteLoaderCtxContext, o as RouteActionContext, p as RoutePreventNavigateContext, u as updateRouteLoaderPaths, q as invalidateNavRouteLoaders, r as isImmutableLoader, v as clearNavFetchCache, w as resolveHead, x as Q_ROUTE, y as toUrl, z as getRequestEvent, A as QFN_KEY, B as QDATA_KEY } from './chunks/head.qwik.mjs';
+export { E as routeLoader$, G as routeLoaderQrl } from './chunks/head.qwik.mjs';
 import { u as useNavigate, a as useLocation, b as useDocumentHead, c as useQwikRouterEnv, d as useAction } from './chunks/use-functions.qwik.mjs';
 export { e as useContent, f as useHttpStatus, g as usePreventNavigate$, h as usePreventNavigateQrl } from './chunks/use-functions.qwik.mjs';
 import { _deserialize, _hasStoreEffects, _getContextContainer, forceStoreEffects, _waitUntilRendered, _getContextHostElement, _serialize } from '@qwik.dev/core/internal';
@@ -28,6 +28,30 @@ const ErrorBoundary = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((p
   return /* @__PURE__ */ _jsxSorted(Slot, null, null, null, 3, "bA_1");
 }, "ErrorBoundary_component_pOa6vjtC7ik"));
 
+const prefetchLoaderData = (loadedRoute, url, manifestHash) => {
+  if (!loadedRoute.$loaders$?.length || !loadedRoute.$loaderPaths$) {
+    return;
+  }
+  const immutableIds = new Set(getModuleRouteLoaders(loadedRoute.$mods$).filter((loader) => loader.__cacheControl === "immutable").map((loader) => loader.__id));
+  const basePath = qwikRouterConfig.basePathname ?? "/";
+  for (const hash of loadedRoute.$loaders$) {
+    if (immutableIds.has(hash)) {
+      continue;
+    }
+    let loaderPath = loadedRoute.$loaderPaths$[hash];
+    if (!loaderPath) {
+      continue;
+    }
+    if (basePath !== "/" && !loaderPath.startsWith(basePath)) {
+      loaderPath = basePath + loaderPath.slice(1);
+    }
+    fetchRouteLoaderData(hash, loaderPath, manifestHash, {
+      pageUrl: url,
+      basePath
+    }).catch(() => {
+    });
+  }
+};
 async function prefetchRoute(url, prefetchData, probability = 0.8, manifestHash, prefetchBundle = true) {
   if (!isBrowser || isDev) {
     return;
@@ -48,23 +72,7 @@ async function prefetchRoute(url, prefetchData, probability = 0.8, manifestHash,
     if (!prefetchData || !manifestHash) {
       return;
     }
-    if (loadedRoute.$loaders$?.length && loadedRoute.$loaderPaths$) {
-      const basePath = qwikRouterConfig.basePathname ?? "/";
-      for (const hash of loadedRoute.$loaders$) {
-        let loaderPath = loadedRoute.$loaderPaths$?.[hash];
-        if (!loaderPath) {
-          continue;
-        }
-        if (basePath !== "/" && !loaderPath.startsWith(basePath)) {
-          loaderPath = basePath + loaderPath.slice(1);
-        }
-        fetchRouteLoaderData(hash, loaderPath, manifestHash, {
-          pageUrl: url,
-          basePath
-        }).catch(() => {
-        });
-      }
-    }
+    prefetchLoaderData(loadedRoute, url, manifestHash);
   } catch {
   }
 }
@@ -262,12 +270,10 @@ const refreshLinkPrefetchObserver = (manifestHash) => {
   cleanupPrefetchObserver?.();
   cleanupPrefetchObserver = createLinkPrefetchObserver(manifestHash);
 };
-const linkPrefetchInit = (manifestHash) => eventQrl(/* @__PURE__ */ inlinedQrl(() => {
-  const manifestHash2 = _captures[0];
-  refreshLinkPrefetchObserver(manifestHash2);
-}, "linkPrefetchInit_event_hoZr9O26Irg", [
-  manifestHash
-]));
+const linkPrefetchInit = eventQrl(/* @__PURE__ */ inlinedQrl((_, element) => {
+  const manifestHash = element.closest("[q\\:manifest-hash]")?.getAttribute("q:manifest-hash") || void 0;
+  refreshLinkPrefetchObserver(manifestHash);
+}, "linkPrefetchInit_event_hoZr9O26Irg"));
 
 function callRestoreScrollOnDocument() {
   if (document.__q_scroll_restore__) {
@@ -465,9 +471,12 @@ const spaInit = eventQrl(/* @__PURE__ */ inlinedQrl((_, el) => {
   }
 }, "spa_init_event_igI1pUsax0E"));
 
-async function submitAction(action, routePath) {
-  const pathBase = ensureSlash(routePath);
-  const url = `${pathBase}?${QACTION_KEY}=${encodeURIComponent(action.id)}`;
+async function submitAction(action, routeUrl) {
+  const pathBase = ensureSlash(routeUrl.pathname);
+  const searchParams = new URLSearchParams(routeUrl.search);
+  searchParams.set(QACTION_KEY, action.id);
+  const search = searchParams.toString();
+  const url = `${pathBase}?${search}`;
   const actionData = action.data;
   action.data = void 0;
   let fetchOptions;
@@ -993,7 +1002,7 @@ const useQwikRouter = (props) => {
           return;
         }
         if (action) {
-          const result = await submitAction(action, trackUrl.pathname);
+          const result = await submitAction(action, trackUrl);
           if (!result) {
             routeInternal2.untrackedValue = {
               type: navType,
@@ -1030,6 +1039,9 @@ const useQwikRouter = (props) => {
       }
       updateRouteLoaderPaths(routeLoaderCtx2, loadedRoute.$loaderPaths$, trackUrl);
       const routeLoaders = ensureRouteLoaderSignals(contentModules, loaderState2, routeLoaderCtx2);
+      if (!isServer) {
+        invalidateNavRouteLoaders(loaderState2);
+      }
       if (shouldInvalidateActionLoaders) {
         if (actionLoaderHashes !== void 0) {
           for (const hash of actionLoaderHashes) {
@@ -1044,9 +1056,14 @@ const useQwikRouter = (props) => {
       if (routeLoaders.length > 0) {
         for (let i = 0; i < routeLoaders.length; i++) {
           const loader = routeLoaders[i];
-          loaderState2[loader.__id].untrackedPending;
+          if (!isImmutableLoader(loader.__id)) {
+            loaderState2[loader.__id].untrackedPending;
+          }
         }
       }
+      if (!isServer) {
+        clearNavFetchCache();
+      }
       if (internalState.navCount !== navCountBefore) {
         return;
       }
@@ -1304,7 +1321,6 @@ const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(()
     throw new Error("PrefetchServiceWorker component must be rendered on the server.");
   }
   const internalContext = useContext(ContentInternalContext);
-  const head = useDocumentHead();
   const nav = useNavigate();
   const contents = internalContext.value;
   if (contents && contents.length > 0) {
@@ -1318,10 +1334,6 @@ const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(()
     return /* @__PURE__ */ _jsxSorted(Fragment, null, null, [
       cmp,
       !__EXPERIMENTAL__.noSPA && /* @__PURE__ */ _jsxSorted("script", {
-        "q-d:qcinit": [
-          spaInit,
-          linkPrefetchInit(head.manifestHash)
-        ],
         "q-d:qinit": _qrlSync(() => {
           ((w, h) => {
             if (!w._qcs) {
@@ -1335,9 +1347,14 @@ const RouterOutlet = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(()
             }
           })(window, history);
         }, '()=>{((w,h)=>{if(!w._qcs){w._qcs=!0;const s=h.state?._qRouterScroll;if(s){h.scrollRestoration="manual";w.scrollTo(s.x,s.y);}document.dispatchEvent(new Event("qcinit"));}})(window,history);}'),
-        "q-d:qrouterpopstate": /* @__PURE__ */ inlinedQrl((event, _1, nav2) => handleRouterPopstate(nav2, event), "RouterOutlet_component_Fragment_script_q_d_qrouterpopstate_aRL6GvFyews"),
+        "q-d:qrouterpopstate": /* @__PURE__ */ inlinedQrl((event, _1, nav2) => handleRouterPopstate(nav2, event), "RouterOutlet_component_Fragment_script_q_d_qrouterpopstate_aRL6GvFyews").m(),
         "q:p": nav
-      }, null, null, 6, "Fn_1")
+      }, {
+        "q-d:qcinit": [
+          spaInit,
+          linkPrefetchInit
+        ]
+      }, null, 6, "Fn_1")
     ], 1, "Fn_2");
   }
   return SkipRender;

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

@@ -17,7 +17,7 @@ async function getConfig() {
   }
   return qwikRouterConfig;
 }
-function getRequestHandlerPathname(serverRequestEv) {
+function getRequestHandlerPathname(serverRequestEv, isDevRequest = isDev) {
   const recognized = recognizeRequest(serverRequestEv.url.pathname);
   if (!recognized) {
     return serverRequestEv.url.pathname;
@@ -26,7 +26,8 @@ function getRequestHandlerPathname(serverRequestEv) {
   if (recognized.type !== IsQLoader) {
     return loaderPathname;
   }
-  return resolveValidInternalFullPathname(loaderPathname, serverRequestEv.request.headers.get(FULLPATH_HEADER) ?? serverRequestEv.request.headers.get(ROUTE_PATH_HEADER)) ?? loaderPathname;
+  const routePath = serverRequestEv.request.headers.get(FULLPATH_HEADER) ?? (isDevRequest ? serverRequestEv.request.headers.get(ROUTE_PATH_HEADER) : null);
+  return resolveValidInternalFullPathname(loaderPathname, routePath) ?? loaderPathname;
 }
 async function loadRequestHandlers(qwikRouterConfig2, pathname, method, checkOrigin, renderFn, serverRequestEv) {
   const { routes, serverPlugins, cacheModules } = qwikRouterConfig2;

package/lib/vite/index.mjs

@@ -2041,9 +2041,9 @@ function imagePlugin(userOpts) {
         order: "pre",
         async handler(id, importer, options) {
           if (parseVirtualImageJsxId(id)) {
-            return null;
+            return id;
           }
-          if (id.endsWith(TO_IMG_ID)) {
+          if (id.endsWith(TO_IMG_ID) || id === VIRTUAL_TO_IMG_ID) {
             return VIRTUAL_TO_IMG_ID;
           }
           const { pathId, params } = parseId(id);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.38",
+  "version": "2.0.0-beta.39",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -22,7 +22,7 @@
     "remark-gfm": "^4.0.1",
     "set-cookie-parser": "^2.7.2",
     "source-map": "^0.7.6",
-    "svgo": "^3.3.3",
+    "svgo": "^3.3.4",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "valibot": ">=0.36.0 <2",
@@ -41,7 +41,7 @@
     "tsm": "2.3.0",
     "typescript": "5.9.3",
     "uvu": "0.5.6",
-    "@qwik.dev/core": "2.0.0-beta.38"
+    "@qwik.dev/core": "2.0.0-beta.39"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -170,7 +170,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=6 <9",
-    "@qwik.dev/core": "^2.0.0-beta.38"
+    "@qwik.dev/core": "^2.0.0-beta.39"
   },
   "publishConfig": {
     "access": "public"