crelte 0.5.15 → 0.6.0-alpha.2

package/dist/std/encdec/escaping.d.ts

@@ -0,0 +1,2 @@
+export declare function escape_html<V>(value: V, is_attr?: boolean): string;
+//# sourceMappingURL=escaping.d.ts.map

package/dist/std/encdec/escaping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"escaping.d.ts","sourceRoot":"","sources":["../../../src/std/encdec/escaping.ts"],"names":[],"mappings":"AA2BA,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,GAAE,OAAe,UAmBhE"}

package/dist/std/encdec/escaping.js

@@ -0,0 +1,41 @@
+/*
+ * Code from Svelte (https://github.com/sveltejs/svelte/blob/b4968584df6be22222f58c273bdd8e04307ad36b/packages/svelte/src/escaping.js)
+ *
+ * Copyright (c) 2016-24 these people (https://github.com/sveltejs/svelte/graphs/contributors)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+const ATTR_REGEX = /[&"<]/g;
+const CONTENT_REGEX = /[&<]/g;
+export function escape_html(value, is_attr = false) {
+    const str = String(value ?? '');
+    const pattern = is_attr ? ATTR_REGEX : CONTENT_REGEX;
+    pattern.lastIndex = 0;
+    let escaped = '';
+    let last = 0;
+    while (pattern.test(str)) {
+        const i = pattern.lastIndex - 1;
+        const ch = str[i];
+        escaped +=
+            str.substring(last, i) +
+                (ch === '&' ? '&amp;' : ch === '"' ? '&quot;' : '&lt;');
+        last = i + 1;
+    }
+    return escaped + str.substring(last);
+}

package/dist/std/encdec/index.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Convert newlines to <br> tags and escape HTML.
+ *
+ * #### Warning
+ * When used in an attribute, the `isAttr` parameter needs to be set to `true`.
+ *
+ * #### Example
+ * ```svelte
+ * {@html nl2br("Hello\nWorld")}
+ * ```
+ */
+export declare function nl2br(str: string, isAttr?: boolean): string;
+//# sourceMappingURL=index.d.ts.map

package/dist/std/encdec/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/std/encdec/index.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM,CAElE"}

package/dist/std/encdec/index.js

@@ -0,0 +1,15 @@
+import { escape_html } from './escaping.js';
+/**
+ * Convert newlines to <br> tags and escape HTML.
+ *
+ * #### Warning
+ * When used in an attribute, the `isAttr` parameter needs to be set to `true`.
+ *
+ * #### Example
+ * ```svelte
+ * {@html nl2br("Hello\nWorld")}
+ * ```
+ */
+export function nl2br(str, isAttr = false) {
+    return escape_html(str, isAttr).replace(/\n/g, '<br>');
+}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/std/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjD;AAED,MAAM,WAAW,SAAS;IACzB,KAAK,IAAI,IAAI,CAAC;CACd;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAC7B,SAAS,GACT,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,CAAC;AAEb;;;GAGG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,oBAAoB,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAIjE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/std/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjD;AAED,MAAM,WAAW,SAAS;IACzB,KAAK,IAAI,IAAI,CAAC;CACd;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAC/B,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,oBAAoB,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAIjE"}

package/dist/utils.d.ts

@@ -10,4 +10,5 @@ export declare function isPromise<T>(p: Promise<T> | T): p is Promise<T>;
  */
 export declare function promiseThen<T, R = void>(p: Promise<T> | T, then: (val: T) => R): Promise<R> | R;
 export declare function urlWithPath(url: string, path?: string): URL;
+export declare function cryptoSha1Hash(str: string): Promise<string>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAMtC;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAE/D;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,EACtC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EACjB,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GACjB,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAEhB;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,CAI3D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAMtC;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAE/D;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,EACtC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EACjB,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GACjB,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAEhB;AAGD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,CAI3D;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBjE"}

package/dist/utils.js

@@ -26,3 +26,20 @@ export function urlWithPath(url, path) {
     u.pathname = path ?? '';
     return u;
 }
+export async function cryptoSha1Hash(str) {
+    // Convert the string data to an ArrayBuffer
+    const encoder = new TextEncoder();
+    const dataBuffer = encoder.encode(str);
+    // Use the Web Crypto API to hash the data with SHA-1
+    const hashBuffer = await crypto.subtle.digest('SHA-1', dataBuffer);
+    const bytes = new Uint8Array(hashBuffer);
+    // @ts-ignore using 2025 baseline feature
+    if (typeof bytes.toHex === 'function')
+        return bytes.toHex();
+    // Convert the ArrayBuffer to a hex string
+    const hashArray = Array.from(bytes); // Create an array from the buffer
+    const hashHex = hashArray
+        .map(b => b.toString(16).padStart(2, '0'))
+        .join(''); // Convert to hex string
+    return hashHex;
+}

