eddev 2.0.0-beta.227 → 2.0.0-beta.228

package/dist/app/server/server-context.d.ts

@@ -1,6 +1,6 @@
 import { Manifest } from "vinxi/dist/types/types/manifest";
 import { H3Event, RequestHeaders } from "vinxi/http";
-import type { EDConfig } from "../../node/project/config.js";
+import type { EDCacheConfig, EDConfig } from "../../node/project/config.js";
 import { TrackerTags } from "../lib/routing/types.js";
 import { UrlReplacerConf } from "./utils/replace-host.js";
 import { QueryMonitor } from "../utils/query-monitor.js";
@@ -10,6 +10,7 @@ export type ServerContextArgs = {
     replaceUrls?: UrlReplacerConf;
     rpcBases?: string[];
     config: EDConfig;
+    cacheConfig: EDCacheConfig;
 };
 export type ServerContextRuntime = {
     getManifest: (name: string) => Manifest;
@@ -27,6 +28,7 @@ export declare class ServerContext {
     _urlReplacer?: (text: string, origin?: string) => string;
     rpcBases: string[];
     config: EDConfig;
+    cacheConfig: EDCacheConfig;
     static main: ServerContext;
     constructor(conf: ServerContextArgs);
     replaceUrls(text: string, origin?: string): string;

package/dist/app/server/server-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,cAAc,EAAoC,MAAM,YAAY,CAAA;AACtF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,EAAiC,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,eAAe,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAA;CACxC,CAAA;AAkBD;;GAEG;AACH,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,aAAa;IACxB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,MAAM,EAAE,QAAQ,CAAA;IAEhB,MAAM,CAAC,IAAI,EAAE,aAAa,CAAA;gBAEd,IAAI,EAAE,iBAAiB;IAWnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAOzC,IAAI,OAAO,yBAEV;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,oBAAoB;IAI1C,YAAY,CAAC,GAAG,EAAE,MAAM;IAQlB,WAAW,CACf,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,OAAO,CAAC,QAAQ,CAAC;IAgCpB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE;IAmFvG,cAAc,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;IA8GxG,YAAY,CAAC,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAgCtE,qBAAqB,CAAC,GAAG,CAAC,EAAE,cAAc;IAYpC,eAAe,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IA6D/F,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IAehF,IAAI,kBAAkB,aAcrB;IAED,YAAY,CAAC,KAAK,EAAE,OAAO;IAc3B,aAAa,CAAC,YAAY,EAAE,MAAM;IAUlC,cAAc,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;CAiD9B"}
+{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"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"}

package/dist/app/server/server-context.js

@@ -27,12 +27,14 @@ export class ServerContext {
     _urlReplacer;
     rpcBases = [];
     config;
+    cacheConfig;
     static main;
     constructor(conf) {
         this.dev = conf.dev;
         this.origin = conf.origin;
         this.rpcBases = conf.rpcBases ?? [];
         this.config = conf.config;
+        this.cacheConfig = conf.cacheConfig;
         if (conf.replaceUrls) {
             this._urlReplacer = createUrlReplacer(conf.replaceUrls);
         }
@@ -177,7 +179,7 @@ export class ServerContext {
         const result = await swr({
             key: cacheKey,
             cache: pageCache,
-            forceFresh: this.dev || req.bypass,
+            forceFresh: this.dev || req.bypass || this.cacheConfig.wordpress.strategy === "ssr-always-fresh",
             getFreshValue: async (ctx) => {
                 const fetchUrl = withQuery(withTrailingSlash(req.pathname), {
                     _props: "1",

package/dist/node/cli/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.0-beta.226";
+export declare const VERSION = "2.0.0-beta.227";
 //# sourceMappingURL=version.d.ts.map

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.226";
+export const VERSION = "2.0.0-beta.227";

package/dist/node/compiler/cache-config.d.ts

@@ -0,0 +1,3 @@
+import { EDCacheConfig, EDConfig } from "../project/config.js";
+export declare function getCacheConfig(origin: string, config: EDConfig): EDCacheConfig;
+//# sourceMappingURL=cache-config.d.ts.map

package/dist/node/compiler/cache-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-config.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/cache-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAEnF,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAG,aAAa,CAiB9E"}

package/dist/node/compiler/cache-config.js

@@ -0,0 +1,16 @@
+import { EDCacheConfigSchema } from "../project/config.js";
+export function getCacheConfig(origin, config) {
+    const originDomain = new URL(origin).host;
+    let cacheConfig = config.cache[originDomain] ??
+        config.cache["*"] ??
+        EDCacheConfigSchema.parse({
+            appDataTTL: 0,
+            pageDataTTL: 0,
+            queryHooksTTL: 0,
+            serverless: {
+                isr: true,
+                dataCache: "in-memory",
+            },
+        });
+    return cacheConfig;
+}

package/dist/node/compiler/vinxi-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAG/C,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;AAC7D,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;AACrD,KAAK,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,uBAqP3C"}
+{"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAI/C,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAA;AAC7D,KAAK,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;AACrD,KAAK,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,uBAuO3C"}

package/dist/node/compiler/vinxi-app.js

@@ -4,6 +4,7 @@ import tsconfigPaths from "vite-tsconfig-paths";
 import { StatefulLog } from "../utils/stateful-log.js";
 import { corePlugins, envPlugin } from "./get-vite-config.js";
 import { getVinxiFolder } from "./vinxi-codegen.js";
+import { getCacheConfig } from "./cache-config.js";
 export function createVinxiApp(args) {
     const log = args.log ?? new StatefulLog({ label: "Build" });
     const folder = "./.eddev/" +
@@ -11,22 +12,7 @@ export function createVinxiApp(args) {
             mode: args.mode,
             serverless: true,
         });
-    const originDomain = new URL(args.origin).host;
-    let cacheConfig = args.config.cache[originDomain] ??
-        args.config.cache["*"] ?? {
-        appDataTTL: 0,
-        pageDataTTL: 0,
-        queryHooksTTL: 0,
-        serverless: {
-            isr: true,
-            dataCache: "in-memory",
-        },
-    };
-    // for (let key in args.config.cache) {
-    //   if (key === "*") continue
-    //   const domain = key.replace(/(^\*|\/$)/g, "")
-    //   args.origin
-    //   if (domain.includes("*")) {
+    const cacheConfig = getCacheConfig(args.origin, args.config);
     return createApp({
         server: {
             // experimental: {
@@ -81,6 +67,7 @@ export function createVinxiApp(args) {
                     isr: {
                         expiration: cacheConfig.pageDataTTL ?? 0,
                         allowQuery: [],
+                        group: 1,
                         passQuery: false,
                     },
                     cache: {
@@ -107,6 +94,7 @@ export function createVinxiApp(args) {
                     isr: {
                         expiration: cacheConfig.pageDataTTL ?? 0,
                         allowQuery: [],
+                        group: 1,
                         passQuery: false,
                     },
                     swr: true,

package/dist/node/compiler/vinxi-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vinxi-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-codegen.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAExE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,iBAIlD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,aAwsB/C"}
+{"version":3,"file":"vinxi-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-codegen.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAGlD,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAExE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,iBAIlD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,aAysB/C"}

package/dist/node/compiler/vinxi-codegen.js

@@ -2,6 +2,7 @@ import { camelCase, pascalCase } from "change-case-all";
 import { code, imp } from "ts-poet";
 import { ProjectEnvUtils } from "../project/env.js";
 import { FSCodegen } from "../utils/fs-codegen.js";
+import { getCacheConfig } from "./cache-config.js";
 export function getVinxiFolder(opts) {
     return (opts.mode === "development" ? "dev" : "prod") + (opts.serverless ? "" : "-spa");
 }
@@ -33,6 +34,7 @@ export function createVinxiCodegen(opts) {
                     },
                     rpcBases: (await project.serverRoutes.get()).bases ?? [],
                     config: project.config,
+                    cacheConfig: getCacheConfig(project.origin, project.config),
                 };
                 return code /* tsx */ `
           import { ServerContext } from "eddev/server"

package/dist/node/project/config.d.ts

@@ -1,5 +1,59 @@
 import { z } from "zod";
 import { Project } from "./project.js";
+export declare const EDCacheConfigSchema: z.ZodObject<{
+    wordpress: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        strategy: z.ZodOptional<z.ZodEnum<["always", "ssr-always-fresh"]>>;
+        cacheHeaders: z.ZodDefault<z.ZodBoolean>;
+        transients: z.ZodDefault<z.ZodBoolean>;
+    }, "strip", z.ZodTypeAny, {
+        cacheHeaders: boolean;
+        transients: boolean;
+        strategy?: "always" | "ssr-always-fresh" | undefined;
+    }, {
+        strategy?: "always" | "ssr-always-fresh" | undefined;
+        cacheHeaders?: boolean | undefined;
+        transients?: boolean | undefined;
+    }>>>;
+    serverless: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        isr: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        dataCache: z.ZodDefault<z.ZodEnum<["in-memory", "kv", "none"]>>;
+    }, "strip", z.ZodTypeAny, {
+        isr: boolean;
+        dataCache: "none" | "in-memory" | "kv";
+    }, {
+        isr?: boolean | undefined;
+        dataCache?: "none" | "in-memory" | "kv" | undefined;
+    }>>>;
+    pageDataTTL: z.ZodDefault<z.ZodNumber>;
+    appDataTTL: z.ZodDefault<z.ZodNumber>;
+    queryHooksTTL: z.ZodDefault<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    wordpress: {
+        cacheHeaders: boolean;
+        transients: boolean;
+        strategy?: "always" | "ssr-always-fresh" | undefined;
+    };
+    serverless: {
+        isr: boolean;
+        dataCache: "none" | "in-memory" | "kv";
+    };
+    pageDataTTL: number;
+    appDataTTL: number;
+    queryHooksTTL: number;
+}, {
+    wordpress?: {
+        strategy?: "always" | "ssr-always-fresh" | undefined;
+        cacheHeaders?: boolean | undefined;
+        transients?: boolean | undefined;
+    } | undefined;
+    serverless?: {
+        isr?: boolean | undefined;
+        dataCache?: "none" | "in-memory" | "kv" | undefined;
+    } | undefined;
+    pageDataTTL?: number | undefined;
+    appDataTTL?: number | undefined;
+    queryHooksTTL?: number | undefined;
+}>;
 export declare const EDConfigSchema: z.ZodObject<{
     $schema: z.ZodOptional<z.ZodString>;
     version: z.ZodEffects<z.ZodEnum<["1", "2"]>, "2", "1" | "2">;
@@ -258,6 +312,7 @@ export declare const EDConfigSchema: z.ZodObject<{
     devUI?: "disabled" | "enabled" | undefined;
 }>;
 export type EDConfig = z.infer<typeof EDConfigSchema>;
+export type EDCacheConfig = z.infer<typeof EDCacheConfigSchema>;
 export declare class Configurator {
     project: Project;
     config?: EDConfig;

package/dist/node/project/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/node/project/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAKvB,OAAO,EAAE,OAAO,EAAyB,MAAM,cAAc,CAAA;AAE7D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoJzB,CAAA;AAEF,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;AAErD,qBAAa,YAAY;IAGI,OAAO,EAAE,OAAO;IAF3C,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB,OAAO;WAEM,MAAM,CAAC,OAAO,EAAE,OAAO;IAM9B,IAAI;YAQI,kBAAkB;YAYlB,UAAU;IAiCxB,OAAO,CAAC,WAAW;IAOnB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO;CAUzD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/node/project/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAKvB,OAAO,EAAE,OAAO,EAAyB,MAAM,cAAc,CAAA;AAE7D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6B9B,CAAA;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqHzB,CAAA;AAEF,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;AACrD,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAA;AAE/D,qBAAa,YAAY;IAGI,OAAO,EAAE,OAAO;IAF3C,MAAM,CAAC,EAAE,QAAQ,CAAA;IAEjB,OAAO;WAEM,MAAM,CAAC,OAAO,EAAE,OAAO;IAM9B,IAAI;YAQI,kBAAkB;YAYlB,UAAU;IAiCxB,OAAO,CAAC,WAAW;IAOnB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO;CAUzD"}

package/dist/node/project/config.js

@@ -6,6 +6,36 @@ import { cliMode } from "../cli/cli-mode.js";
 import { fs } from "../utils/fs.js";
 import { isDeploying } from "../utils/is-deploying.js";
 import { projectLog as console } from "./project.js";
+export const EDCacheConfigSchema = z.object({
+    wordpress: z
+        .object({
+        strategy: z
+            .enum(["always", "ssr-always-fresh"])
+            .optional()
+            .describe("Deprecated. Use cacheHeaders/transients instead."),
+        cacheHeaders: z.boolean().default(true).describe("Whether to add caching headers to data requests."),
+        transients: z.boolean().default(true).describe("Whether to cache within transients."),
+    })
+        .optional()
+        .default({ strategy: "always", cacheHeaders: true, transients: true }),
+    serverless: z
+        .object({
+        isr: z
+            .boolean()
+            .optional()
+            .default(true)
+            .describe("Whether to use Incremental Static Regeneration for this origin."),
+        dataCache: z
+            .enum(["in-memory", "kv", "none"])
+            .default("in-memory")
+            .describe("The cache strategy to use for page data."),
+    })
+        .optional()
+        .default({ isr: true, dataCache: "in-memory" }),
+    pageDataTTL: z.number().default(300).describe("The number of seconds to cache page data."),
+    appDataTTL: z.number().default(300).describe("The number of seconds to cache global app data."),
+    queryHooksTTL: z.number().default(300).describe("The number of seconds to cache named GraphQL queries."),
+});
 export const EDConfigSchema = z.object({
     $schema: z.string().optional(),
     version: z.enum(["1", "2"]).refine((v) => v === "2", { message: "Only version 2 is supported" }),
@@ -93,36 +123,7 @@ export const EDConfigSchema = z.object({
             .describe("Content Security Policy settings"),
     }),
     cache: z
-        .record(z.object({
-        wordpress: z
-            .object({
-            strategy: z
-                .enum(["always", "ssr-always-fresh"])
-                .optional()
-                .describe("Deprecated. Use cacheHeaders/transients instead."),
-            cacheHeaders: z.boolean().default(true).describe("Whether to add caching headers to data requests."),
-            transients: z.boolean().default(true).describe("Whether to cache within transients."),
-        })
-            .optional()
-            .default({ strategy: "always", cacheHeaders: true, transients: true }),
-        serverless: z
-            .object({
-            isr: z
-                .boolean()
-                .optional()
-                .default(true)
-                .describe("Whether to use Incremental Static Regeneration for this origin."),
-            dataCache: z
-                .enum(["in-memory", "kv", "none"])
-                .default("in-memory")
-                .describe("The cache strategy to use for page data."),
-        })
-            .optional()
-            .default({ isr: true, dataCache: "in-memory" }),
-        pageDataTTL: z.number().default(300).describe("The number of seconds to cache page data."),
-        appDataTTL: z.number().default(300).describe("The number of seconds to cache global app data."),
-        queryHooksTTL: z.number().default(300).describe("The number of seconds to cache named GraphQL queries."),
-    }))
+        .record(EDCacheConfigSchema)
         .default({
         "*": {
             pageDataTTL: 300,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.227",
+  "version": "2.0.0-beta.228",
   "description": "",
   "main": "index.js",
   "type": "module",