eddev 2.0.0-beta.72 → 2.0.0-beta.74

package/dist/app/lib/devtools/hooks/useTailwind.d.ts

@@ -368,8 +368,8 @@ export declare function useTailwindConfig(): {
             readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
                 readonly [x: string]: string;
             } | undefined;
-            readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-                readonly [x: string]: string;
+            readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+                readonly [x: string]: string | readonly string[];
             } | undefined;
             readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                 readonly [x: string]: string | any;
@@ -776,8 +776,8 @@ export declare function useTailwindConfig(): {
                 readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
                     readonly [x: string]: string;
                 } | undefined;
-                readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-                    readonly [x: string]: string;
+                readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+                    readonly [x: string]: string | readonly string[];
                 } | undefined;
                 readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                     readonly [x: string]: string | any;
@@ -1413,8 +1413,8 @@ export declare function useTailwindConfig(): {
                     readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
                         readonly [x: string]: string;
                     } | undefined;
-                    readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-                        readonly [x: string]: string;
+                    readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+                        readonly [x: string]: string | readonly string[];
                     } | undefined;
                     readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                         readonly [x: string]: string | any;
@@ -1821,8 +1821,8 @@ export declare function useTailwindConfig(): {
                         readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
                             readonly [x: string]: string;
                         } | undefined;
-                        readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-                            readonly [x: string]: string;
+                        readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+                            readonly [x: string]: string | readonly string[];
                         } | undefined;
                         readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                             readonly [x: string]: string | any;
@@ -2433,8 +2433,8 @@ export declare function useTailwindConfig(): {
         readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
             readonly [x: string]: string;
         } | undefined;
-        readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-            readonly [x: string]: string;
+        readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+            readonly [x: string]: string | readonly string[];
         } | undefined;
         readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
             readonly [x: string]: string | any;
@@ -2841,8 +2841,8 @@ export declare function useTailwindConfig(): {
             readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
                 readonly [x: string]: string;
             } | undefined;
-            readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-                readonly [x: string]: string;
+            readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+                readonly [x: string]: string | readonly string[];
             } | undefined;
             readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                 readonly [x: string]: string | any;
@@ -3478,8 +3478,8 @@ export declare function useTailwindConfig(): {
                 readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
                     readonly [x: string]: string;
                 } | undefined;
-                readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-                    readonly [x: string]: string;
+                readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+                    readonly [x: string]: string | readonly string[];
                 } | undefined;
                 readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                     readonly [x: string]: string | any;
@@ -3886,8 +3886,8 @@ export declare function useTailwindConfig(): {
                     readonly opacity?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
                         readonly [x: string]: string;
                     } | undefined;