package/dist/vite/index.d.ts

@@ -1,7 +1,3 @@
 import { Plugin } from 'vite';
-export type CrelteOptions = {
-    /** If not specified tries to detect which version is installed */
-    svelte4?: boolean;
-};
-export default function crelte(opts?: CrelteOptions): Plugin;
+export default function crelte(): Plugin;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,MAAM,EAON,MAAM,MAAM,CAAC;AAkJd,MAAM,MAAM,aAAa,GAAG;IAC3B,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,MAAM,CAyK3D"}
+{"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,13 +1,12 @@
 import { relative } from 'node:path';
-import MagicString from 'magic-string';
 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 sveltePackage from 'svelte/package.json' with { type: 'json' };
 import { initQueryRoutes } from '../server/queries/queries.js';
 import { PLATFORM, requestToWebRequest, webResponseToResponse, } from '../node/utils.js';
 import QueryError from '../queries/QueryError.js';
+import { generateTransform, rolldownString, } from 'rolldown-string';
 const VIRT_MOD_ID = 'virtual:crelte/svelteComponents';
 const RESOLVED_VIRT_MOD_ID = '\0' + VIRT_MOD_ID;
 async function readFile(path) {
@@ -17,41 +16,31 @@ async function readFile(path) {
 // todo need to find a better solution
 // for reference https://github.com/sveltejs/svelte/issues/4854
 // and https://github.com/sveltejs/svelte/pull/5476
-function usedSsrComponents(code, id, options, svelte5) {
+function usedSsrComponents(code, id, options) {
     if (!options?.ssr || !id.endsWith('.svelte'))
         return;
     const file = relative('.', id);
-    let idx;
-    if (svelte5) {
-        const defFnSign = 'export default function ';
-        idx = code.indexOf(defFnSign);
-        if (idx < 0)
-            return;
-        const withPropsIdx = code.indexOf('($$renderer, $$props) {', idx);
-        const noPropsIdx = code.indexOf('($$renderer) {', idx);
-        idx = withPropsIdx >= 0 ? withPropsIdx : noPropsIdx;
-        if (idx < 0) {
-            console.error('could not find svelte5 init', id);
-            return;
-        }
-        const renderCompSign = '$$renderer.component(($$renderer) => {';
-        const renderCompIdx = code.indexOf(renderCompSign, idx);
-        if (renderCompIdx >= 0)
-            idx = renderCompIdx;
-        // Find the end of the line where the pattern was found
-        idx = code.indexOf('\n', idx);
-        if (idx < 0)
-            return;
-        idx += 1; // \n
-    }
-    else {
-        const initFnSign = 'create_ssr_component(($$result, $$props, $$bindings, slots) => {';
-        idx = code.indexOf(initFnSign);
-        if (idx < 0)
-            return;
-        idx += initFnSign.length;
+    const defFnSign = 'export default function ';
+    let idx = code.indexOf(defFnSign);
+    if (idx < 0)
+        return;
+    const withPropsIdx = code.indexOf('($$renderer, $$props) {', idx);
+    const noPropsIdx = code.indexOf('($$renderer) {', idx);
+    idx = withPropsIdx >= 0 ? withPropsIdx : noPropsIdx;
+    if (idx < 0) {
+        console.error('could not find svelte5 init', id);
+        return;
     }
-    const s = new MagicString(code);
+    const renderCompSign = '$$renderer.component(($$renderer) => {';
+    const renderCompIdx = code.indexOf(renderCompSign, idx);
+    if (renderCompIdx >= 0)
+        idx = renderCompIdx;
+    // Find the end of the line where the pattern was found
+    idx = code.indexOf('\n', idx);
+    if (idx < 0)
+        return;
+    idx += 1; // \n
+    const s = rolldownString(code, id, options);
     s.prepend(`import { getContext as __modulesGetContext } from 'svelte';\n`);
     const ctxAdd = `
 (() => {
@@ -62,14 +51,7 @@ if (ctx && ctx instanceof Set) {
 })();
 `;
     s.appendLeft(idx, ctxAdd);
-    return {
-        map: s.generateMap({
-            source: id,
-            includeContent: true,
-            hires: 'boundary',
-        }),
-        code: s.toString(),
-    };
+    return generateTransform(s, id);
 }
 // transform graphql files into a GraphQlQuery which can called with
 // crelte.query or graphQl.query
@@ -82,18 +64,14 @@ function graphQlFiles(code, path, ssr) {
     const name = filename.substring(0, filename.length - '.graphql'.length);
     if (!ssr) {
         return `
-export default {
-	queryName: ${JSON.stringify(name)}
-};
+export default ${JSON.stringify(name)};
 `;
     }
     const json = JSON.stringify(code)
         .replace(/\u2028/g, '\\u2028')
         .replace(/\u2029/g, '\\u2029');
     return `
-export default {
-	queryName: ${JSON.stringify(name)}
-};
+export default ${JSON.stringify(name)};
 
 export const query = {
 	path: ${JSON.stringify(path)},
@@ -101,21 +79,12 @@ export const query = {
 };
 `;
 }
-function isSvelte5() {
-    if (sveltePackage && sveltePackage.version) {
-        return sveltePackage.version.startsWith('5.');
-    }
-    // Fallback or error handling if version cannot be determined
-    console.warn('Could not determine Svelte version. Assuming not Svelte 5.');
-    return false;
-}
 // outside of crelte because each build executes crelte again
 let isSsrBuild = false;
-export default function crelte(opts) {
+export default function crelte() {
     let viteConfig;
     let viteConfigEnv;
     let initialConfig;
-    const svelte5 = opts?.svelte4 ? false : isSvelte5();
     return {
         name: 'crelte',
         config(config, configEnv) {
@@ -167,28 +136,18 @@ export default function crelte(opts) {
                     `createServer(server, ${Date.now()});`);
             }
             if (id === RESOLVED_VIRT_MOD_ID) {
-                if (svelte5) {
-                    return (`import { hydrate } from 'svelte';` +
-                        `import { render } from 'svelte/server';` +
-                        `export function internalSvelteMount(comp, options) {` +
-                        `return hydrate(comp, options);` +
-                        `}` +
-                        `export function internalSvelteRender(comp, options) {` +
-                        `return render(comp, options);` +
-                        `}`);
-                }
-                else {
-                    return (`export function internalSvelteMount(comp, options) {` +
-                        `return new comp({ ...options, hydrate: true });` +
-                        `}` +
-                        `export function internalSvelteRender(comp, options) {` +
-                        `return comp.render(options.props, options);` +
-                        `}`);
-                }
+                return (`import { hydrate } from 'svelte';` +
+                    `import { render } from 'svelte/server';` +
+                    `export function internalSvelteMount(comp, options) {` +
+                    `return hydrate(comp, options);` +
+                    `}` +
+                    `export function internalSvelteRender(comp, options) {` +
+                    `return render(comp, options);` +
+                    `}`);
             }
         },
         transform(code, id, options) {
-            return (usedSsrComponents(code, id, options, svelte5) ||
+            return (usedSsrComponents(code, id, options) ||
                 graphQlFiles(code, id, !!options?.ssr));
         },
         async configureServer(vite) {
@@ -264,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);
@@ -291,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.5.15",
+	"version": "0.6.0-alpha.2",
 	"author": "Crelte <support@crelte.com>",
 	"type": "module",
 	"scripts": {
@@ -111,22 +111,27 @@
 		"./std/url": {
 			"types": "./dist/std/url/index.d.ts",
 			"default": "./dist/std/url/index.js"
+		},
+		"./std/encdec": {
+			"types": "./dist/std/encdec/index.d.ts",
+			"default": "./dist/std/encdec/index.js"
 		}
 	},
 	"dependencies": {
-		"magic-string": "^0.30.17",
+		"devalue": "^5.9.0",
+		"rolldown-string": "^0.3.1",
 		"trouter": "^4.0.0"
 	},
 	"peerDependencies": {
-		"svelte": "^4.0.0 || ^5.39.1",
-		"vite": "^5.0.0 || ^6.0.0"
+		"svelte": "^5.39.1",
+		"vite": "^8.0.0"
 	},
 	"devDependencies": {
 		"@sveltejs/package": "^2.3.1",
-		"@sveltejs/vite-plugin-svelte": "^4.0.0",
+		"@sveltejs/vite-plugin-svelte": "^7.0.0",
+		"@types/node": "^22.13.10",
 		"svelte-check": "^4.1.4",
 		"typescript-svelte-plugin": "^0.3.45",
-		"vitest": "^3.0.0",
-		"@types/node": "^22.13.10"
+		"vitest": "^4.0.0"
 	}
 }

package/src/blocks/Blocks.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
 	import { type BlocksInstance } from './index.js';
 
-	export let blocks: BlocksInstance;
+	// eslint-disable-next-line svelte/valid-compile
+	let { blocks, ...rest }: { blocks: BlocksInstance } = $props();
 </script>
 
-{#each blocks.each() as { mod, props }}
-	<svelte:component this={mod} {...props} {...$$restProps} />
+{#each blocks.each() as { mod: Mod, props }}
+	<Mod {...props} {...rest} />
 {/each}

package/src/crelte.ts

@@ -127,10 +127,10 @@ export type Crelte = {
 	/**
 	 * returns an env variable from the craft/.env file.
 	 * All env variables need to start with VITE_
-	 * except ENDPOINT_URL, CRAFT_WEB_URL and FRONTEND_URL
+	 * except ENDPOINT_URL, CRAFT_BASE_CP_URL and FRONTEND_URL
 	 */
 	getEnv(name: 'ENDPOINT_URL'): string;
-	getEnv(name: 'CRAFT_WEB_URL'): string;
+	getEnv(name: 'CRAFT_BASE_CP_URL'): string;
 	getEnv(name: 'FRONTEND_URL'): string;
 	getEnv(name: string): string | null;
 

package/src/index.ts

@@ -125,13 +125,13 @@ export function getEntry(): Readable<Entry> {
 /**
  * returns an env variable from the craft/.env file.
  * All env variables need to start with VITE_
- * except ENDPOINT_URL, CRAFT_WEB_URL and FRONTEND_URL
+ * except ENDPOINT_URL, CRAFT_BASE_CP_URL and FRONTEND_URL
  *
  * #### Note
  * This only works during component initialisation.
  */
 export function getEnv(name: 'ENDPOINT_URL'): string;
-export function getEnv(name: 'CRAFT_WEB_URL'): string;
+export function getEnv(name: 'CRAFT_BASE_CP_URL'): string;
 export function getEnv(name: 'FRONTEND_URL'): string;
 export function getEnv(name: string): string | null;
 export function getEnv(name: string): string | null {

package/src/init/InternalApp.ts

@@ -27,8 +27,7 @@ export interface TemplateModule {
 }
 
 export type LazyTemplateModule =
-	| (() => Promise<TemplateModule>)
-	| TemplateModule;
+	(() => Promise<TemplateModule>) | TemplateModule;
 
 export type TemplateModules = Map<string, LazyTemplateModule>;
 
@@ -54,7 +53,7 @@ export default class InternalApp {
 	}
 
 	get loadGlobalData(): LoadData<null> {
-		return this.inner.loadGlobalData ?? { queryName: 'global' };
+		return this.inner.loadGlobalData ?? 'global';
 	}
 
 	init(crelte: Crelte): void {
@@ -63,7 +62,7 @@ export default class InternalApp {
 
 	get loadEntry(): LoadData<null> {
 		// if no loadEntry property was defined we expect a graphql entry file
-		return this.inner.loadEntry ?? { queryName: 'entry' };
+		return this.inner.loadEntry ?? 'entry';
 	}
 
 	async loadTemplate(entry: Entry): Promise<TemplateModule> {

package/src/init/server.ts

@@ -7,7 +7,7 @@ import {
 	setupPlugins,
 } from './shared.js';
 import SsrComponents from '../ssr/SsrComponents.js';
-import SsrCache from '../ssr/SsrCache.js';
+import SsrCache, { ssrCacheExportToHead } from '../ssr/SsrCache.js';
 import ServerCookies from '../cookies/ServerCookies.js';
 import { svelteRender } from './svelteComponents.js';
 import ServerRouter from '../routing/router/ServerRouter.js';
@@ -74,7 +74,7 @@ export async function main(data: MainData): Promise<RenderResponse> {
 
 	const endpoint = data.serverData.endpoint;
 	ssrCache.set('ENDPOINT_URL', endpoint);
-	ssrCache.set('CRAFT_WEB_URL', data.serverData.craftWeb);
+	ssrCache.set('CRAFT_BASE_CP_URL', data.serverData.craftUrl);
 	ssrCache.set('FRONTEND_URL', data.serverData.frontend);
 
 	const cookies = new ServerCookies(data.serverData.headers);
@@ -154,7 +154,7 @@ export async function main(data: MainData): Promise<RenderResponse> {
 
 	bodyClass.z_populateSsrCache(ssrCache);
 	head += ssrComponents.toHead(data.serverData.ssrManifest);
-	head += crelte.ssrCache.z_exportToHead();
+	head += ssrCacheExportToHead(crelte.ssrCache);
 
 	let htmlTemplate = data.serverData.htmlTemplate;
 	htmlTemplate = htmlTemplate.replace(
@@ -234,7 +234,7 @@ export async function mainError(
 	});
 
 	head += ssrComponents.toHead(data.serverData.ssrManifest);
-	head += ssrCache.z_exportToHead();
+	head += ssrCacheExportToHead(ssrCache);
 
 	let htmlTemplate = data.serverData.htmlTemplate;
 	htmlTemplate = htmlTemplate.replace('<!--page-lang-->', 'de');

package/src/loadData/loadData.ts

@@ -74,8 +74,6 @@ export type LoadData<A1 = any> =
 	| Query
 	| LoadDataObj<A1>
 	| LoadDataArray<A1>
-	| string
-	| number
 	| null
 	| undefined;
 

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);
 	};