eddev 2.0.0-beta.142 → 2.0.0-beta.143

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

@@ -1,7 +1,6 @@
 import { code, imp } from "ts-poet";
 import { FSCodegen } from "../utils/fs-codegen.js";
 import { camelCase } from "change-case-all";
-import { ProjectEnvUtils } from "../project/env.js";
 export function getVinxiFolder(opts) {
     return (opts.mode === "development" ? "dev" : "prod") + (opts.serverless ? "" : "-spa");
 }
@@ -37,7 +36,6 @@ export function createVinxiCodegen(opts) {
                 return code /* tsx */ `
           import { ServerContext } from "eddev/server"
           import { getManifest } from "vinxi/manifest"
-          import { apiConfig } from 'eddev/hooks'
 
           ServerContext.setRuntime({
             getManifest
@@ -47,8 +45,6 @@ export function createVinxiCodegen(opts) {
                     .map(([key, value]) => `${key}: ${JSON.stringify(value)}`)
                     .join(",\n")}
           })
-
-          apiConfig.apiKey = ${JSON.stringify(ProjectEnvUtils.getSafe("SITE_API_KEY") ?? "")}
         `.toString();
             },
         });

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>;
@@ -45,25 +45,47 @@ export declare const EDConfigSchema: z.ZodObject<{
         }, {
             origins?: string[] | undefined;
         }>>;
