crelte 0.6.0-alpha.1 → 0.6.0-alpha.2

package/dist/node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAiEA;;;;GAIG;AACH,wBAA8B,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,iBAmG3E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAqEA;;;;GAIG;AACH,wBAA8B,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,iBA8G3E"}

package/dist/node/index.js

@@ -2,7 +2,7 @@ import http from 'node:http';
 import path, { join } from 'node:path';
 import fs from 'node:fs/promises';
 import { createReadStream } from 'node:fs';
-import { initEnvData, initSites, modRender, modRenderError, } from '../server/shared.js';
+import { initEnvData, initSites, initRequestSites, modRender, modRenderError, } from '../server/shared.js';
 import ServerRouter from '../server/ServerRouter.js';
 import { fileURLToPath } from 'node:url';
 import { initQueryRoutes } from '../server/queries/queries.js';
@@ -17,12 +17,14 @@ async function readSitesCache() {
 async function writeSitesCache(data) {
     return await writeFile(localDir('sites.json'), JSON.stringify(data));
 }
-async function initRouter(serverMod, env) {
-    const sites = await initSites(env, {
-        enabled: process.env.NODE_ENV === 'production',
-        writeSitesCache,
-        readSitesCache,
-    });
+async function initRouter(serverMod, env, sites) {
+    if (!sites) {
+        sites = await initSites(env, {
+            enabled: process.env.NODE_ENV === 'production',
+            writeSitesCache,
+            readSitesCache,
+        });
+    }
     const router = new ServerRouter(env.endpointUrl, env.frontendUrl, env.env, sites, {
         endpointToken: env.endpointToken,
     });
@@ -75,16 +77,18 @@ export default async function createServer(serverMod, buildTime) {
         if (routesError || !router || !sites) {
             throw routesError ?? new Error('Router not initialized');
         }
-        const routeResp = await router.z_handle(req);
+        const requestSites = await initRequestSites(env, sites, req);
+        const requestRouter = requestSites === sites
+            ? router
+            : (await initRouter(serverMod, env, requestSites))[1];
+        const routeResp = await requestRouter.z_handle(req);
         if (routeResp) {
             await webResponseToResponse(routeResp, res);
             return;
         }
         if (await basicAuthCheck(req, res, env))
             return;
-        const response = await modRender(env, sites, serverMod, template, req, {
-            ssrManifest,
-        });
+        const response = await modRender(env, requestSites, serverMod, template, req, { ssrManifest });
         await webResponseToResponse(response, res);
     };
     http.createServer(async (nodeReq, res) => {

package/dist/queries/Queries.d.ts

@@ -47,10 +47,16 @@ export type QueryOptions = {
      */
     bearerToken?: string;
     /**
-     * Configure caching
+     * Configure Crelte's local query caching.
      * @default true
      */
     caching?: boolean;
+    /**
+     * Allow Craft's configured GraphQL caching. Set false to bypass it.
+     * Does not affect Crelte's caching.
+     * @default true
+     */
+    craftCaching?: boolean;
     /**
      * Usually automatically set
      */

package/dist/queries/Queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queries.d.ts","sourceRoot":"","sources":["../../src/queries/Queries.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAa,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEtC;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,mDAAmD;AACnD,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,KAAK,CAO9C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,KAAK,CAAgC;IAE7C,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO;IAUP;;;;;;;;OAQG;IACH,MAAM,CAAC,GAAG,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,QAAQ,GAAE,QAAyB,EACnC,IAAI,GAAE,cAAmB,GACvB,OAAO;IAQV;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO;IAQnE;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,KAAK,EACZ,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAClC,IAAI,GAAE,YAAiB,GACrB,OAAO,CAAC,OAAO,CAAC;IA0BnB;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,OAAO;CAGxB"}
+{"version":3,"file":"Queries.d.ts","sourceRoot":"","sources":["../../src/queries/Queries.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAa,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEtC;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,mDAAmD;AACnD,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,KAAK,CAO9C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,KAAK,CAAgC;IAE7C,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO;IAUP;;;;;;;;OAQG;IACH,MAAM,CAAC,GAAG,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,QAAQ,GAAE,QAAyB,EACnC,IAAI,GAAE,cAAmB,GACvB,OAAO;IAQV;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO;IAQnE;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,KAAK,EACZ,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAClC,IAAI,GAAE,YAAiB,GACrB,OAAO,CAAC,OAAO,CAAC;IA2BnB;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,OAAO;CAGxB"}

package/dist/queries/Queries.js

@@ -68,6 +68,7 @@ export default class Queries {
             bearerToken,
             xCraftSiteId,
             caching: opts.caching ?? true,
+            craftCaching: opts.craftCaching ?? true,
         });
     }
     /**
@@ -165,6 +166,8 @@ class Inner {
             headers['Authorization'] = 'Bearer ' + opts.bearerToken;
         if (opts.xCraftSiteId)
             headers['X-Craft-Site'] = opts.xCraftSiteId.toString();
+        if (!opts.craftCaching)
+            headers['X-Craft-GQL-Cache'] = 'no-cache';
         if (this.loggingRequests) {
             console.log(logName + ' to:', url.toString(), vars, headers);
             headers['X-Debug'] = 'enable';

package/dist/routing/route/BaseRoute.d.ts

@@ -209,6 +209,10 @@ export default class BaseRoute {
      * The context is not cloned in the clone call and will be the same object.
      */
     setContext<T>(key: string, value: T | null | undefined): void;
+    /**
+     * Returns the site preview token, or null if it is missing or empty.
+     */
+    getSiteToken(): string | null;
     /**
      * Returns true if the route is in live preview mode
      */

package/dist/routing/route/BaseRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseRoute.d.ts","sourceRoot":"","sources":["../../../src/routing/route/BaseRoute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseRoute.d.ts","sourceRoot":"","sources":["../../../src/routing/route/BaseRoute.ts"],"names":[],"mappings":"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"}

package/dist/routing/route/BaseRoute.js

@@ -240,6 +240,12 @@ export default class BaseRoute {
             this.z_context[key] = value;
         }
     }
+    /**
+     * Returns the site preview token, or null if it is missing or empty.
+     */
+    getSiteToken() {
+        return this.search.get('siteToken') || null;
+    }
     /**
      * Returns true if the route is in live preview mode
      */

package/dist/routing/router/BaseRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/BaseRouter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/BaseRouter.ts"],"names":[],"mappings":"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"}

package/dist/routing/router/BaseRouter.js

@@ -175,9 +175,10 @@ export default class BaseRouter {
     async preload(target) {
         const req = this.targetToRequest(target, { origin: 'preload' });
         const current = this.route.get();
-        // if the origin matches, the route will be able to be loaded
-        // so let's preload it
-        if (current && current.url.origin === req.url.origin) {
+        // Preload only within the current origin and site preview context.
+        if (current &&
+            current.url.origin === req.url.origin &&
+            current.getSiteToken() === req.getSiteToken()) {
             // todo i don't wan't to send a CrelteRequest?
             // todo, it would be nice if this could not have any side effects
             // but at the moment cr.router.open will cause a redirect

package/dist/routing/router/ClientRouter.d.ts

@@ -22,6 +22,7 @@ export default class ClientRouter extends BaseRouter {
     pushRequest(req: Request, _opts?: RequestOptions): Promise<void | Route>;
     replaceRequest(req: Request, _opts?: RequestOptions): Promise<void | Route>;
     back(): void;
+    private requiresPageLoad;
     /**
      * This returns a route if it was handled else if an error occured
      * or the request was cancelled returns void

package/dist/routing/router/ClientRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/ClientRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GAAG,iBAAiB,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IACnD,OAAO,CAAC,qBAAqB,CAAa;IAC1C,OAAO,CAAC,kBAAkB,CAAU;IAEpC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;gBAE5B,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB;IAQ/D;;OAEG;IACG,IAAI;IA8BV;;OAEG;IACG,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IA6ChD,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAYpD,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAY7D,IAAI,IAAI,IAAI;IAIZ;;;OAGG;IACG,qBAAqB,CAC1B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GACnC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IASxB,MAAM;IAkEN,QAAQ;IAgCR,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI;CAgEpD"}
+{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../../src/routing/router/ClientRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,kBAAkB,EAAE,OAAO,CAAC;CAC5B,GAAG,iBAAiB,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IACnD,OAAO,CAAC,qBAAqB,CAAa;IAC1C,OAAO,CAAC,kBAAkB,CAAU;IAEpC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;gBAE5B,KAAK,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,mBAAmB;IAS/D;;OAEG;IACG,IAAI;IA8BV;;OAEG;IACG,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAuChD,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAiBpD,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,cAAmB;IAiB7D,IAAI,IAAI,IAAI;IAIZ,OAAO,CAAC,gBAAgB;IASxB;;;OAGG;IACG,qBAAqB,CAC1B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GACnC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IASxB,MAAM;IAuEN,QAAQ;IAgCR,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI;CAgEpD"}

package/dist/routing/router/ClientRouter.js

@@ -59,11 +59,7 @@ export default class ClientRouter extends BaseRouter {
                 window.history.replaceState(current.z_toState(), '');
             }
         }
-        // if the domain of the current site is different than the domain of the
-        // new site we need to do a window.location.href call
-        if ((current && current.url.origin !== req.url.origin) ||
-            // @ts-ignore
-            import.meta.env.SSR) {
+        if (this.requiresPageLoad(req)) {
             window.location.href = req.url.href;
             return;
         }
@@ -75,12 +71,20 @@ export default class ClientRouter extends BaseRouter {
     }
     async pushRequest(req, _opts = {}) {
         const url = req.url;
+        if (this.requiresPageLoad(req)) {
+            window.location.href = url.href;
+            return;
+        }
         return this.handleRequest(req, route => {
             window.history.pushState(route.z_toState(), '', url.pathname + url.search + url.hash);
         });
     }
     async replaceRequest(req, _opts = {}) {
         const url = req.url;
+        if (this.requiresPageLoad(req)) {
+            window.location.replace(url.href);
+            return;
+        }
         return this.handleRequest(req, () => {
             window.history.replaceState(req.z_toState(), '', url.pathname + url.search + url.hash);
         });
@@ -88,6 +92,12 @@ export default class ClientRouter extends BaseRouter {
     back() {
         window.history.back();
     }
+    requiresPageLoad(req) {
+        const current = this.route.get();
+        return (!!current &&
+            (current.url.origin !== req.url.origin ||
+                current.getSiteToken() !== req.getSiteToken()));
+    }
     /**
      * This returns a route if it was handled else if an error occured
      * or the request was cancelled returns void
@@ -147,6 +157,10 @@ export default class ClientRouter extends BaseRouter {
                 origin: 'pop',
             });
             req.z_fillFromState(e.state);
+            if (this.requiresPageLoad(req)) {
+                window.location.reload();
+                return;
+            }
             // todo handle errors
             this.handleRequest(req, () => { });
         });

package/dist/server/queries/QueryGqlRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryGqlRoute.d.ts","sourceRoot":"","sources":["../../../src/server/queries/QueryGqlRoute.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,oBAAoB,CAAC;AACrD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAQ,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EACN,SAAS,EAET,WAAW,EAEX,SAAS,EACT,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;CAChC,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,aAAa;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;gBAEpB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY;IA6BrD,IAAI;IAIV,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;YAuBX,SAAS;IAWjB,MAAM,CACX,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,mBAAmB,GACtB,OAAO,CAAC,QAAQ,CAAC;CAwHpB"}
+{"version":3,"file":"QueryGqlRoute.d.ts","sourceRoot":"","sources":["../../../src/server/queries/QueryGqlRoute.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,oBAAoB,CAAC;AACrD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAQ,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EACN,SAAS,EAET,WAAW,EAEX,SAAS,EACT,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;CAChC,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,aAAa;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;IACtC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;gBAEpB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY;IA6BrD,IAAI;IAIV,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;YAuBX,SAAS;IAWjB,MAAM,CACX,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,mBAAmB,GACtB,OAAO,CAAC,QAAQ,CAAC;CAqHpB"}

package/dist/server/queries/QueryGqlRoute.js

@@ -106,19 +106,13 @@ export default class QueryGqlRoute {
         if (caching.debug) {
             logInfo = `[queries: ${this.name}] vars: ${JSON.stringify(vars)}`;
         }
-        let previewToken = null;
-        let siteToken = null;
         const reqSearch = new URL(csr.req.url).searchParams;
-        if (reqSearch.has('token')) {
-            previewToken = reqSearch.get('token');
-        }
-        else if (reqSearch.has('siteToken')) {
-            siteToken = reqSearch.get('siteToken');
-        }
+        const previewToken = reqSearch.get('token');
+        const siteToken = reqSearch.get('siteToken');
         // check for x-craft-site header and pass it on
         const xCraftSite = csr.req.headers.get('X-Craft-Site');
         let cacheKey = null;
-        const useCache = !previewToken && caching.isEnabled();
+        const useCache = !previewToken && !siteToken && caching.isEnabled();
         if (useCache) {
             cacheKey = await calcKey({
                 ...vars,
@@ -149,6 +143,9 @@ export default class QueryGqlRoute {
             headers['X-Debug'] = xDebug;
         if (xCraftSite)
             headers['X-Craft-Site'] = xCraftSite;
+        if (csr.req.headers.get('X-Craft-GQL-Cache') === 'no-cache') {
+            headers['X-Craft-GQL-Cache'] = 'no-cache';
+        }
         // now execute the gql request
         let resp;
         try {

package/dist/server/shared.d.ts

@@ -23,7 +23,8 @@ export type SitesCache = {
     readSitesCache?: () => Promise<any>;
     writeSitesCache?: (data: any) => Promise<void>;
 };
-export declare function initSites(env: EnvData, cache?: SitesCache): Promise<SiteFromGraphQl[]>;
+export declare function initSites(env: EnvData, cache?: SitesCache, siteToken?: string): Promise<SiteFromGraphQl[]>;
+export declare function initRequestSites(env: EnvData, sites: SiteFromGraphQl[], req: Request): Promise<SiteFromGraphQl[]>;
 export type ModRenderOptions = {
     ssrManifest?: Record<string, string[]>;
 };

package/dist/server/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/server/shared.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,MAAM,aAAa,GAAG;IAE3B,EAAE,CAAC,EAAE,OAAO,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAQF,MAAM,MAAM,OAAO,GAAG;IACrB,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,wBAAsB,WAAW,CAAC,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAkChE;AAED,MAAM,MAAM,UAAU,GAAG;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,wBAAsB,SAAS,CAC9B,GAAG,EAAE,OAAO,EACZ,KAAK,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,eAAe,EAAE,CAAC,CAQ5B;AAgDD,MAAM,MAAM,gBAAgB,GAAG;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACvC,CAAC;AAKF,MAAM,MAAM,aAAa,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAsB,SAAS,CAC9B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,eAAe,EAAE,EACxB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,gBAAqB,GACzB,OAAO,CAAC,QAAQ,CAAC,CA0BnB;AAQD,MAAM,MAAM,kBAAkB,GAAG;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,wBAAsB,cAAc,CACnC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,KAAK,EAClB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,gBAAgB,GAAG;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GACpD,OAAO,CAAC,QAAQ,CAAC,CAsCnB"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/server/shared.ts"],"names":[],"mappings":"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"}

package/dist/server/shared.js

@@ -32,16 +32,24 @@ export async function initEnvData(os) {
         viteEnv,
     };
 }
-export async function initSites(env, cache) {
+export async function initSites(env, cache, siteToken) {
     const queries = Queries.new(env.endpointUrl, env.frontendUrl, new SsrCache(), { bearerToken: env.endpointToken });
-    return await loadSites(queries, cache);
+    return await loadSites(queries, cache, siteToken);
+}
+export async function initRequestSites(env, sites, req) {
+    const siteToken = new URL(req.url).searchParams.get('siteToken');
+    if (!siteToken)
+        return sites;
+    // Preview sites belong to this request, not the shared site cache.
+    return await initSites(env, undefined, siteToken);
 }
 // requires, GraphQl, SsrCache
-async function loadSites(queries, cache) {
-    if ('CRAFT_SITES_CACHED' in globalThis) {
+async function loadSites(queries, cache, siteToken) {
+    const useCache = !siteToken;
+    if (useCache && 'CRAFT_SITES_CACHED' in globalThis) {
         return globalThis['CRAFT_SITES_CACHED'];
     }
-    if (cache?.enabled && cache?.readSitesCache) {
+    if (useCache && cache?.enabled && cache?.readSitesCache) {
         try {
             const sites = (await cache.readSitesCache());
             // @ts-ignore
@@ -65,11 +73,13 @@ async function loadSites(queries, cache) {
 			}
 		`, {}, 
     // don't cache since we cache ourself
-    { caching: false }));
-    // @ts-ignore
-    globalThis['CRAFT_SITES_CACHED'] = resp.crelteSites;
-    if (cache?.enabled && cache?.writeSitesCache) {
-        await cache.writeSitesCache(resp.crelteSites);
+    { caching: false, craftCaching: useCache, siteToken }));
+    if (useCache) {
+        // @ts-ignore
+        globalThis['CRAFT_SITES_CACHED'] = resp.crelteSites;
+        if (cache?.enabled && cache?.writeSitesCache) {
+            await cache.writeSitesCache(resp.crelteSites);
+        }
     }
     return resp.crelteSites;
 }

package/dist/vite/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEN,MAAM,EAON,MAAM,MAAM,CAAC;AAwHd,MAAM,CAAC,OAAO,UAAU,MAAM,IAAI,MAAM,CA4JvC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEN,MAAM,EAON,MAAM,MAAM,CAAC;AAyHd,MAAM,CAAC,OAAO,UAAU,MAAM,IAAI,MAAM,CA4JvC"}

package/dist/vite/index.js

@@ -1,7 +1,7 @@
 import { relative } from 'node:path';
 import { build as viteBuild, } from 'vite';
 import fs from 'node:fs/promises';
-import { initEnvData, initSites, modRender, modRenderError, } from '../server/shared.js';
+import { initEnvData, initSites, initRequestSites, modRender, modRenderError, } from '../server/shared.js';
 import ServerRouter from '../server/ServerRouter.js';
 import { initQueryRoutes } from '../server/queries/queries.js';
 import { PLATFORM, requestToWebRequest, webResponseToResponse, } from '../node/utils.js';
@@ -223,7 +223,8 @@ async function serveVite(env, vite) {
         if (!sites) {
             sites = await initSites(env);
         }
-        const router = new ServerRouter(env.endpointUrl, env.frontendUrl, env.env, sites, { endpointToken: env.endpointToken });
+        const requestSites = await initRequestSites(env, sites, req);
+        const router = new ServerRouter(env.endpointUrl, env.frontendUrl, env.env, requestSites, { endpointToken: env.endpointToken });
         await initQueryRoutes(PLATFORM, serverMod, router);
         if (typeof serverMod.routes === 'function') {
             await serverMod.routes(router);
@@ -250,7 +251,7 @@ async function serveVite(env, vite) {
             await webResponseToResponse(errorResp, res);
             return;
         }
-        const response = await modRender(env, sites, serverMod, template, req);
+        const response = await modRender(env, requestSites, serverMod, template, req);
         await webResponseToResponse(response, res);
     };
     vite.middlewares.use(async (nReq, res, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "crelte",
-	"version": "0.6.0-alpha.1",
+	"version": "0.6.0-alpha.2",
 	"author": "Crelte <support@crelte.com>",
 	"type": "module",
 	"scripts": {

package/src/node/index.ts

@@ -6,6 +6,7 @@ import {
 	EnvData,
 	initEnvData,
 	initSites,
+	initRequestSites,
 	modRender,
 	modRenderError,
 } from '../server/shared.js';
@@ -37,12 +38,15 @@ async function writeSitesCache(data: any): Promise<void> {
 async function initRouter(
 	serverMod: any,
 	env: EnvData,
+	sites?: SiteFromGraphQl[],
 ): Promise<[SiteFromGraphQl[], ServerRouter]> {
-	const sites = await initSites(env, {
-		enabled: process.env.NODE_ENV === 'production',
-		writeSitesCache,
-		readSitesCache,
-	});
+	if (!sites) {
+		sites = await initSites(env, {
+			enabled: process.env.NODE_ENV === 'production',
+			writeSitesCache,
+			readSitesCache,
+		});
+	}
 
 	const router = new ServerRouter(
 		env.endpointUrl,
@@ -113,7 +117,13 @@ export default async function createServer(serverMod: any, buildTime: string) {
 			throw routesError ?? new Error('Router not initialized');
 		}
 
-		const routeResp = await router.z_handle(req);
+		const requestSites = await initRequestSites(env, sites, req);
+		const requestRouter =
+			requestSites === sites
+				? router
+				: (await initRouter(serverMod, env, requestSites))[1];
+
+		const routeResp = await requestRouter.z_handle(req);
 		if (routeResp) {
 			await webResponseToResponse(routeResp, res);
 			return;
@@ -121,9 +131,14 @@ export default async function createServer(serverMod: any, buildTime: string) {
 
 		if (await basicAuthCheck(req, res, env)) return;
 
-		const response = await modRender(env, sites, serverMod, template, req, {
-			ssrManifest,
-		});
+		const response = await modRender(
+			env,
+			requestSites,
+			serverMod,
+			template,
+			req,
+			{ ssrManifest },
+		);
 		await webResponseToResponse(response, res);
 	};
 

package/src/queries/Queries.ts

@@ -58,11 +58,18 @@ export type QueryOptions = {
 	bearerToken?: string;
 
 	/**
-	 * Configure caching
+	 * Configure Crelte's local query caching.
 	 * @default true
 	 */
 	caching?: boolean;
 
+	/**
+	 * Allow Craft's configured GraphQL caching. Set false to bypass it.
+	 * Does not affect Crelte's caching.
+	 * @default true
+	 */
+	craftCaching?: boolean;
+
 	/**
 	 * Usually automatically set
 	 */
@@ -165,6 +172,7 @@ export default class Queries {
 			bearerToken,
 			xCraftSiteId,
 			caching: opts.caching ?? true,
+			craftCaching: opts.craftCaching ?? true,
 		});
 	}
 
@@ -183,6 +191,7 @@ type InnerQueryOptions = {
 	bearerToken: string | null;
 	xCraftSiteId: number | null;
 	caching: boolean;
+	craftCaching: boolean;
 };
 
 class Inner {
@@ -304,6 +313,8 @@ class Inner {
 		if (opts.xCraftSiteId)
 			headers['X-Craft-Site'] = opts.xCraftSiteId.toString();
 
+		if (!opts.craftCaching) headers['X-Craft-GQL-Cache'] = 'no-cache';
+
 		if (this.loggingRequests) {
 			console.log(logName + ' to:', url.toString(), vars, headers);
 			headers['X-Debug'] = 'enable';

package/src/routing/route/BaseRoute.ts

@@ -292,6 +292,13 @@ export default class BaseRoute {
 			this.z_context[key] = value;
 		}
 	}
+	/**
+	 * Returns the site preview token, or null if it is missing or empty.
+	 */
+	getSiteToken(): string | null {
+		return this.search.get('siteToken') || null;
+	}
+
 	/**
 	 * Returns true if the route is in live preview mode
 	 */

package/src/routing/router/BaseRouter.ts

@@ -235,9 +235,12 @@ export default class BaseRouter {
 		const req = this.targetToRequest(target, { origin: 'preload' });
 		const current = this.route.get();
 
-		// if the origin matches, the route will be able to be loaded
-		// so let's preload it
-		if (current && current.url.origin === req.url.origin) {
+		// Preload only within the current origin and site preview context.
+		if (
+			current &&
+			current.url.origin === req.url.origin &&
+			current.getSiteToken() === req.getSiteToken()
+		) {
 			// todo i don't wan't to send a CrelteRequest?
 			// todo, it would be nice if this could not have any side effects
 			// but at the moment cr.router.open will cause a redirect

package/src/routing/router/ClientRouter.ts

@@ -20,6 +20,7 @@ export default class ClientRouter extends BaseRouter {
 
 		this.scrollDebounceTimeout = null;
 		this.preloadOnMouseOver = opts.preloadOnMouseOver;
+
 		this.onError = () => {};
 	}
 
@@ -82,13 +83,7 @@ export default class ClientRouter extends BaseRouter {
 			}
 		}
 
-		// if the domain of the current site is different than the domain of the
-		// new site we need to do a window.location.href call
-		if (
-			(current && current.url.origin !== req.url.origin) ||
-			// @ts-ignore
-			import.meta.env.SSR
-		) {
+		if (this.requiresPageLoad(req)) {
 			window.location.href = req.url.href;
 			return;
 		}
@@ -107,6 +102,11 @@ export default class ClientRouter extends BaseRouter {
 	async pushRequest(req: Request, _opts: RequestOptions = {}) {
 		const url = req.url;
 
+		if (this.requiresPageLoad(req)) {
+			window.location.href = url.href;
+			return;
+		}
+
 		return this.handleRequest(req, route => {
 			window.history.pushState(
 				route.z_toState(),
@@ -119,6 +119,11 @@ export default class ClientRouter extends BaseRouter {
 	async replaceRequest(req: Request, _opts: RequestOptions = {}) {
 		const url = req.url;
 
+		if (this.requiresPageLoad(req)) {
+			window.location.replace(url.href);
+			return;
+		}
+
 		return this.handleRequest(req, () => {
 			window.history.replaceState(
 				req.z_toState(),
@@ -132,6 +137,15 @@ export default class ClientRouter extends BaseRouter {
 		window.history.back();
 	}
 
+	private requiresPageLoad(req: Request): boolean {
+		const current = this.route.get();
+		return (
+			!!current &&
+			(current.url.origin !== req.url.origin ||
+				current.getSiteToken() !== req.getSiteToken())
+		);
+	}
+
 	/**
 	 * This returns a route if it was handled else if an error occured
 	 * or the request was cancelled returns void
@@ -205,6 +219,11 @@ export default class ClientRouter extends BaseRouter {
 			});
 			req.z_fillFromState(e.state);
 
+			if (this.requiresPageLoad(req)) {
+				window.location.reload();
+				return;
+			}
+
 			// todo handle errors
 			this.handleRequest(req, () => {});
 		});

package/src/server/queries/QueryGqlRoute.ts

@@ -143,22 +143,15 @@ export default class QueryGqlRoute {
 			logInfo = `[queries: ${this.name}] vars: ${JSON.stringify(vars)}`;
 		}
 
-		let previewToken: string | null = null;
-		let siteToken: string | null = null;
-
 		const reqSearch = new URL(csr.req.url).searchParams;
-
-		if (reqSearch.has('token')) {
-			previewToken = reqSearch.get('token');
-		} else if (reqSearch.has('siteToken')) {
-			siteToken = reqSearch.get('siteToken');
-		}
+		const previewToken = reqSearch.get('token');
+		const siteToken = reqSearch.get('siteToken');
 
 		// check for x-craft-site header and pass it on
 		const xCraftSite = csr.req.headers.get('X-Craft-Site');
 
 		let cacheKey: string | null = null;
-		const useCache = !previewToken && caching.isEnabled();
+		const useCache = !previewToken && !siteToken && caching.isEnabled();
 		if (useCache) {
 			cacheKey = await calcKey({
 				...vars,
@@ -190,6 +183,10 @@ export default class QueryGqlRoute {
 
 		if (xCraftSite) headers['X-Craft-Site'] = xCraftSite;
 
+		if (csr.req.headers.get('X-Craft-GQL-Cache') === 'no-cache') {
+			headers['X-Craft-GQL-Cache'] = 'no-cache';
+		}
+
 		// now execute the gql request
 		let resp: Response;
 		try {

package/src/server/shared.ts

@@ -77,6 +77,7 @@ export type SitesCache = {
 export async function initSites(
 	env: EnvData,
 	cache?: SitesCache,
+	siteToken?: string,
 ): Promise<SiteFromGraphQl[]> {
 	const queries = Queries.new(
 		env.endpointUrl,
@@ -84,19 +85,34 @@ export async function initSites(
 		new SsrCache(),
 		{ bearerToken: env.endpointToken },
 	);
-	return await loadSites(queries, cache);
+	return await loadSites(queries, cache, siteToken);
+}
+
+export async function initRequestSites(
+	env: EnvData,
+	sites: SiteFromGraphQl[],
+	req: Request,
+): Promise<SiteFromGraphQl[]> {
+	const siteToken = new URL(req.url).searchParams.get('siteToken');
+	if (!siteToken) return sites;
+
+	// Preview sites belong to this request, not the shared site cache.
+	return await initSites(env, undefined, siteToken);
 }
 
 // requires, GraphQl, SsrCache
 async function loadSites(
 	queries: Queries,
 	cache?: SitesCache,
+	siteToken?: string,
 ): Promise<SiteFromGraphQl[]> {
-	if ('CRAFT_SITES_CACHED' in globalThis) {
+	const useCache = !siteToken;
+
+	if (useCache && 'CRAFT_SITES_CACHED' in globalThis) {
 		return (globalThis as any)['CRAFT_SITES_CACHED'];
 	}
 
-	if (cache?.enabled && cache?.readSitesCache) {
+	if (useCache && cache?.enabled && cache?.readSitesCache) {
 		try {
 			const sites = (await cache.readSitesCache()) as SiteFromGraphQl[];
 			// @ts-ignore
@@ -122,13 +138,15 @@ async function loadSites(
 		`,
 		{},
 		// don't cache since we cache ourself
-		{ caching: false },
+		{ caching: false, craftCaching: useCache, siteToken },
 	)) as { crelteSites: SiteFromGraphQl[] };
 
-	// @ts-ignore
-	globalThis['CRAFT_SITES_CACHED'] = resp.crelteSites;
-	if (cache?.enabled && cache?.writeSitesCache) {
-		await cache.writeSitesCache(resp.crelteSites);
+	if (useCache) {
+		// @ts-ignore
+		globalThis['CRAFT_SITES_CACHED'] = resp.crelteSites;
+		if (cache?.enabled && cache?.writeSitesCache) {
+			await cache.writeSitesCache(resp.crelteSites);
+		}
 	}
 	return resp.crelteSites;
 }

package/src/vite/index.ts

@@ -14,6 +14,7 @@ import {
 	EnvData,
 	initEnvData,
 	initSites,
+	initRequestSites,
 	modRender,
 	modRenderError,
 } from '../server/shared.js';
@@ -306,11 +307,13 @@ async function serveVite(env: EnvData, vite: ViteDevServer) {
 			sites = await initSites(env);
 		}
 
+		const requestSites = await initRequestSites(env, sites, req);
+
 		const router = new ServerRouter(
 			env.endpointUrl,
 			env.frontendUrl,
 			env.env,
-			sites,
+			requestSites,
 			{ endpointToken: env.endpointToken },
 		);
 
@@ -355,7 +358,13 @@ async function serveVite(env: EnvData, vite: ViteDevServer) {
 			return;
 		}
 
-		const response = await modRender(env, sites, serverMod, template, req);
+		const response = await modRender(
+			env,
+			requestSites,
+			serverMod,
+			template,
+			req,
+		);
 		await webResponseToResponse(response, res);
 	};