eddev 2.0.0-beta.221 → 2.0.0-beta.223

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

@@ -173,7 +173,7 @@ export class ServerContext {
          * For route data, the cache key is the pathname.
          * TODO: Potential support for Vercel draft mode.
          */
-        let cacheKey = "fetchRouteData:" + req.pathname;
+        let cacheKey = "fetchRouteData:" + withTrailingSlash(req.pathname.toLowerCase());
         const result = await swr({
             key: cacheKey,
             cache: pageCache,

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

@@ -406,7 +406,7 @@ export function createVinxiCodegen(opts) {
             }
 
             // SSR
-            return renderPage({ pathname: url.pathname, newOrigin: url.origin, hostname: url.hostname, bypass: shouldBypass(event) })
+            return renderPage({ pathname: url.pathname, newOrigin: url.origin, hostname: url.hostname, bypass: serverContext.shouldBypass(event) })
           },
         })
     `,

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

@@ -9,20 +9,20 @@ export declare const EDConfigSchema: z.ZodObject<{
         provider: z.ZodLiteral<"ga4">;
         id: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        id: string;
         provider: "ga4";
-    }, {
         id: string;
+    }, {
         provider: "ga4";
+        id: string;
     }>, z.ZodObject<{
         provider: z.ZodLiteral<"gtm">;
         id: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        id: string;
         provider: "gtm";
-    }, {
         id: string;
+    }, {
         provider: "gtm";
+        id: string;
     }>]>, "many">>;
     serverless: z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
@@ -52,32 +52,32 @@ export declare const EDConfigSchema: z.ZodObject<{
             commonOrigins: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             values: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>;
         }, "strip", z.ZodTypeAny, {
-            nonce: boolean;
             enabled: boolean;
             autoDetect: boolean;
+            nonce: boolean;
             values?: Record<string, string[]> | undefined;
             commonOrigins?: string[] | undefined;
         }, {
             enabled: boolean;
             values?: Record<string, string[]> | undefined;
-            nonce?: boolean | undefined;
             autoDetect?: boolean | undefined;
+            nonce?: boolean | undefined;
             commonOrigins?: string[] | undefined;
         }>>;
     }, "strip", z.ZodTypeAny, {
-        plugins: "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
-        admin: "hide" | "proxy";
+        plugins: "proxy" | "remote";
+        admin: "proxy" | "hide";
         originProtection: {
             requireLogin: boolean;
         };
         themeAssets: string[];
         endpoints: Record<string, string>;
         csp: {
-            nonce: boolean;
             enabled: boolean;
             autoDetect: boolean;
+            nonce: boolean;
             values?: Record<string, string[]> | undefined;
             commonOrigins?: string[] | undefined;
         };
@@ -87,9 +87,9 @@ export declare const EDConfigSchema: z.ZodObject<{
     }, {
         uploads: "proxy" | "remote";
         endpoints: Record<string, string>;
-        plugins?: "proxy" | "remote" | undefined;
         enabled?: boolean | undefined;
-        admin?: "hide" | "proxy" | undefined;
+        plugins?: "proxy" | "remote" | undefined;
+        admin?: "proxy" | "hide" | undefined;
         originProtection?: {
             requireLogin?: boolean | undefined;
         } | undefined;
@@ -100,22 +100,22 @@ export declare const EDConfigSchema: z.ZodObject<{
         csp?: {
             enabled: boolean;
             values?: Record<string, string[]> | undefined;
-            nonce?: boolean | undefined;
             autoDetect?: boolean | undefined;
+            nonce?: boolean | undefined;
             commonOrigins?: string[] | undefined;
         } | undefined;
     }>;
     cache: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         wordpress: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-            strategy: z.ZodEnum<["always", "ssr-always-fresh"]>;
+            strategy: z.ZodOptional<z.ZodEnum<["always", "ssr-always-fresh"]>>;
             cacheHeaders: z.ZodDefault<z.ZodBoolean>;
             transients: z.ZodDefault<z.ZodBoolean>;
         }, "strip", z.ZodTypeAny, {
-            strategy: "always" | "ssr-always-fresh";
             cacheHeaders: boolean;
             transients: boolean;
+            strategy?: "always" | "ssr-always-fresh" | undefined;
         }, {
-            strategy: "always" | "ssr-always-fresh";
+            strategy?: "always" | "ssr-always-fresh" | undefined;
             cacheHeaders?: boolean | undefined;
             transients?: boolean | undefined;
         }>>>;
@@ -124,37 +124,37 @@ export declare const EDConfigSchema: z.ZodObject<{
             dataCache: z.ZodDefault<z.ZodEnum<["in-memory", "kv", "none"]>>;
         }, "strip", z.ZodTypeAny, {
             isr: boolean;
-            dataCache: "none" | "in-memory" | "kv";
+            dataCache: "in-memory" | "kv" | "none";
         }, {
             isr?: boolean | undefined;
-            dataCache?: "none" | "in-memory" | "kv" | undefined;
+            dataCache?: "in-memory" | "kv" | "none" | undefined;
         }>>>;
         pageDataTTL: z.ZodDefault<z.ZodNumber>;
         appDataTTL: z.ZodDefault<z.ZodNumber>;
         queryHooksTTL: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        serverless: {
+            isr: boolean;
+            dataCache: "in-memory" | "kv" | "none";
+        };
         wordpress: {
-            strategy: "always" | "ssr-always-fresh";
             cacheHeaders: boolean;
             transients: boolean;
-        };
-        serverless: {
-            isr: boolean;
-            dataCache: "none" | "in-memory" | "kv";
+            strategy?: "always" | "ssr-always-fresh" | undefined;
         };
         pageDataTTL: number;
         appDataTTL: number;
         queryHooksTTL: number;
     }, {
+        serverless?: {
+            isr?: boolean | undefined;
+            dataCache?: "in-memory" | "kv" | "none" | undefined;
+        } | undefined;
         wordpress?: {
-            strategy: "always" | "ssr-always-fresh";
+            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;
@@ -162,36 +162,22 @@ export declare const EDConfigSchema: z.ZodObject<{
     devUI: z.ZodDefault<z.ZodEnum<["disabled", "enabled"]>>;
 }, "strip", z.ZodTypeAny, {
     version: "2";
-    cache: Record<string, {
-        wordpress: {
-            strategy: "always" | "ssr-always-fresh";
-            cacheHeaders: boolean;
-            transients: boolean;
-        };
-        serverless: {
-            isr: boolean;
-            dataCache: "none" | "in-memory" | "kv";
-        };
-        pageDataTTL: number;
-        appDataTTL: number;
-        queryHooksTTL: number;
-    }>;
     legacyMetadata: boolean;
     legacyStitches: boolean;
     serverless: {
-        plugins: "proxy" | "remote";
         enabled: boolean;
         uploads: "proxy" | "remote";
-        admin: "hide" | "proxy";
+        plugins: "proxy" | "remote";
+        admin: "proxy" | "hide";
         originProtection: {
             requireLogin: boolean;
         };
         themeAssets: string[];
         endpoints: Record<string, string>;
         csp: {
-            nonce: boolean;
             enabled: boolean;
             autoDetect: boolean;
+            nonce: boolean;
             values?: Record<string, string[]> | undefined;
             commonOrigins?: string[] | undefined;
         };
@@ -199,23 +185,37 @@ export declare const EDConfigSchema: z.ZodObject<{
             origins?: string[] | undefined;
         } | undefined;
     };
-    devUI: "disabled" | "enabled";
+    cache: Record<string, {
+        serverless: {
+            isr: boolean;
+            dataCache: "in-memory" | "kv" | "none";
+        };
+        wordpress: {
+            cacheHeaders: boolean;
+            transients: boolean;
+            strategy?: "always" | "ssr-always-fresh" | undefined;
+        };
+        pageDataTTL: number;
+        appDataTTL: number;
+        queryHooksTTL: number;
+    }>;
+    devUI: "enabled" | "disabled";
     $schema?: string | undefined;
     trackers?: ({
-        id: string;
         provider: "ga4";
-    } | {
         id: string;
+    } | {
         provider: "gtm";
+        id: string;
     })[] | undefined;
 }, {
     version: "1" | "2";
     serverless: {
         uploads: "proxy" | "remote";
         endpoints: Record<string, string>;
-        plugins?: "proxy" | "remote" | undefined;
         enabled?: boolean | undefined;
-        admin?: "hide" | "proxy" | undefined;
+        plugins?: "proxy" | "remote" | undefined;
+        admin?: "proxy" | "hide" | undefined;
         originProtection?: {
             requireLogin?: boolean | undefined;
         } | undefined;
@@ -226,36 +226,36 @@ export declare const EDConfigSchema: z.ZodObject<{
         csp?: {
             enabled: boolean;
             values?: Record<string, string[]> | undefined;
-            nonce?: boolean | undefined;
             autoDetect?: boolean | undefined;
+            nonce?: boolean | undefined;
             commonOrigins?: string[] | undefined;
         } | undefined;
     };
+    $schema?: string | undefined;
+    legacyMetadata?: boolean | undefined;
+    legacyStitches?: boolean | undefined;
+    trackers?: ({
+        provider: "ga4";
+        id: string;
+    } | {
+        provider: "gtm";
+        id: string;
+    })[] | undefined;
     cache?: Record<string, {
+        serverless?: {
+            isr?: boolean | undefined;
+            dataCache?: "in-memory" | "kv" | "none" | undefined;
+        } | undefined;
         wordpress?: {
-            strategy: "always" | "ssr-always-fresh";
+            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;
     }> | undefined;
-    $schema?: string | undefined;
-    legacyMetadata?: boolean | undefined;
-    legacyStitches?: boolean | undefined;
-    trackers?: ({
-        id: string;
-        provider: "ga4";
-    } | {
-        id: string;
-        provider: "gtm";
-    })[] | undefined;
-    devUI?: "disabled" | "enabled" | undefined;
+    devUI?: "enabled" | "disabled" | undefined;
 }>;
 export type EDConfig = z.infer<typeof EDConfigSchema>;
 export declare class Configurator {

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiJzB,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,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"}

package/dist/node/project/config.js

@@ -96,7 +96,10 @@ export const EDConfigSchema = z.object({
         .record(z.object({
         wordpress: z
             .object({
-            strategy: z.enum(["always", "ssr-always-fresh"]),
+            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."),
         })

package/dist/node/types/block-type.d.ts

@@ -39,37 +39,37 @@ export declare const BlockMetaSchema: z.ZodObject<{
         label: z.ZodString;
         isDefault: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        label: string;
         name: string;
+        label: string;
         isDefault?: boolean | undefined;
     }, {
-        label: string;
         name: string;
+        label: string;
         isDefault?: boolean | undefined;
     }>, "many">>;
     lazyLoad: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    title: string;
-    mode: "both" | "edit" | "preview";
-    slug: string;
-    tags: string[];
-    flags: Record<string, any>;
-    category: string;
-    parent: string[];
-    inserter: boolean;
+    cache: boolean;
     acfName: string;
     fileName: string;
+    slug: string;
     graphqlFieldName: string;
+    title: string;
+    category: string;
     types: string[];
+    mode: "preview" | "edit" | "both";
+    tags: string[];
+    flags: Record<string, any>;
     childTags: string[];
     childBlocks: string[];
+    parent: string[];
     ancestors: string[];
     dynamic: boolean;
-    cache: boolean;
     allowMultiple: boolean;
-    frontendMode: "hidden" | "default" | "childrenOnly";
-    icon?: string | undefined;
+    frontendMode: "default" | "hidden" | "childrenOnly";
+    inserter: boolean;
     description?: string | undefined;
+    icon?: string | undefined;
     keywords?: string | string[] | undefined;
     templates?: string[] | null | undefined;
     postMetaBlock?: {
@@ -77,42 +77,42 @@ export declare const BlockMetaSchema: z.ZodObject<{
         fieldName: string;
     } | undefined;
     blockStyles?: {
-        label: string;
         name: string;
+        label: string;
         isDefault?: boolean | undefined;
     }[] | undefined;
     lazyLoad?: boolean | undefined;
 }, {
-    title: string;
-    slug: string;
     acfName: string;
     fileName: string;
+    slug: string;
     graphqlFieldName: string;
+    title: string;
     types: string[];
-    mode?: "both" | "edit" | "preview" | undefined;
-    tags?: string[] | undefined;
-    flags?: Record<string, any> | undefined;
-    icon?: string | undefined;
-    category?: string | undefined;
+    cache?: boolean | undefined;
     description?: string | undefined;
+    category?: string | undefined;
+    icon?: string | undefined;
     keywords?: string | string[] | undefined;
-    parent?: string[] | undefined;
-    inserter?: boolean | undefined;
     templates?: string[] | null | undefined;
+    mode?: "preview" | "edit" | "both" | undefined;
+    tags?: string[] | undefined;
+    flags?: Record<string, any> | undefined;
     childTags?: string[] | undefined;
     childBlocks?: string[] | undefined;
+    parent?: string[] | undefined;
     ancestors?: string[] | undefined;
     dynamic?: boolean | undefined;
-    cache?: boolean | undefined;
     allowMultiple?: boolean | undefined;
     postMetaBlock?: {
         postTypes: string[];
         fieldName: string;
     } | undefined;
-    frontendMode?: "hidden" | "default" | "childrenOnly" | undefined;
+    frontendMode?: "default" | "hidden" | "childrenOnly" | undefined;
+    inserter?: boolean | undefined;
     blockStyles?: {
-        label: string;
         name: string;
+        label: string;
         isDefault?: boolean | undefined;
     }[] | undefined;
     lazyLoad?: boolean | undefined;

package/dist/node/types/view-type.d.ts

@@ -9,21 +9,21 @@ export declare const ViewMetaSchema: z.ZodObject<{
     routePattern: z.ZodOptional<z.ZodString>;
     postType: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strip", z.ZodTypeAny, {
-    title: string;
-    slug: string;
-    fileName: string;
     cache: boolean;
+    fileName: string;
+    slug: string;
+    title: string;
     isCustomTemplate: boolean;
-    postType?: string[] | undefined;
     routePattern?: string | undefined;
+    postType?: string[] | undefined;
 }, {
-    title: string;
-    slug: string;
     fileName: string;
-    postType?: string[] | undefined;
+    slug: string;
+    title: string;
     cache?: boolean | undefined;
     isCustomTemplate?: boolean | undefined;
     routePattern?: string | undefined;
+    postType?: string[] | undefined;
 }>;
 export type ViewMetadata = z.infer<typeof ViewMetaSchema>;
 export type ViewMetadataConstructor = z.input<typeof ViewMetaSchema>;

package/package.json

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