+        csp: z.ZodDefault<z.ZodObject<{
+            enabled: z.ZodBoolean;
+            autoDetect: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+            nonce: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+            commonOrigins: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            enabled: boolean;
+            autoDetect: boolean;
+            nonce: boolean;
+            commonOrigins?: string[] | undefined;
+        }, {
+            enabled: boolean;
+            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: {
+            enabled: boolean;
+            autoDetect: boolean;
+            nonce: boolean;
+            commonOrigins?: string[] | undefined;
+        };
         cors?: {
             origins?: string[] | undefined;
         } | undefined;
     }, {
         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;
@@ -71,6 +93,12 @@ export declare const EDConfigSchema: z.ZodObject<{
         cors?: {
             origins?: string[] | undefined;
         } | undefined;
+        csp?: {
+            enabled: boolean;
+            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<{
@@ -91,37 +119,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";
-        };
         pageDataTTL: number;
         appDataTTL: number;
         queryHooksTTL: number;
     }, {
+        serverless?: {
+            isr?: boolean | undefined;
+            dataCache?: "in-memory" | "kv" | "none" | undefined;
+        } | undefined;
         wordpress?: {
             strategy: "always" | "ssr-always-fresh";
             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;
@@ -129,53 +157,59 @@ 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: {
+            enabled: boolean;
+            autoDetect: boolean;
+            nonce: boolean;
+            commonOrigins?: string[] | undefined;
+        };
         cors?: {
             origins?: string[] | undefined;
         } | undefined;
     };
-    devUI: "disabled" | "enabled";
+    cache: Record<string, {
+        serverless: {
+            isr: boolean;
+            dataCache: "in-memory" | "kv" | "none";
+        };
+        wordpress: {
+            strategy: "always" | "ssr-always-fresh";
+            cacheHeaders: boolean;
+            transients: boolean;
+        };
+        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;
@@ -183,32 +217,38 @@ export declare const EDConfigSchema: z.ZodObject<{
         cors?: {
             origins?: string[] | undefined;
         } | undefined;
+        csp?: {
+            enabled: boolean;
+            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";
             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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkHzB,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6IzB,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

@@ -66,6 +66,27 @@ export const EDConfigSchema = z.object({
                 .describe("A list of allowed origins for CORS. Set to ['*'] to allow all. All WordPress hosts are also allowed."),
         })
             .optional(),
+        csp: z
+            .object({
+            enabled: z.boolean(),
+            autoDetect: z
+                .boolean()
+                .optional()
+                .default(true)
+                .describe("Whether to auto-detect CSP origins from the tracking scripts, and wp_head/wp_footer scripts and styles."),
+            nonce: z
+                .boolean()
+                .optional()
+                .default(false)
+                .describe("Whether to use nonces for scripts and styles. The nonce attribute will be applied to all tracking snipets, and styles/scripts used in wp_head/wp_footer."),
+            commonOrigins: z
+                .string()
+                .array()
+                .describe("A list of common origins, to be shared amoungst all directives. Items should be things like 'hubspot.com' or '*.hubspot.com'")
+                .optional(),
+        })
+            .default({ enabled: true })
+            .describe("Content Security Policy settings"),
     }),
     cache: z
         .record(z.object({

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

@@ -35,24 +35,24 @@ export declare const BlockMetaSchema: z.ZodObject<{
     frontendMode: z.ZodDefault<z.ZodEnum<["hidden", "childrenOnly", "default"]>>;
     inserter: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    title: string;
-    mode: "both" | "edit" | "preview";
-    slug: string;
-    tags: string[];
-    flags: Record<string, any>;
-    category: string;
+    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";
+    frontendMode: "default" | "hidden" | "childrenOnly";
     inserter: boolean;
     description?: string | undefined;
     icon?: string | undefined;
@@ -63,32 +63,32 @@ export declare const BlockMetaSchema: z.ZodObject<{
         fieldName: string;
     } | 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;
+    cache?: boolean | undefined;
     description?: string | undefined;
-    icon?: string | undefined;
     category?: string | undefined;
+    icon?: string | undefined;
     keywords?: string[] | 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;
 }>;
 export type BlockMetadata = z.infer<typeof BlockMetaSchema>;

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/dist/node/utils/fs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../src/node/utils/fs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAGrC,eAAO,MAAM,EAAE;6BAEkB,MAAM,WAAW,MAAM;iCAWnB,MAAM,WAAW,GAAG;sBAW/B,MAAM,WAAW,GAAG;qBAGrB,MAAM;mBAIR,MAAM;mBAQN,MAAM;;;;;;;;;;;;iBAQgi1B,CAAC;;;;qBAAqkD,CAAC;iBAA8C,CAAC;;;;qBAAmjB,CAAC;iBAA8C,CAAC;;;qBAA+gB,CAAC;iBAA8C,CAAC;;;;iBAAkhB,CAAC;;;;;;;cAA65F,CAAC;;;;;;;cAAoe,CAAC;;;;;;;cAAif,CAAC;;;;;;;;;;;;;;;;;;;;8EAAg5S,OAAQ,eAAe,qBAAgC,OAAQ,eAAe,2BAAsC,OAAQ,eAAe;YAAuG,CAAC;YAAwC,CAAC;aAAoR,CAAC;;;aAAi2B,CAAC;;;gBAAosE,CAAC;YAAwC,CAAC;;;;YAA4nB,CAAC;;;YAAwrB,CAAC;;;;;;;;;sCAAy9I,OAAQ,aAAa;kFAA8G,OAAQ,aAAa;qFAAiH,OAAQ,aAAa;qEAAiG,OAAQ,aAAa;;CADh5pD,CAAA"}
+{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../src/node/utils/fs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAGrC,eAAO,MAAM,EAAE;6BAEkB,MAAM,WAAW,MAAM;iCAWnB,MAAM,WAAW,GAAG;sBAW/B,MAAM,WAAW,GAAG;qBAGrB,MAAM;mBAIR,MAAM;mBAQN,MAAM;;;;;;;;;;;;iBAQo80B,CAAC;;;;qBAAqkD,CAAC;iBAA8C,CAAC;;;;qBAAmjB,CAAC;iBAA8C,CAAC;;;qBAA+gB,CAAC;iBAA8C,CAAC;;;;iBAAkhB,CAAC;;;;;;;cAA65F,CAAC;;;;;;;cAAoe,CAAC;;;;;;;cAAif,CAAC;;;;;;;;;;;;;;;;;;;;8EAAg5S,OAAQ,eAAe,qBAAgC,OAAQ,eAAe,2BAAsC,OAAQ,eAAe;YAAuG,CAAC;YAAwC,CAAC;aAAoR,CAAC;;;aAAi2B,CAAC;;;gBAAosE,CAAC;YAAwC,CAAC;;;;YAA4nB,CAAC;;;YAAwrB,CAAC;;;;;;;;;sCAAy9I,OAAQ,aAAa;kFAA8G,OAAQ,aAAa;qFAAiH,OAAQ,aAAa;qEAAiG,OAAQ,aAAa;;CADpzpD,CAAA"}

package/dist/node/utils/report-builder.d.ts

@@ -1,10 +1,10 @@
 export declare function createReportBuilder(): {
-    log(...values: any[]): /*elided*/ any;
-    warn(...values: any[]): /*elided*/ any;
-    fail(...values: any[]): /*elided*/ any;
-    info(...values: any[]): /*elided*/ any;
-    help(...values: any[]): /*elided*/ any;
-    success(...values: any[]): /*elided*/ any;
+    log(...values: any[]): any;
+    warn(...values: any[]): any;
+    fail(...values: any[]): any;
+    info(...values: any[]): any;
+    help(...values: any[]): any;
+    success(...values: any[]): any;
     toString(): string;
 };
 //# sourceMappingURL=report-builder.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.142",
+  "version": "2.0.0-beta.143",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -105,6 +105,7 @@
     "change-case-all": "^2.1.0",
     "chokidar": "^3.5.3",
     "commander": "^13.1.0",
+    "content-security-policy-builder": "^2.2.0",
     "csstype": "^3.1.3",
     "dotenv": "^16.3.1",
     "globby": "^14.0.2",

package/dist/app/lib/hooks/query-hooks.d.ts.map

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