crelte 0.2.2 → 0.3.0

package/dist/Crelte.d.ts

@@ -1,12 +1,45 @@
 import { Cookies } from './cookies/index.js';
-import GraphQl, { GraphQlOptions, GraphQlQuery } from './graphql/GraphQl.js';
-import Globals, { Global, GlobalData } from './loadData/Globals.js';
+import GraphQl, { GraphQlQuery } from './graphql/GraphQl.js';
+import Globals, { Global } from './loadData/Globals.js';
 import Events from './plugins/Events.js';
 import Plugins, { Plugin } from './plugins/Plugins.js';
-import Router, { RouterOptions } from './routing/Router.js';
+import Router from './routing/Router.js';
 import { SiteFromGraphQl } from './routing/Site.js';
 import SsrCache from './ssr/SsrCache.js';
+export type Config = {
+    /**
+     * Preload pages on mouse over
+     * @default false
+     */
+    preloadOnMouseOver?: boolean;
+    /**
+     * Use view transitions
+     * @default false
+     */
+    viewTransition?: boolean;
+    /**
+     * Play the intro animation
+     * @default false
+     */
+    playIntro?: boolean;
+    /**
+     * Enable X-Craft-Site Header
+     * @default false
+     */
+    XCraftSiteHeader?: boolean;
+    /**
+     * Enable graphql query debugging
+     * @default false
+     */
+    debugGraphQl?: boolean;
+    /**
+     * Enable request and render timing measurement
+     * @default false
+     */
+    debugTiming?: boolean;
+};
 export declare class CrelteBuilder {
+    config: Config;
     ssrCache: SsrCache;
     plugins: Plugins;
     events: Events;
@@ -14,9 +47,9 @@ export declare class CrelteBuilder {
     router?: Router;
     globals: Globals;
     cookies: Cookies;
-    constructor();
-    setupGraphQl(endpoint: string, opts?: GraphQlOptions): void;
-    setupRouter(sites: SiteFromGraphQl[], opts?: RouterOptions): void;
+    constructor(config: Config);
+    setupGraphQl(endpoint: string): void;
+    setupRouter(sites: SiteFromGraphQl[]): void;
     setupCookies(cookies: string): void;
     build(): Crelte;
 }
@@ -40,11 +73,18 @@ export type QueryOptions = {
      * `ignoreStatusCode` is set to `true`
      */
     status?: number;
+    /**
+     * A GraphQl Token generated in Craft
+     */
+    bearerToken?: string;
 };
 /**
  * This is the main class of Crelte and can be accessed
- * in component initialisation via `getCrelte()` and is the
- * first parameter in `loadData`
+ * in component initialisation via `getCrelte()`
+ *
+ * Crelte is stateless, which means it is not associated with
+ * a specific route or site. If you need a statefull crelte
+ * use the function `toCrelteRequest`
  */
 export default class Crelte {
     protected _ssrCache: SsrCache;
@@ -103,7 +143,7 @@ export default class Crelte {
      * always return null. In that context you should use
      * `CrelteRequest.getGlobalAsync`
      */
-    getGlobal<T extends GlobalData>(name: string): Global<T> | null;
+    getGlobalStore<T = any>(name: string): Global<T> | null;
     /**
      * Run a GraphQl Query
      *

package/dist/Crelte.d.ts.map

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

package/dist/Crelte.js

@@ -6,7 +6,16 @@ import Events from './plugins/Events.js';
 import Plugins from './plugins/Plugins.js';
 import Router from './routing/Router.js';
 import SsrCache from './ssr/SsrCache.js';
+const defaultConfig = {
+    preloadOnMouseOver: false,
+    viewTransition: false,
+    playIntro: false,
+    XCraftSiteHeader: false,
+    debugGraphQl: false,
+    debugTiming: false,
+};
 export class CrelteBuilder {
+    config;
     ssrCache;
     plugins;
     events;
@@ -14,7 +23,8 @@ export class CrelteBuilder {
     router;
     globals;
     cookies;
-    constructor() {
+    constructor(config) {
+        this.config = { ...defaultConfig, ...config };
         this.ssrCache = new SsrCache();
         this.plugins = new Plugins();
         this.events = new Events();
@@ -24,11 +34,18 @@ export class CrelteBuilder {
             ? new ServerCookies()
             : new ClientCookies();
     }
-    setupGraphQl(endpoint, opts = {}) {
-        this.graphQl = new GraphQl(endpoint, this.ssrCache, opts);
+    setupGraphQl(endpoint) {
+        this.graphQl = new GraphQl(endpoint, this.ssrCache, {
+            XCraftSiteHeader: this.config.XCraftSiteHeader,
+            debug: this.config.debugGraphQl,
+            debugTiming: this.config.debugTiming,
+        });
     }
-    setupRouter(sites, opts = {}) {
-        this.router = new Router(sites, opts);
+    setupRouter(sites) {
+        this.router = new Router(sites, {
+            preloadOnMouseOver: this.config.preloadOnMouseOver,
+            debugTiming: this.config.debugTiming,
+        });
     }
     setupCookies(cookies) {
         this.cookies._init(cookies);
@@ -39,8 +56,11 @@ export class CrelteBuilder {
 }
 /**
  * This is the main class of Crelte and can be accessed
- * in component initialisation via `getCrelte()` and is the
- * first parameter in `loadData`
+ * in component initialisation via `getCrelte()`
+ *
+ * Crelte is stateless, which means it is not associated with
+ * a specific route or site. If you need a statefull crelte
+ * use the function `toCrelteRequest`
  */
 export default class Crelte {
     _ssrCache;
@@ -120,8 +140,8 @@ export default class Crelte {
      * always return null. In that context you should use
      * `CrelteRequest.getGlobalAsync`
      */
-    getGlobal(name) {
-        return this.globals.get(name) ?? null;
+    getGlobalStore(name) {
+        return this.globals.getStore(name) ?? null;
     }
     /**
      * Run a GraphQl Query
@@ -134,7 +154,7 @@ export default class Crelte {
     async query(query, variables = {}, opts = {}) {
         // this function is added as convenience
         return this.graphQl.query(query, variables, {
-            route: this.router.route.get(),
+            route: this.router.route.get() ?? undefined,
             ...opts,
         });
     }

package/dist/CrelteRequest.d.ts

@@ -3,13 +3,11 @@ import { GraphQlQuery } from './graphql/GraphQl.js';
 import Site from './routing/Site.js';
 import Request from './routing/Request.js';
 import Route from './routing/Route.js';
-import { GlobalData } from './loadData/Globals.js';
 export default class CrelteRequest extends Crelte {
     /**
      * The current request
      */
     req: Request;
-    private innerGlobals;
     constructor(inner: Crelte, req: Request);
     /**
      * Create a CrelteRequest from a Crelte instance
@@ -21,7 +19,7 @@ export default class CrelteRequest extends Crelte {
      * If you provide a route it must contain a site or you must
      * provide one,
      */
-    static fromCrelte(inner: Crelte, req?: Route | Request): CrelteRequest;
+    static fromCrelte(inner: Crelte | CrelteRequest, req?: Route | Request): CrelteRequest;
     /**
      * Get the current request
      * @deprecated
@@ -44,7 +42,7 @@ export default class CrelteRequest extends Crelte {
      * always return null. In that context you should use
      * `.getGlobalAsync`
      */
-    getGlobal<T extends GlobalData>(name: string): T | null;
+    getGlobal<T = any>(name: string): T | null;
     /**
      * Get a globalSet and wait until it is loaded
      *
@@ -52,7 +50,7 @@ export default class CrelteRequest extends Crelte {
      * This is only useful in loadGlobalData in all other cases
      * you can use `.getGlobal` which does return a Promise
      */
-    getGlobalAsync<T extends GlobalData>(name: string): Promise<T | null>;
+    getGlobalAsync<T = any>(name: string): Promise<T | null>;
     /**
      * Run a GraphQl Query
      *
@@ -62,7 +60,5 @@ export default class CrelteRequest extends Crelte {
      * graphql query
      */
     query(query: GraphQlQuery, variables?: Record<string, unknown>, opts?: QueryOptions): Promise<unknown>;
-    /** @hidden */
-    _globalDataLoaded(): void;
 }
 //# sourceMappingURL=CrelteRequest.d.ts.map

package/dist/CrelteRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CrelteRequest.d.ts","sourceRoot":"","sources":["../../../src/CrelteRequest.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,MAAM;IAChD;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb,OAAO,CAAC,YAAY,CAAmB;gBAE3B,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO;IAOvC;;;;;;;;;OASG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,aAAa;IAWtE;;;OAGG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,IAAI,CAEf;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAIvD;;;;;;OAMG;IACG,cAAc,CAAC,CAAC,SAAS,UAAU,EACxC,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAUpB;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,YAAY,EACnB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACvC,IAAI,GAAE,YAAiB,GACrB,OAAO,CAAC,OAAO,CAAC;IAQnB,cAAc;IACd,iBAAiB;CAGjB"}
+{"version":3,"file":"CrelteRequest.d.ts","sourceRoot":"","sources":["../../../src/CrelteRequest.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,MAAM,oBAAoB,CAAC;AAEvC,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,MAAM;IAChD;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;gBAED,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO;IAMvC;;;;;;;;;OASG;IACH,MAAM,CAAC,UAAU,CAChB,KAAK,EAAE,MAAM,GAAG,aAAa,EAC7B,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,GACnB,aAAa;IAehB;;;OAGG;IACH,IAAI,KAAK,IAAI,OAAO,CAGnB;IAED;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,IAAI,CAEf;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAI1C;;;;;;OAMG;IACG,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAI9D;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,YAAY,EACnB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACvC,IAAI,GAAE,YAAiB,GACrB,OAAO,CAAC,OAAO,CAAC;CAOnB"}

package/dist/CrelteRequest.js

@@ -5,11 +5,9 @@ export default class CrelteRequest extends Crelte {
      * The current request
      */
     req;
-    innerGlobals;
     constructor(inner, req) {
         super(inner);
         this.req = req;
-        this.innerGlobals = new Map();
     }
     /**
      * Create a CrelteRequest from a Crelte instance
@@ -22,8 +20,13 @@ export default class CrelteRequest extends Crelte {
      * provide one,
      */
     static fromCrelte(inner, req) {
+        if (inner instanceof CrelteRequest && !req)
+            return inner;
         if (!req) {
-            req = inner.router.route.get();
+            req = inner.router.route.get() ?? undefined;
+            // this will only occur in the first loadData call
+            if (!req)
+                throw new Error('router does not contain a route');
         }
         return new CrelteRequest(inner, req instanceof Request ? req : Request.fromRoute(req));
     }
@@ -32,6 +35,7 @@ export default class CrelteRequest extends Crelte {
      * @deprecated
      */
     get route() {
+        console.warn('CrelteRequest.route is deprecated, use .req instead');
         return this.req;
     }
     /**
@@ -54,7 +58,7 @@ export default class CrelteRequest extends Crelte {
      * `.getGlobalAsync`
      */
     getGlobal(name) {
-        return this.innerGlobals.get(name) ?? null;
+        return this.globals.get(name, this.site.id);
     }
     /**
      * Get a globalSet and wait until it is loaded
@@ -64,13 +68,7 @@ export default class CrelteRequest extends Crelte {
      * you can use `.getGlobal` which does return a Promise
      */
     async getGlobalAsync(name) {
-        const global = this.innerGlobals.get(name);
-        if (global)
-            return global;
-        const r = await this.globals.getAsync(name);
-        if (!r)
-            return null;
-        return r.bySiteId(this.site.id);
+        return this.globals.getAsync(name, this.site.id);
     }
     /**
      * Run a GraphQl Query
@@ -87,8 +85,4 @@ export default class CrelteRequest extends Crelte {
             ...opts,
         });
     }
-    /** @hidden */
-    _globalDataLoaded() {
-        this.innerGlobals = this.globals._globalsBySite(this.site.id);
-    }
 }

package/dist/graphql/GraphQl.d.ts

@@ -35,6 +35,7 @@ export declare class GraphQlError extends Error {
  * Options for the GraphQl class
  */
 export type GraphQlOptions = {
+    XCraftSiteHeader?: boolean;
     debug?: boolean;
     debugTiming?: boolean;
 };
@@ -50,10 +51,15 @@ export type GraphQlOptions = {
  */
 export type GraphQlRequestOptions = {
     path?: string;
+    /**
+     * !! the route here might not contain a site even if the types
+     * says it does. CrelteServer does not know about site
+     */
     route?: Route | URL;
     ignoreStatusCode?: boolean;
     previewToken?: string;
     siteToken?: string;
+    bearerToken?: string;
     caching?: boolean;
     headers?: Record<string, string>;
     status?: number;
@@ -65,6 +71,7 @@ export default class GraphQl {
     private endpoint;
     private ssrCache;
     private listeners;
+    private XCraftSiteHeader;
     private loggingRequests;
     private loggingTiming;
     /**

package/dist/graphql/GraphQl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphQl.d.ts","sourceRoot":"","sources":["../../../../src/graphql/GraphQl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAE1E,MAAM,MAAM,oBAAoB,GAAG;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd;AAGD;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;IACtC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,GAAG,EAAE,GAAG,CAAC;gBAGG,IAAI,EAAE,oBAAoB,EAAE,GAAG,GAAE,GAAU;IAOvD;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB,kBAAkB;IAElB;;OAEG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;CACD;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,KAAK,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjC,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,SAAS,CAGf;IAEF,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,aAAa,CAAU;IAE/B;;OAEG;gBAEF,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,GAAE,cAAmB;IAU1B;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,YAAY,EACnB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACvC,IAAI,GAAE,qBAA0B,GAC9B,OAAO,CAAC,OAAO,CAAC;YAuBL,OAAO;YA0DP,UAAU;CAmFxB;AAED,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,YAAY,CAI5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,GAAG,CAClB,OAAO,EAAE,oBAAoB,GAAG,MAAM,EAAE,GAAG,MAAM,EACjD,GAAG,IAAI,EAAE,OAAO,EAAE,GAChB,YAAY,CAuBd"}
+{"version":3,"file":"GraphQl.d.ts","sourceRoot":"","sources":["../../../../src/graphql/GraphQl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAE1E,MAAM,MAAM,oBAAoB,GAAG;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd;AAGD;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;IACtC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,GAAG,EAAE,GAAG,CAAC;gBAGG,IAAI,EAAE,oBAAoB,EAAE,GAAG,GAAE,GAAU;IAOvD;;OAEG;IACH,MAAM,IAAI,MAAM;IAIhB,kBAAkB;IAElB;;OAEG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;CACD;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjC,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,SAAS,CAGf;IAEF,OAAO,CAAC,gBAAgB,CAAU;IAClC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,aAAa,CAAU;IAE/B;;OAEG;gBAEF,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,GAAE,cAAmB;IAW1B;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,YAAY,EACnB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACvC,IAAI,GAAE,qBAA0B,GAC9B,OAAO,CAAC,OAAO,CAAC;YAiCL,OAAO;YA0DP,UAAU;CAsFxB;AAED,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,YAAY,CAI5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,GAAG,CAClB,OAAO,EAAE,oBAAoB,GAAG,MAAM,EAAE,GAAG,MAAM,EACjD,GAAG,IAAI,EAAE,OAAO,EAAE,GAChB,YAAY,CAuBd"}

package/dist/graphql/GraphQl.js

@@ -33,6 +33,7 @@ export default class GraphQl {
     endpoint;
     ssrCache;
     listeners;
+    XCraftSiteHeader;
     loggingRequests;
     loggingTiming;
     /**
@@ -42,6 +43,7 @@ export default class GraphQl {
         this.endpoint = endpoint;
         this.ssrCache = ssrCache;
         this.listeners = new Map();
+        this.XCraftSiteHeader = opts?.XCraftSiteHeader ?? false;
         this.loggingRequests = opts?.debug ?? false;
         this.loggingTiming = opts?.debugTiming ?? false;
     }
@@ -56,15 +58,24 @@ export default class GraphQl {
     async query(query, variables = {}, opts = {}) {
         if (opts.route) {
             const search = opts.route.searchParams ?? opts.route.search;
-            // todo should variables contain siteId
-            // or maybe gql should detect loadData and add it there
-            // it might make export const loadData = query; easier
             if (search.has('token') && search.get('x-craft-live-preview')) {
                 opts.previewToken = search.get('token');
             }
             else if (search.has('siteToken')) {
                 opts.siteToken = search.get('siteToken');
             }
+            // if the siteId is not set we set it as an argument for
+            // convenience
+            if (opts.route.site) {
+                if (this.XCraftSiteHeader && !opts.headers?.['X-Craft-Site']) {
+                    opts.headers = opts.headers ?? {};
+                    opts.headers['X-Craft-Site'] =
+                        opts.route.site.id + '';
+                }
+                if (typeof variables.siteId === 'undefined') {
+                    variables.siteId = opts.route.site.id;
+                }
+            }
         }
         opts.path = query.path;
         return await this.request(query.query, variables, opts);
@@ -126,6 +137,8 @@ export default class GraphQl {
             url += '?siteToken=' + opts.siteToken;
         const headers = opts?.headers ?? {};
         headers['Content-Type'] = 'application/json';
+        if (opts?.bearerToken)
+            headers['Authorization'] = 'Bearer ' + opts.bearerToken;
         if (this.loggingRequests) {
             console.log('query to ', url, variables, opts);
             headers['X-Debug'] = 'enable';

package/dist/index.d.ts

@@ -1,15 +1,16 @@
 import type Route from './routing/Route.js';
+import type Request from './routing/Request.js';
 import type Router from './routing/Router.js';
 import type SsrCache from './ssr/SsrCache.js';
 import type Site from './routing/Site.js';
 import type GraphQl from './graphql/GraphQl.js';
-import Crelte, { type QueryOptions } from './Crelte.js';
+import Crelte, { type QueryOptions, type Config } from './Crelte.js';
 import CrelteRequest from './CrelteRequest.js';
-import type { Global, GlobalData } from './loadData/Globals.js';
+import type { Global } from './loadData/Globals.js';
 import type { Cookies } from './cookies/index.js';
 import type { Readable } from 'crelte-std/stores';
 import { LoadData, LoadDataArray, LoadDataFn, LoadDataObj } from './loadData/index.js';
-export { Crelte, CrelteRequest, type QueryOptions, type LoadData, type LoadDataFn, type LoadDataObj, type LoadDataArray, };
+export { Crelte, CrelteRequest, type Config, type QueryOptions, type LoadData, type LoadDataFn, type LoadDataObj, type LoadDataArray, };
 /**
  * Get Crelte from the current context
  *
@@ -83,7 +84,7 @@ export declare function getLoadingProgress(): Readable<number>;
  * ## Note
  * This only works during component initialisation.
  */
-export declare function getGlobal<T extends GlobalData>(name: string): Global<T> | null;
+export declare function getGlobal<T = any>(name: string): Global<T> | null;
 /**
  * returns the cookies instance
  *
@@ -91,6 +92,16 @@ export declare function getGlobal<T extends GlobalData>(name: string): Global<T>
  * This only works during component initialisation.
  */
 export declare function getCookies(): Cookies;
+/**
+ * A function to make sure you have a CrelteRequest
+ */
+export declare function toCrelteRequest(crelte: Crelte | CrelteRequest, req?: Route | Request): CrelteRequest;
+/**
+ * Listen for route changes
+ *
+ * ## Note
+ * This only works during component initialisation.
+ */
 export declare function onRoute(fn: (route: Route, crelte: Crelte) => void): void;
 /**
  * Listen for requests

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,MAAM,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,MAAM,EACN,aAAa,EACb,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,GAClB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAExC;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAAC;AACtD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAKpD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,MAAM,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,UAAU,EAC7C,IAAI,EAAE,MAAM,GACV,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAElB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,QAOjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,QAOxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,MAAM,EAAE,EAAE,KAAK,YAAY,EAAE,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACN,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,MAAM,EACN,aAAa,EACb,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,GAClB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAK1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAKxC;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAAC;AACtD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAKpD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,MAAM,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAEjE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC9B,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,GACnB,aAAa,CAEf;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,QAOjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,QAOxD"}

package/dist/index.js

@@ -45,6 +45,9 @@ export function getGraphQl() {
  * This only works during component initialisation.
  */
 export function getRoute() {
+    // the route will never be null because it is only null in the
+    // first loadData call and that happens before any component
+    // initialisation
     return getRouter().route;
 }
 /**
@@ -54,6 +57,9 @@ export function getRoute() {
  * This only works during component initialisation.
  */
 export function getSite() {
+    // the site will never be null because it is only null in the
+    // first loadData call and that happens before any component
+    // initialisation
     return getRouter().site;
 }
 export function getEnv(name) {
@@ -84,7 +90,7 @@ export function getLoadingProgress() {
  * This only works during component initialisation.
  */
 export function getGlobal(name) {
-    return getCrelte().globals.get(name) ?? null;
+    return getCrelte().globals.getStore(name);
 }
 /**
  * returns the cookies instance
@@ -95,6 +101,18 @@ export function getGlobal(name) {
 export function getCookies() {
     return getCrelte().cookies;
 }
+/**
+ * A function to make sure you have a CrelteRequest
+ */
+export function toCrelteRequest(crelte, req) {
+    return CrelteRequest.fromCrelte(crelte, req);
+}
+/**
+ * Listen for route changes
+ *
+ * ## Note
+ * This only works during component initialisation.
+ */
 export function onRoute(fn) {
     const crelte = getCrelte();
     const rmListener = crelte.router.onRoute(route => {

package/dist/init/client.d.ts

@@ -11,25 +11,6 @@ export type MainData = {
     entryQuery: GraphQlQuery;
     /** The global query from queries/global.graphql */
     globalQuery?: GraphQlQuery;
-    /**
-     * Preload pages on mouse over
-     * @default false
-     */
-    preloadOnMouseOver?: boolean;
-    /**
-     * Use view transitions
-     * @default false
-     */
-    viewTransition?: boolean;
-    /**
-     * Play the intro animation
-     * @default false
-     */
-    playIntro?: boolean;
-    /** Enable graphql query debugging */
-    graphQlDebug?: boolean;
-    /** Enable request and render timing measurement */
-    debugTiming?: boolean;
 };
 /**
  * The main function to start the client side rendering

package/dist/init/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../src/init/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,8BAA8B;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;IAI3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAIpB,qCAAqC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,mDAAmD;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAYF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,QAAQ,QA0IlC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../src/init/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,8BAA8B;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;CAC3B,CAAC;AAaF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,QAAQ,QAsIlC"}

package/dist/init/client.js

@@ -6,6 +6,7 @@ const mainDataDefault = {
     preloadOnMouseOver: false,
     viewTransition: false,
     playIntro: false,
+    XCraftSiteHeader: false,
     // will be passed down to ClientRenderer
     graphQlDebug: false,
     debugTiming: false,
@@ -43,18 +44,13 @@ export function main(data) {
     // loadTemplate
     // update
     // construct Crelte
-    const builder = new CrelteBuilder();
+    const builder = new CrelteBuilder(data.app.config ?? {});
     const endpoint = builder.ssrCache.get('ENDPOINT_URL');
-    builder.setupGraphQl(endpoint, {
-        debug: data.graphQlDebug,
-        debugTiming: data.debugTiming,
-    });
+    builder.setupGraphQl(endpoint);
     // on the client the cookies are always coming from document.cookie
     builder.setupCookies('');
     const csites = builder.ssrCache.get('crelteSites');
-    builder.setupRouter(csites, {
-        preloadOnMouseOver: data.preloadOnMouseOver,
-    });
+    builder.setupRouter(csites);
     const crelte = builder.build();
     const serverError = crelte.ssrCache.get('ERROR');
     if (serverError) {
@@ -84,7 +80,7 @@ export function main(data) {
                 props,
                 hydrate: true,
                 context: crelte._getContext(),
-                intro: data.playIntro,
+                intro: builder.config.playIntro,
             });
         }
         else {
@@ -98,7 +94,8 @@ export function main(data) {
         if (!success) {
             // if this is not the first load we should reload the page
             // we don't reload everytime because this might cause a reload loop
-            // and since the first load will probably just contain ssrCache data in almost all cases the first load will never faill
+            // and since the first load will probably just contain ssrCache data
+            // in almost all cases the first load will never faill
             if (!isFirstLoad) {
                 // the load might contain a js error and we prefer the error
                 // page
@@ -108,7 +105,7 @@ export function main(data) {
             return handleLoadError(readyForProps());
         }
         const cr = new CrelteRequest(crelte, req);
-        const startTime = data.debugTiming ? Date.now() : null;
+        const startTime = builder.config.debugTiming ? Date.now() : null;
         let render = async () => {
             // we should trigger the route update here
             pluginsBeforeRender(cr);
@@ -121,7 +118,7 @@ export function main(data) {
             crelte.router._internal.domReady(cr.req);
         };
         // render with view Transition if enabled and not in hydration
-        if (data.viewTransition &&
+        if (builder.config.viewTransition &&
             appInstance &&
             document.startViewTransition) {
             render = () => document.startViewTransition(render);

package/dist/init/server.d.ts

@@ -23,10 +23,6 @@ export type MainData = {
     globalQuery?: GraphQlQuery;
     /** Server data provided by crelte-node */
     serverData: ServerData;
-    /** Enable graphql query debugging */
-    graphQlDebug?: boolean;
-    /** Enable request and render timing measurement */
-    debugTiming?: boolean;
 };
 /**
  * The main function to start the server side rendering

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/init/server.ts"],"names":[],"mappings":"AAOA,OAAO,EAAO,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,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;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;IAE3B,0CAA0C;IAC1C,UAAU,EAAE,UAAU,CAAC;IAIvB,qCAAqC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,mDAAmD;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CA6ED;AAED,MAAM,MAAM,KAAK,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAE3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,GAAG,CAAC;IAEf,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,SAAS,CAC9B,IAAI,EAAE,aAAa,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0B5C"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/init/server.ts"],"names":[],"mappings":"AAOA,OAAO,EAAO,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,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;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,UAAU,EAAE,YAAY,CAAC;IACzB,mDAAmD;IACnD,WAAW,CAAC,EAAE,YAAY,CAAC;IAE3B,0CAA0C;IAC1C,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CA0ED;AAED,MAAM,MAAM,KAAK,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAE3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,GAAG,CAAC;IAEf,UAAU,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,SAAS,CAC9B,IAAI,EAAE,aAAa,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0B5C"}

package/dist/init/server.js

@@ -25,7 +25,7 @@ import { gql } from '../graphql/GraphQl.js';
  * ```
  */
 export async function main(data) {
-    const builder = new CrelteBuilder();
+    const builder = new CrelteBuilder(data.app.config ?? {});
     // setup viteEnv
     data.serverData.viteEnv.forEach((v, k) => {
         builder.ssrCache.set(k, v);
@@ -33,10 +33,7 @@ export async function main(data) {
     const endpoint = data.serverData.endpoint;
     builder.ssrCache.set('ENDPOINT_URL', endpoint);
     builder.ssrCache.set('CRAFT_WEB_URL', data.serverData.craftWeb);
-    builder.setupGraphQl(endpoint, {
-        debug: data.graphQlDebug,
-        debugTiming: data.debugTiming,
-    });
+    builder.setupGraphQl(endpoint);
     const cookies = data.serverData.cookies ?? '';
     builder.setupCookies(cookies);
     const csites = await loadSites(builder, data.serverData);