-                    readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string>) | {
-                        readonly [x: string]: string;
+                    readonly boxShadow?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").KeyValuePair<string, string | string[]>) | {
+                        readonly [x: string]: string | readonly string[];
                     } | undefined;
                     readonly boxShadowColor?: ((utils: import("tailwindcss/types/config.js").PluginUtils) => import("tailwindcss/types/config.js").RecursiveKeyValuePair<string, string>) | {
                         readonly [x: string]: string | any;

package/dist/app/server/proxy-wp-admin.js

@@ -9,7 +9,7 @@ export async function proxyWpAdmin(event) {
     const reqUrl = getRequestURL(event);
     const serverlessConfig = serverContext.config.serverless;
     if (!serverContext.dev) {
-        if (reqUrl.pathname.toLowerCase().match(/\/+(graphql|wp\-(admin|login|json))/)) {
+        if (reqUrl.pathname.toLowerCase().match(/\/+(graphql|xmlrpc|index\.php|wp\-(admin|login|json))/)) {
             if (serverlessConfig.admin === "hide") {
                 return renderErrorPage({
                     code: 404,

package/dist/app/server/render-ssr-page.js

@@ -57,9 +57,6 @@ export async function renderPage(args) {
             serverContext.fetchAppData(),
             serverContext.fetchRouteData({
                 pathname: args.pathname,
-                withAppData: false,
-                headers: {},
-                query: {},
                 newOrigin: args.newOrigin,
             }),
         ]);

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

@@ -1,8 +1,8 @@
-import { RequestHeaders } from "vinxi/http";
-import { UrlReplacerConf } from "./utils/replace-host.js";
 import { Manifest } from "vinxi/dist/types/types/manifest";
-import { TrackerTags } from "../lib/routing/types.js";
+import { RequestHeaders } from "vinxi/http";
 import type { EDConfig } from "../../node/project/config.js";
+import { TrackerTags } from "../lib/routing/types.js";
+import { UrlReplacerConf } from "./utils/replace-host.js";
 export type ServerContextArgs = {
     dev: boolean;
     origin: string;
@@ -38,9 +38,7 @@ export declare class ServerContext {
     }): Promise<Response>;
     fetchRouteData(req: {
         pathname: string;
-        query?: Record<string, any>;
         headers?: RequestHeaders;
-        withAppData?: boolean;
         newOrigin?: string;
     }): Promise<Response>;
     fetchAppData(): Promise<ServerAppData>;

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

@@ -1,6 +1,8 @@
 import { parseURL, stringifyParsedURL, withQuery, withTrailingSlash } from "ufo";
+import { fetchWP } from "../../node/utils/fetch-wp.js";
 import { filterHeader } from "./utils/headers.js";
 import { createUrlReplacer } from "./utils/replace-host.js";
+import { pageCache, queryCache, swr } from "./utils/swr-cache.js";
 const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", /woocommerce/];
 const PROXY_REQUEST_HEADERS = [
     "content-type",
@@ -13,6 +15,7 @@ const PROXY_REQUEST_HEADERS = [
     "authorization",
     "woocommerce-session",
 ];
+const VARIES_HEADERS = ["Authorization", "woocommerce-session"];
 let runtime;
 export class ServerContext {
     dev;
@@ -52,7 +55,7 @@ export class ServerContext {
     }
     async fetchOrigin(url, opts) {
         url = this.getOriginUrl(url);
-        const response = await fetch(url, {
+        const response = await fetchWP(url, {
             ...opts,
             headers: {
                 "Content-Type": "application/json",
@@ -82,53 +85,90 @@ export class ServerContext {
         });
     }
     async fetchRouteData(req) {
-        const fetchUrl = withQuery(withTrailingSlash(req.pathname), {
-            ...req.query,
-            _props: "1",
-            _ssr: "1",
-            _debug: this.dev ? "1" : undefined,
-        });
-        // console.log("Fetching route data", req.pathname)
-        const result = await this.fetchOrigin(fetchUrl, {
-            cache: "no-cache",
-            replaceUrls: true,
-            newOrigin: req.newOrigin,
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
+        /**
+         * Calculcate the cache key.
+         * For route data, the cache key is the pathname.
+         * TODO: Potential support for Vercel draft mode.
+         */
+        let cacheKey = "fetchRouteData:" + req.pathname;
+        const result = await swr({
+            key: cacheKey,
+            cache: pageCache,
+            getFreshValue: async (ctx) => {
+                ctx.metadata.createdTime;
+                const fetchUrl = withQuery(withTrailingSlash(req.pathname), {
+                    _props: "1",
+                    _ssr: "1",
+                    _debug: this.dev ? "1" : undefined,
+                });
+                const result = await this.fetchOrigin(fetchUrl, {
+                    cache: "no-cache",
+                    replaceUrls: true,
+                    newOrigin: req.newOrigin,
+                    headers: {
+                        "Content-Type": "application/json",
+                        Accept: "application/json",
+                    },
+                    redirect: "manual",
+                });
+                const preferredCacheDuration = parseInt(result.headers.get("x-ed-cache-duration") ?? "");
+                if (isFinite(preferredCacheDuration)) {
+                    ctx.metadata.ttl = preferredCacheDuration * 1000;
+                }
+                let resultStatus = result.status;
+                let resultHeaders = result.headers;
+                let resultData = await result.json();
+                // Special case for redirects
+                if (result.headers.get("location")) {
+                    let location = result.headers.get("location");
+                    let status = result.status;
+                    if (this.replaceUrls) {
+                        location = this.replaceUrls(location);
+                    }
+                    resultHeaders.delete("location");
+                    resultData = {
+                        redirect: location,
+                        status: status,
+                    };
+                }
+                if (resultData && typeof resultData === "object") {
+                    resultData.__generated = new Date().toISOString();
+                }
+                return {
+                    status: resultStatus,
+                    headers: resultHeaders,
+                    data: JSON.stringify(resultData),
+                };
             },
-            redirect: "manual",
         });
-        if (result.headers.get("content-type") && result.headers.get("location")) {
-            let location = result.headers.get("location");
-            let status = result.status;
-            if (this.replaceUrls) {
-                location = this.replaceUrls(location);
-            }
-            const headers = new Headers({
-                ...result.headers,
-            });
-            headers.delete("location");
-            return new Response(JSON.stringify({
-                redirect: location,
-                status: status,
-            }), {
-                headers: headers,
-            });
-        }
-        return result;
+        return new Response(result.data, {
+            status: result.status,
+            headers: result.headers,
+        });
     }
     async fetchAppData() {
-        const response = await this.fetchOrigin("/_appdata", {
-            cache: "no-cache",
-            replaceUrls: true,
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
+        const data = await swr({
+            key: "fetchAppData",
+            cache: pageCache,
+            getFreshValue: async (ctx) => {
+                const response = await this.fetchOrigin("/_appdata", {
+                    cache: "no-cache",
+                    replaceUrls: true,
+                    headers: {
+                        "Content-Type": "application/json",
+                        Accept: "application/json",
+                    },
+                });
+                const result = await response.json();
+                const preferredCacheDuration = parseInt(response.headers.get("x-ed-cache-duration") ?? "");
+                if (isFinite(preferredCacheDuration)) {
+                    ctx.metadata.ttl = preferredCacheDuration * 1000;
+                }
+                result.__generated = new Date().toISOString();
+                return result;
             },
         });
-        const result = await response.json();
-        return result;
+        return data;
     }
     extractRequestHeaders(req) {
         const headers = {};
@@ -143,14 +183,48 @@ export class ServerContext {
     }
     async fetchNamedQuery(req) {
         const url = `/wp-json/ed/v1/query/${req.name}?params=${encodeURIComponent(JSON.stringify(req.params))}`;
-        return this.fetchOrigin(url, {
-            cache: "no-cache",
-            replaceUrls: true,
-            headers: {
-                ...this.extractRequestHeaders(req.headers),
-                "Content-Type": "application/json",
-                Accept: "application/json",
-            },
+        const key = `fetchNamedQuery:${req.name}:${JSON.stringify(req.params)}`;
+        const fetch = async () => {
+            const result = await this.fetchOrigin(url, {
+                cache: "no-cache",
+                replaceUrls: true,
+                headers: {
+                    ...this.extractRequestHeaders(req.headers),
+                    "Content-Type": "application/json",
+                    Accept: "application/json",
+                },
+            });
+            const preferredCacheDuration = parseInt(result.headers.get("x-ed-cache-duration") ?? "");
+            let resultStatus = result.status;
+            let resultHeaders = result.headers;
+            let resultData = await result.json();
+            if (resultData && typeof resultData === "object") {
+                resultData.__generated = new Date().toISOString();
+            }
+            return {
+                status: resultStatus,
+                headers: resultHeaders,
+                data: JSON.stringify(resultData),
+                cacheTime: isFinite(preferredCacheDuration) ? preferredCacheDuration * 1000 : undefined,
+            };
+        };
+        // If headers like 'Authorization' are set, then we shouldn't cache.
+        const hasVariedHeaders = VARIES_HEADERS.some((key) => !!req.headers[key]);
+        // Get the result, either from cache or by fetching.
+        const result = hasVariedHeaders
+            ? await fetch()
+            : await swr({
+                key,
+                cache: queryCache,
+                getFreshValue: async (ctx) => {
+                    const result = await fetch();
+                    ctx.metadata.ttl = result.cacheTime;
+                    return result;
+                },
+            });
+        return new Response(result.data, {
+            status: result.status,
+            headers: result.headers,
         });
     }
     async fetchMutation(req) {

package/dist/app/server/utils/replace-host.js

@@ -22,7 +22,6 @@ export function createUrlReplacer(conf) {
                     }
                 }
             }
-            console.log("Replacing", url, "with", newOrigin);
             if (newOrigin) {
                 if (isEscaped) {
                     return newOrigin.replace(/\//g, "\\/") + path;

package/dist/app/server/utils/swr-cache.d.ts

@@ -1,7 +1,4 @@
-import { Cache } from "@epic-web/cachified";
-export declare function swr<T>(args: {
-    key: string;
-    fetcher: () => Promise<T>;
-    ttl?: number;
-    cache?: Cache;
-}): Promise<T>;
+import { Cache, CachifiedOptions } from "@epic-web/cachified";
+export declare const pageCache: Cache<any>;
+export declare const queryCache: Cache<any>;
+export declare function swr<T>(args: CachifiedOptions<T>): Promise<T>;

package/dist/app/server/utils/swr-cache.js

@@ -1,29 +1,31 @@
 import { LRUCache } from "lru-cache";
 import { cachified, totalTtl } from "@epic-web/cachified";
-/* lru cache is not part of this package but a simple non-persistent cache */
-const lruInstance = new LRUCache({ max: 1000 });
-const lru = {
-    set(key, value) {
-        const ttl = totalTtl(value?.metadata);
-        return lruInstance.set(key, value, {
-            ttl: ttl === Infinity ? undefined : ttl,
-            start: value?.metadata?.createdTime,
-        });
-    },
-    get(key) {
-        return lruInstance.get(key);
-    },
-    delete(key) {
-        return lruInstance.delete(key);
-    },
-};
+function createCache() {
+    const lruInstance = new LRUCache({ max: 1000 });
+    const lru = {
+        set(key, value) {
+            const ttl = totalTtl(value?.metadata);
+            return lruInstance.set(key, value, {
+                ttl: ttl === Infinity ? undefined : ttl,
+                start: value?.metadata?.createdTime,
+            });
+        },
+        get(key) {
+            return lruInstance.get(key);
+        },
+        delete(key) {
+            return lruInstance.delete(key);
+        },
+    };
+    return lru;
+}
+export const pageCache = createCache();
+export const queryCache = createCache();
 export function swr(args) {
     return cachified({
-        key: args.key,
-        cache: args.cache ?? lru,
-        getFreshValue: args.fetcher,
-        ttl: args.ttl,
+        ttl: args.ttl ?? 10_000,
         swr: 3600_000,
         fallbackToCache: 15_000,
+        ...args,
     });
 }

package/dist/node/cli/cli-worker.js

@@ -47,7 +47,7 @@ export class CLIWorker {
 if (!isMainThread) {
     const mode = workerData.mode;
     /** Ignore self-signed certificate errors in dev mode */
-    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
+    // process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0"
     configureCliMode({
         interactive: true,
         readonly: false,

package/dist/node/cli/cli.js

@@ -42,7 +42,7 @@ program
     // }
     process.env["NODE_ENV"] = "development";
     /** Ignore self-signed certificate errors in dev mode */
-    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
+    // process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0"
     serverlessLog.info(chalk.yellowBright(`⚡️ ED. Stack v${VERSION}`));
     if (options.fast) {
         options.mode = "graphql,serverless";
@@ -79,6 +79,12 @@ program
         rootDir: process.cwd(),
         reportPluginCompatibility: true,
     });
+    const result = await project.verifyOriginAccess();
+    if (!result.success) {
+        projectLog.fail(result.message);
+        process.exit(1);
+        return;
+    }
     const infoWriter = new BuildInfoWriter(project);
     infoWriter.watch();
     infoWriter.write();
@@ -152,7 +158,7 @@ program
     .action(async (options) => {
     process.env["NODE_ENV"] = "production";
     /** Ignore self-signed certificate errors in dev mode */
-    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
+    // process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0"
     init(options.verbose);
     configureCliMode({
         interactive: false,
@@ -170,12 +176,20 @@ program
     });
     const buildServerless = options.serverless || process.env.VERCEL;
     if (buildServerless) {
+        // Verify that the we have access to the origin
+        const result = await project.verifyOriginAccess();
+        if (!result.success) {
+            console.error(result.message);
+            process.exit(1);
+            return;
+        }
         await buildVinxi({
             project,
             console,
         });
     }
     else {
+        const infoWriter = new BuildInfoWriter(project);
         // Generate bootstrap files
         const codegen = createVinxiCodegen({
             mode: "production",
@@ -194,7 +208,7 @@ program
         const graphql = new GraphQLGenerator(project, {
             optimize: true,
         });
-        await Promise.all([admin.start(), frontend.start(), graphql.start()]);
+        await Promise.all([infoWriter.write(), admin.start(), frontend.start(), graphql.start()]);
         console.log("Done building SPA WordPress");
     }
 });
@@ -204,7 +218,7 @@ program
     .option("--host", "Hostname to serve the application", "127.0.0.1")
     .option("--port", "Port to serve the application", "3000")
     .action(async (options) => {
-    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
+    // process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0"
     process.env["NODE_ENV"] = "production";
     process.env["HOST"] = options.host;
     process.env["PORT"] = options.port;

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.72";
+export declare const VERSION = "2.0.0-beta.74";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.72";
+export const VERSION = "2.0.0-beta.74";

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

@@ -193,7 +193,6 @@ export function createVinxiCodegen(opts) {
 
               return await serverContext.fetchRouteData({
                 pathname: id,
-                withAppData: false,
                 newOrigin: url.origin,
               })
             }),
@@ -206,7 +205,6 @@ export function createVinxiCodegen(opts) {
 
               return await serverContext.fetchRouteData({
                 pathname: id,
-                withAppData: false,
                 newOrigin: url.origin,
               })
             }),
@@ -268,7 +266,7 @@ export function createVinxiCodegen(opts) {
               return handleRPC(event)
             }
 
-            if (url.pathname.includes(".")) {
+            if (url.pathname.includes(".") || url.pathname.startsWith("/graphql")) {
               return proxyWpAdmin(event)
             }
 

package/dist/node/graphql/graphql-codegen.js

@@ -65,7 +65,7 @@ export class GraphQLGenerator {
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
-        this.schemaLoader = new GraphQLSchemaLoader(ProjectEnvUtils.getSafe("DEBUG_GRAPHQL_URL"));
+        this.schemaLoader = new GraphQLSchemaLoader(ProjectEnvUtils.getSafe("DEBUG_GRAPHQL_URL"), ProjectEnvUtils.getSafe("SITE_API_KEY"));
         this.fileLoader = createGraphQLFileLoader(this.project, [
             {
                 baseFolder: "queries/fragments",

package/dist/node/graphql/graphql-schema-loader.d.ts

@@ -6,8 +6,9 @@ type LoadResult = {
 };
 export declare class GraphQLSchemaLoader {
     url: string;
+    apiKey?: string | undefined;
     lastHash: string;
-    constructor(url: string);
+    constructor(url: string, apiKey?: string | undefined);
     private cachedResult;
     get(forceReload?: boolean): Promise<Error | LoadResult>;
     load(): Promise<Error | LoadResult>;

package/dist/node/graphql/graphql-schema-loader.js

@@ -4,11 +4,14 @@ import { introspectionFromSchema } from "graphql";
 import { graphqlLog as console } from "./graphql-codegen.js";
 import chalk from "chalk";
 import { hash } from "object-code";
+import { fetchWP } from "../utils/fetch-wp.js";
 export class GraphQLSchemaLoader {
     url;
+    apiKey;
     lastHash = "";
-    constructor(url) {
+    constructor(url, apiKey) {
         this.url = url;
+        this.apiKey = apiKey;
     }
     cachedResult = null;
     async get(forceReload = false) {
@@ -21,21 +24,7 @@ export class GraphQLSchemaLoader {
         console.info(`${this.lastHash ? "Reloading" : "Loading"} GraphQL schema from ${chalk.yellowBright(this.url)}`);
         const rawSchema = await loadSchema(this.url, {
             loaders: [new UrlLoader()],
-            // fetch: (url: string, opts: any) => {
-            //   const httpsAgent = new Agent({
-            //     rejectUnauthorized: false,
-            //   })
-            //   return fetch(url, {
-            //     ...opts,
-            //     agent: function (_parsedURL) {
-            //       if (_parsedURL.protocol == "http:") {
-            //         return undefined
-            //       } else {
-            //         return httpsAgent
-            //       }
-            //     },
-            //   })
-            // },
+            fetch: fetchWP,
         }).catch((e) => {
             return e;
         });

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

@@ -29,11 +29,15 @@ export declare const EDConfigSchema: z.ZodObject<{
         uploads: z.ZodEnum<["proxy", "remote"]>;
         plugins: z.ZodDefault<z.ZodEnum<["proxy", "remote"]>>;
         admin: z.ZodDefault<z.ZodEnum<["proxy", "hide"]>>;
+        originProtection: z.ZodDefault<z.ZodObject<{
+            requireLogin: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        }, "strip", z.ZodTypeAny, {
+            requireLogin: boolean;
+        }, {
+            requireLogin?: boolean | undefined;
+        }>>;
         themeAssets: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
-        apiOnly: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         endpoints: z.ZodRecord<z.ZodString, z.ZodString>;
-        defaultRevalidate: z.ZodOptional<z.ZodNumber>;
-        defaultRevalidateQueries: z.ZodOptional<z.ZodNumber>;
         cors: z.ZodOptional<z.ZodObject<{
             origins: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         }, "strip", z.ZodTypeAny, {
@@ -46,11 +50,11 @@ export declare const EDConfigSchema: z.ZodObject<{
         enabled: boolean;
         uploads: "proxy" | "remote";
         admin: "hide" | "proxy";
+        originProtection: {
+            requireLogin: boolean;
+        };
         themeAssets: string[];
-        apiOnly: boolean;
         endpoints: Record<string, string>;
-        defaultRevalidate?: number | undefined;
-        defaultRevalidateQueries?: number | undefined;
         cors?: {
             origins?: string[] | undefined;
         } | undefined;
@@ -60,10 +64,10 @@ export declare const EDConfigSchema: z.ZodObject<{
         plugins?: "proxy" | "remote" | undefined;
         enabled?: boolean | undefined;
         admin?: "hide" | "proxy" | undefined;
+        originProtection?: {
+            requireLogin?: boolean | undefined;
+        } | undefined;
         themeAssets?: string[] | undefined;
-        apiOnly?: boolean | undefined;
-        defaultRevalidate?: number | undefined;
-        defaultRevalidateQueries?: number | undefined;
         cors?: {
             origins?: string[] | undefined;
         } | undefined;
@@ -88,11 +92,11 @@ export declare const EDConfigSchema: z.ZodObject<{
         enabled: boolean;
         uploads: "proxy" | "remote";
         admin: "hide" | "proxy";
+        originProtection: {
+            requireLogin: boolean;
+        };
         themeAssets: string[];
-        apiOnly: boolean;
         endpoints: Record<string, string>;
-        defaultRevalidate?: number | undefined;
-        defaultRevalidateQueries?: number | undefined;
         cors?: {
             origins?: string[] | undefined;
         } | undefined;
@@ -118,10 +122,10 @@ export declare const EDConfigSchema: z.ZodObject<{
         plugins?: "proxy" | "remote" | undefined;
         enabled?: boolean | undefined;
         admin?: "hide" | "proxy" | undefined;
+        originProtection?: {
+            requireLogin?: boolean | undefined;
+        } | undefined;
         themeAssets?: string[] | undefined;
-        apiOnly?: boolean | undefined;
-        defaultRevalidate?: number | undefined;
-        defaultRevalidateQueries?: number | undefined;
         cors?: {
             origins?: string[] | undefined;
         } | undefined;

package/dist/node/project/config.js

@@ -41,17 +41,23 @@ export const EDConfigSchema = z.object({
             .enum(["proxy", "hide"])
             .default("proxy")
             .describe("How to handle the WordPress admin URLs.\nDefault is `proxy`, which will proxy the admin URLs to the CMS origin. When set to `hide`, all /wp-admin, /wp-json and /wp-login.php URLs will show a 404 page.\nHas no effect in dev mode."),
+        originProtection: z
+            .object({
+            requireLogin: z
+                .boolean()
+                .optional()
+                .default(false)
+                .describe("Enabling this will prevent access to the frontend for non-logged-in users on the CMS origin (eg. Flywheel, WPEngine), but allow access to the serverless frontend (eg. Vercel)."),
+        })
+            .default({}),
         themeAssets: z
             .array(z.string())
             .optional()
             .default(["assets"])
             .describe('Asset folders to include in a serverless deployment.\nDefault is `["assets"]`'),
-        apiOnly: z.boolean().optional().default(false).describe("Whether to deploy only the API, not the frontend"),
         endpoints: z
             .record(z.string(), z.string())
             .describe("A map of WordPress hostnames -> serverless hostnames. You can use `*` as a wildcard for the key.\n\nFor example, `{'cms.ed.studio': 'ed.studio'}` tells the WordPress frontend where it can find any serverless API endpoints."),
-        defaultRevalidate: z.number().optional(),
-        defaultRevalidateQueries: z.number().optional(),
         cors: z
             .object({
             origins: z
@@ -66,7 +72,8 @@ export const EDConfigSchema = z.object({
         props: z.number(),
         queries: z.number(),
     }))
-        .optional(),
+        .optional()
+        .describe("A map of origin domains -> cache settings. Wildcards can be used for each domain."),
     devUI: z.enum(["disabled", "enabled"]).default("enabled"),
 });
 export class Configurator {

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

@@ -5,22 +5,26 @@ export declare const fields: {
     readonly SITE_URL: z.ZodString;
     readonly DEV_HOT_PORT: z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodString>, string | number, string | undefined>, number, string | undefined>;
     readonly DEV_SERVERLESS_PORT: z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodString>, string | number, string | undefined>, number, string | undefined>;
+    readonly SITE_API_KEY: z.ZodOptional<z.ZodString>;
 };
 export declare const ProjectEnvSchema: z.ZodObject<{
     readonly DEBUG_GRAPHQL_URL: z.ZodOptional<z.ZodString>;
     readonly SITE_URL: z.ZodOptional<z.ZodString>;
     readonly DEV_HOT_PORT: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodString>, string | number, string | undefined>, number, string | undefined>>;
     readonly DEV_SERVERLESS_PORT: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodString>, string | number, string | undefined>, number, string | undefined>>;
+    readonly SITE_API_KEY: z.ZodOptional<z.ZodOptional<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
     DEBUG_GRAPHQL_URL?: string | undefined;
     SITE_URL?: string | undefined;
     DEV_HOT_PORT?: number | undefined;
     DEV_SERVERLESS_PORT?: number | undefined;
+    SITE_API_KEY?: string | undefined;
 }, {
     DEBUG_GRAPHQL_URL?: string | undefined;
     SITE_URL?: string | undefined;
     DEV_HOT_PORT?: string | undefined;
     DEV_SERVERLESS_PORT?: string | undefined;
+    SITE_API_KEY?: string | undefined;
 }>;
 export type ProjectEnvKey = keyof typeof fields;
 export declare const ProjectEnvUtils: {

package/dist/node/project/env.js

@@ -15,6 +15,7 @@ export const fields = {
     SITE_URL: z.string().url().describe("The URL of the site"),
     DEV_HOT_PORT: portNumber,
     DEV_SERVERLESS_PORT: portNumber,
+    SITE_API_KEY: z.string().optional().describe("The API key for the site, when origin protection is enabled"),
 };
 export const ProjectEnvSchema = z.object(fields).partial();
 export const ProjectEnvUtils = {

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

@@ -29,6 +29,12 @@ export declare class Project {
     private wp;
     reportPluginCompatibility: boolean;
     private constructor();
+    verifyOriginAccess(): Promise<{
+        success: true;
+    } | {
+        success: false;
+        message: string;
+    }>;
     private load;
     reportProjectInfo(): string;
     getWordpressInfo(): Promise<{

package/dist/node/project/project.js

@@ -12,6 +12,7 @@ import { loadRouteManifest } from "./manifest/routes-manifest.js";
 import { loadViewManifest } from "./manifest/view-manifest.js";
 import { loadWidgetManifest } from "./manifest/widget-manifest.js";
 import { WPInfo } from "./wp-info.js";
+import { fetchWP } from "../utils/fetch-wp.js";
 const console = createConsole("Project", "project");
 export const projectLog = console;
 /**
@@ -44,6 +45,34 @@ export class Project {
         this.serverRoutes = loadRouteManifest(this);
         this.wp = new WPInfo(this.origin);
     }
+    async verifyOriginAccess() {
+        try {
+            const response = await fetchWP(this.wp.infoUrl);
+            if (!response.ok) {
+                return {
+                    success: false,
+                    message: [
+                        `Failed to access WordPress origin at ${this.origin}`,
+                        `Using API Key?: ${ProjectEnvUtils.getSafe("SITE_API_KEY") ? "Yes" : "No"}`,
+                        `Response: ${response.status} ${response.statusText}`,
+                    ].join("\n"),
+                };
+            }
+            return {
+                success: true,
+            };
+        }
+        catch (err) {
+            return {
+                success: false,
+                message: [
+                    `Failed to access WordPress origin at ${this.origin}`,
+                    `Using API Key?: ${ProjectEnvUtils.getSafe("SITE_API_KEY") ? "Yes" : "No"}`,
+                    `The following error occurred:\n${err}`,
+                ].join("\n"),
+            };
+        }
+    }
     async load() {
         console.setWorking(true);
         console.setState(this);

package/dist/node/project/wp-info.d.ts

@@ -26,6 +26,7 @@ export declare class WPInfo {
     siteUrl: string;
     private cached?;
     constructor(siteUrl: string);
+    get infoUrl(): string;
     getInfo(force?: boolean): Promise<WPInfoData>;
     getPluginIssues(): Promise<string[]>;
 }

package/dist/node/project/wp-info.js

@@ -1,18 +1,22 @@
 import { resolveURL } from "ufo";
+import { fetchWP } from "../utils/fetch-wp.js";
 export class WPInfo {
     siteUrl;
     cached;
     constructor(siteUrl) {
         this.siteUrl = siteUrl;
     }
+    get infoUrl() {
+        return resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
+    }
     async getInfo(force = false) {
         if (!this.siteUrl) {
             throw new Error("Attempted to get site info from WordPress, but SITE_URL was not present in the environment.");
         }
         if (this.cached && !force)
             return this.cached;
-        const url = resolveURL(this.siteUrl, "/wp-json/ed/v1/dev/site-info");
-        const response = await fetch(url);
+        const url = this.infoUrl;
+        const response = await fetchWP(url);
         const result = (await response.json());
         this.cached = result;
         return result;

package/dist/node/utils/fetch-wp.d.ts

@@ -0,0 +1 @@
+export declare function fetchWP(url: string | URL, args?: RequestInit): Promise<Response>;

package/dist/node/utils/fetch-wp.js

@@ -0,0 +1,27 @@
+import { ProjectEnvUtils } from "../project/env.js";
+import { Agent, fetch, setGlobalDispatcher, Headers } from "undici";
+const agent = new Agent({
+    connect: {
+        rejectUnauthorized: false,
+    },
+});
+export function fetchWP(url, args = {}) {
+    const headers = new Headers(args.headers);
+    // If an API key has been set in the environment, use it
+    const accessKey = ProjectEnvUtils.getSafe("SITE_API_KEY");
+    if (accessKey) {
+        headers.set("x-ed-api-key", accessKey);
+    }
+    // Allow self-signed certificates when using a local development domain
+    let allowSelfSigned = isDevelopmentDomain(url);
+    return fetch(url, {
+        ...args,
+        dispatcher: allowSelfSigned ? agent : undefined,
+        headers,
+    });
+}
+setGlobalDispatcher(agent);
+function isDevelopmentDomain(url) {
+    const hostname = typeof url === "string" ? new URL(url).hostname : url.hostname;
+    return !!hostname?.match(/(^[0-9\.]+$|\.local$)/);
+}

package/dist/node/utils/is-deploying.js

@@ -2,5 +2,5 @@
  * Returns true if we think that the compiler is running in a deployment context (Vercel, GitHub Actions, etc.)
  */
 export function isDeploying() {
-    return !!process.env.VERCEL;
+    return !!process.env.VERCEL || !!process.env.GITHUB_ACTIONS;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.72",
+  "version": "2.0.0-beta.74",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -106,8 +106,9 @@
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
     "listhen": "^1.6.0",
-    "lru-cache": "^11.0.2",
+    "lru-cache": "10.4.1",
     "mkcert": "^3.2.0",
+    "mnemonist": "^0.39.8",
     "obj-console": "^1.0.2",
     "object-code": "^1.3.3",
     "qs": "^6.13.0",
@@ -116,6 +117,7 @@
     "ts-poet": "^6.6.0",
     "ufo": "^1.3.1",
     "undent": "^0.1.0",
+    "undici": "^6.21.0",
     "valtio": "^1.13.2",
     "vinxi": "^0.4.3",
     "vite-tsconfig-paths": "^4.2.1",