eddev 2.3.10 → 2.3.11-beta.1

package/dist/app/lib/blocks/editor/blocks-by-tag.js

@@ -21,7 +21,7 @@ export const blocksByTag = {
         if (Array.isArray(blocks)) {
             for (let name of blocks) {
                 result.add(name);
-                if (name === "root") {
+                if (name === "root" || name === "#root") {
                     result.add("core/post-content");
                 }
                 if (name.match(/^[a-z0-9\-\_]+\/[a-z0-9\-\_]+$/)) {

package/dist/app/lib/blocks/editor/editor-config.d.ts

@@ -12,7 +12,7 @@ export type EditorConfigItem = {
      *
      * The default is "root".
      *
-     * @default ["root"]
+     * @default ["root", "#root"]
      **/
     rootBlocks?: (ChildBlockTypeName | BlockTagName)[];
     /** Allows you to add additional class names to blocks, depending on their type and state */

package/dist/app/lib/blocks/editor/root-blocks.js

@@ -2,13 +2,13 @@ import { hash } from "object-code";
 import { subscribe, snapshot } from "valtio";
 import { editorConfigStore } from "./editor-config";
 import { blocksByTag } from "./blocks-by-tag";
-let constraint = ["root"];
-let rootBlockList = new Set(["root"]);
+let constraint = ["root", "#root"];
+let rootBlockList = new Set(["root", "#root"]);
 export const rootBlocks = {
     listen() {
         let key = hash(rootBlocks);
         subscribe(editorConfigStore, () => {
-            constraint = snapshot(editorConfigStore.currentBlocksConfig).rootBlocks ?? ["root"];
+            constraint = snapshot(editorConfigStore.currentBlocksConfig).rootBlocks ?? ["root", "#root"];
             let newKey = hash(constraint);
             if (key === newKey)
                 return;

package/dist/app/server/render-ssr-page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAyH/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CA0GpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA8B1D"}
+{"version":3,"file":"render-ssr-page.d.ts","sourceRoot":"","sources":["../../../src/app/server/render-ssr-page.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAKrF,KAAK,OAAO,GAAG;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,wDAyH/C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6GpE;AAED,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,CAAA;CAChB,GAAG,eAAe,CAAA;AAEnB,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiBlF;AAED,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,UA8B1D"}

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

@@ -167,6 +167,9 @@ export async function renderPage(args) {
         });
         responseHeaders.set("Content-Type", "text/html; charset=utf-8");
         responseHeaders.set("X-Ed-Rendered-At", new Date().toUTCString());
+        if (!serverContext.cacheConfig.serverless.isr) {
+            responseHeaders.set("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0");
+        }
         if (args.statusCode) {
             responseInit.status = args.statusCode;
         }

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

@@ -33,6 +33,9 @@ export declare class ServerContext {
     constructor(conf: ServerContextArgs);
     replaceUrls(text: string, origin?: string): string;
     get runtime(): ServerContextRuntime;
+    get useDataCache(): boolean;
+    private createCacheContext;
+    private applyServerlessCacheHeaders;
     static setRuntime(rt: ServerContextRuntime): void;
     getOriginUrl(url: string): string;
     fetchOrigin(url: string, opts?: RequestInit & {

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":"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"}
+{"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

@@ -49,6 +49,20 @@ export class ServerContext {
     get runtime() {
         return runtime;
     }
+    get useDataCache() {
+        return this.cacheConfig.serverless.dataCache !== "none";
+    }
+    createCacheContext() {
+        return { metadata: {} };
+    }
+    applyServerlessCacheHeaders(headers) {
+        if (this.cacheConfig.serverless.isr) {
+            headers.delete("cache-control");
+        }
+        else {
+            headers.set("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0");
+        }
+    }
     static setRuntime(rt) {
         runtime = rt;
     }
@@ -190,135 +204,139 @@ export class ServerContext {
          * TODO: Potential support for Vercel draft mode.
          */
         let cacheKey = "fetchRouteData:" + withTrailingSlash(req.pathname.toLowerCase());
-        const result = await swr({
-            key: cacheKey,
-            cache: pageCache,
-            forceFresh: this.dev || req.bypass,
-            staleWhileRevalidate: 10000,
-            getFreshValue: async (ctx) => {
-                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 (this.cacheConfig.serverless.isr) {
-                    ctx.metadata.ttl = 5000;
-                }
-                else if (isFinite(preferredCacheDuration)) {
-                    ctx.metadata.ttl = preferredCacheDuration * 1000;
-                }
-                let resultStatus = result.status;
-                let resultHeaders = new Headers(result.headers);
-                let resultData = {};
-                // Special case for redirects
-                if (result.headers.has("location")) {
-                    let location = result.headers.get("location");
-                    let status = result.status;
-                    if (this.replaceUrls) {
-                        location = this.replaceUrls(location);
-                    }
-                    return {
-                        status: 200,
-                        headers: new Headers({
-                            "Content-Type": "application/json",
-                        }),
-                        data: JSON.stringify({ redirect: location, status: status }),
-                    };
-                }
-                try {
-                    resultData = await result.json();
-                }
-                catch (err) {
-                    console.error(`Invalid JSON response from '${fetchUrl}'. An error page will be displayed.`);
-                    ctx.metadata.ttl = 0;
-                    return {
-                        status: 500,
-                        headers: resultHeaders,
-                        data: JSON.stringify({
-                            view: "_error",
-                            viewData: {
-                                data: {
-                                    statusCode: 500,
-                                    title: "Internal Server Error",
-                                    userMessage: "An internal server error occurred.",
-                                    report: {
-                                        details: "A JSON parsing error occurred while fetching route data.",
-                                        message: err.message,
-                                    },
-                                },
-                            },
-                        }),
-                    };
-                }
-                if (resultData && typeof resultData === "object") {
-                    resultData.__generated = new Date().toISOString();
-                }
-                if (resultData.queryMonitor) {
-                    this.debugLogQueryMonitor("props", req.pathname, resultData.queryMonitor);
+        const getFreshValue = async (ctx) => {
+            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 (this.cacheConfig.serverless.isr) {
+                ctx.metadata.ttl = 5000;
+            }
+            else if (isFinite(preferredCacheDuration)) {
+                ctx.metadata.ttl = preferredCacheDuration * 1000;
+            }
+            let resultStatus = result.status;
+            let resultHeaders = new Headers(result.headers);
+            let resultData = {};
+            // Special case for redirects
+            if (result.headers.has("location")) {
+                let location = result.headers.get("location");
+                let status = result.status;
+                if (this.replaceUrls) {
+                    location = this.replaceUrls(location);
                 }
-                // if (isFinite(preferredCacheDuration)) {
-                //   const maxAge = isFinite(preferredCacheDuration) ? preferredCacheDuration * 1000 : undefined
-                //   resultHeaders.set("Cache-Control", `max-age=0, s-maxage=${maxAge}, stale-while-revalidate`)
-                // }
-                resultHeaders.set("X-Ed-Fetched-At", new Date().toUTCString());
                 return {
-                    status: resultStatus,
+                    status: 200,
+                    headers: new Headers({
+                        "Content-Type": "application/json",
+                    }),
+                    data: JSON.stringify({ redirect: location, status: status }),
+                };
+            }
+            try {
+                resultData = await result.json();
+            }
+            catch (err) {
+                console.error(`Invalid JSON response from '${fetchUrl}'. An error page will be displayed.`);
+                ctx.metadata.ttl = 0;
+                return {
+                    status: 500,
                     headers: resultHeaders,
-                    data: JSON.stringify(resultData),
+                    data: JSON.stringify({
+                        view: "_error",
+                        viewData: {
+                            data: {
+                                statusCode: 500,
+                                title: "Internal Server Error",
+                                userMessage: "An internal server error occurred.",
+                                report: {
+                                    details: "A JSON parsing error occurred while fetching route data.",
+                                    message: err.message,
+                                },
+                            },
+                        },
+                    }),
                 };
-            },
-        });
-        if (this.cacheConfig.serverless.isr) {
-            result.headers.delete("cache-control");
-        }
+            }
+            if (resultData && typeof resultData === "object") {
+                resultData.__generated = new Date().toISOString();
+            }
+            if (resultData.queryMonitor) {
+                this.debugLogQueryMonitor("props", req.pathname, resultData.queryMonitor);
+            }
+            // if (isFinite(preferredCacheDuration)) {
+            //   const maxAge = isFinite(preferredCacheDuration) ? preferredCacheDuration * 1000 : undefined
+            //   resultHeaders.set("Cache-Control", `max-age=0, s-maxage=${maxAge}, stale-while-revalidate`)
+            // }
+            resultHeaders.set("X-Ed-Fetched-At", new Date().toUTCString());
+            return {
+                status: resultStatus,
+                headers: resultHeaders,
+                data: JSON.stringify(resultData),
+            };
+        };
+        const result = this.useDataCache
+            ? await swr({
+                key: cacheKey,
+                cache: pageCache,
+                forceFresh: this.dev || req.bypass,
+                staleWhileRevalidate: 10000,
+                getFreshValue,
+            })
+            : await getFreshValue(this.createCacheContext());
+        this.applyServerlessCacheHeaders(result.headers);
         return new Response(result.data, {
             status: result.status,
             headers: result.headers,
         });
     }
     async fetchAppData(args) {
-        const data = await swr({
-            key: "fetchAppData",
-            cache: pageCache,
-            forceFresh: this.dev || args.bypass,
-            staleWhileRevalidate: 10000,
-            getFreshValue: async (ctx) => {
-                const response = await this.fetchOrigin("/_appdata", {
-                    cache: "no-cache",
-                    replaceUrls: true,
-                    newOrigin: args.newOrigin,
-                    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;
-                }
-                // In ISR mode, set a super short TTL to avoid caching, but preventing constant revalidation
-                if (this.cacheConfig.serverless.isr) {
-                    ctx.metadata.ttl = 5000;
-                }
-                if (result.queryMonitor) {
-                    this.debugLogQueryMonitor("app", "", result.queryMonitor);
-                }
-                result.__generated = new Date().toISOString();
-                return result;
-            },
-        });
+        const getFreshValue = async (ctx) => {
+            const response = await this.fetchOrigin("/_appdata", {
+                cache: "no-cache",
+                replaceUrls: true,
+                newOrigin: args.newOrigin,
+                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;
+            }
+            // In ISR mode, set a super short TTL to avoid caching, but preventing constant revalidation
+            if (this.cacheConfig.serverless.isr) {
+                ctx.metadata.ttl = 5000;
+            }
+            if (result.queryMonitor) {
+                this.debugLogQueryMonitor("app", "", result.queryMonitor);
+            }
+            result.__generated = new Date().toISOString();
+            return result;
+        };
+        const data = this.useDataCache
+            ? await swr({
+                key: "fetchAppData",
+                cache: pageCache,
+                forceFresh: this.dev || args.bypass,
+                staleWhileRevalidate: 10000,
+                getFreshValue,
+            })
+            : await getFreshValue(this.createCacheContext());
         return data;
     }
     extractRequestHeaders(req) {
@@ -366,7 +384,7 @@ export class ServerContext {
         // 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
+        const result = hasVariedHeaders || !this.useDataCache
             ? await fetch()
             : await swr({
                 key,
@@ -382,9 +400,7 @@ export class ServerContext {
                     return result;
                 },
             });
-        if (this.cacheConfig.serverless.isr) {
-            result.headers.delete("cache-control");
-        }
+        this.applyServerlessCacheHeaders(result.headers);
         return new Response(result.data, {
             status: result.status,
             headers: result.headers,

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/node/cli/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/node/cli/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,kBAAkB,CAAA"}

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.10";
+export const VERSION = "2.3.11-beta.1";

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

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

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

@@ -1 +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"}
+{"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,sBAAsB,CAAC,KAAK,EAAE,MAAM,UAWnD;AA2BD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAG,aAAa,CAyB9E"}

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

@@ -1,8 +1,46 @@
 import { EDCacheConfigSchema } from "../project/config.js";
+export function normalizeCacheHostname(input) {
+    const value = input.trim().toLowerCase();
+    try {
+        const url = new URL(value.includes("://") ? value : `https://${value}`);
+        return url.hostname;
+    }
+    catch {
+        return value
+            .replace(/^https?:\/\//, "")
+            .replace(/\/.*$/, "")
+            .replace(/:\d+$/, "");
+    }
+}
+function cacheHostMatchScore(pattern, hostname) {
+    const normalizedPattern = normalizeCacheHostname(pattern);
+    if (normalizedPattern === hostname) {
+        return 1_000_000 + normalizedPattern.length;
+    }
+    if (normalizedPattern === "*") {
+        return 0;
+    }
+    if (!normalizedPattern.includes("*")) {
+        return null;
+    }
+    const regex = new RegExp("^" + normalizedPattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*") + "$", "i");
+    if (regex.test(hostname)) {
+        return normalizedPattern.replace(/\*/g, "").length;
+    }
+    return null;
+}
 export function getCacheConfig(origin, config) {
-    const originDomain = new URL(origin).host;
-    let cacheConfig = config.cache[originDomain] ??
-        config.cache["*"] ??
+    const originDomain = normalizeCacheHostname(origin);
+    let bestMatch = null;
+    for (const [host, cacheConfig] of Object.entries(config.cache ?? {})) {
+        const score = cacheHostMatchScore(host, originDomain);
+        if (score === null)
+            continue;
+        if (!bestMatch || score > bestMatch.score) {
+            bestMatch = { score, config: cacheConfig };
+        }
+    }
+    let cacheConfig = bestMatch?.config ??
         EDCacheConfigSchema.parse({
             appDataTTL: 0,
             pageDataTTL: 0,

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

@@ -1,5 +1,5 @@
-import { StatefulLog } from "../utils/stateful-log.js";
 import { EDConfig } from "../project/config.js";
+import { StatefulLog } from "../utils/stateful-log.js";
 export type AppArgs = {
     mode: "development" | "production";
     publicUrl: string;

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;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,uBAgP3C"}
+{"version":3,"file":"vinxi-app.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-app.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAKtD,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,uBAuP3C"}

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

@@ -2,9 +2,9 @@ import { joinURL } from "ufo";
 import { createApp } from "vinxi";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { StatefulLog } from "../utils/stateful-log.js";
+import { getCacheConfig } from "./cache-config.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/" +
@@ -13,6 +13,40 @@ export function createVinxiApp(args) {
             serverless: true,
         });
     const cacheConfig = getCacheConfig(args.origin, args.config);
+    const serverlessDataRoute = (expiration) => cacheConfig.serverless.isr
+        ? {
+            isr: {
+                expiration,
+                allowQuery: [],
+                passQuery: false,
+                group: 32,
+            },
+            cache: {
+                varies: ["Authorization", "woocommerce-session"],
+            },
+        }
+        : {
+            isr: false,
+            cache: false,
+        };
+    const serverlessPageRoute = (expiration) => cacheConfig.serverless.isr
+        ? {
+            isr: {
+                expiration,
+                allowQuery: [],
+                passQuery: false,
+                group: 32,
+            },
+            cache: {
+                maxAge: expiration,
+                // swr: true,
+                staleMaxAge: 3600,
+            },
+        }
+        : {
+            isr: false,
+            cache: false,
+        };
     return createApp({
         server: {
             // experimental: {
@@ -64,26 +98,8 @@ export function createVinxiApp(args) {
                 },
                 "/wp-content/**": { proxy: joinURL(args.origin, "wp-content/**") },
                 "/wp-includes/**": { proxy: joinURL(args.origin, "wp-includes/**") },
-                "/_data/route/**": {
-                    isr: {
-                        expiration: cacheConfig.pageDataTTL ?? 0,
-                        allowQuery: [],
-                        passQuery: false,
-                    },
-                    cache: {
-                        varies: ["Authorization", "woocommerce-session"],
-                    },
-                },
-                "/_data/query/**": {
-                    isr: {
-                        expiration: cacheConfig.queryHooksTTL ?? 0,
-                        allowQuery: [],
-                        passQuery: false,
-                    },
-                    cache: {
-                        varies: ["Authorization", "woocommerce-session"],
-                    },
-                },
+                "/_data/route/**": serverlessDataRoute(cacheConfig.pageDataTTL ?? 0),
+                "/_data/query/**": serverlessDataRoute(cacheConfig.queryHooksTTL ?? 0),
                 "/_data/mutation/**": {
                     isr: false,
                     cache: false,
@@ -101,18 +117,7 @@ export function createVinxiApp(args) {
                         },
                     };
                 }, {}),
-                "/**/*": {
-                    isr: {
-                        expiration: cacheConfig.pageDataTTL ?? 0,
-                        allowQuery: [],
-                        passQuery: false,
-                    },
-                    cache: {
-                        maxAge: cacheConfig.pageDataTTL ?? 0,
-                        // swr: true,
-                        staleMaxAge: 3600,
-                    },
-                },
+                "/**/*": serverlessPageRoute(cacheConfig.pageDataTTL ?? 0),
             },
             vercel: {
                 config: {

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

@@ -2,10 +2,6 @@ import { z } from "zod";
 import { Project } from "./project.js";
 export declare const EDCacheConfigSchema: z.ZodObject<{
     wordpress: z.ZodDefault<z.ZodObject<{
-        strategy: z.ZodEnum<{
-            always: "always";
-            "ssr-always-fresh": "ssr-always-fresh";
-        }>;
         cacheHeaders: z.ZodDefault<z.ZodBoolean>;
         transients: z.ZodDefault<z.ZodBoolean>;
     }, z.core.$strip>>;
@@ -14,7 +10,6 @@ export declare const EDCacheConfigSchema: z.ZodObject<{
         dataCache: z.ZodDefault<z.ZodEnum<{
             none: "none";
             "in-memory": "in-memory";
-            kv: "kv";
         }>>;
     }, z.core.$strip>>;
     pageDataTTL: z.ZodDefault<z.ZodNumber>;
@@ -94,10 +89,6 @@ export declare const EDConfigSchema: z.ZodObject<{
     }, z.core.$strip>;
     cache: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         wordpress: z.ZodDefault<z.ZodObject<{
-            strategy: z.ZodEnum<{
-                always: "always";
-                "ssr-always-fresh": "ssr-always-fresh";
-            }>;
             cacheHeaders: z.ZodDefault<z.ZodBoolean>;
             transients: z.ZodDefault<z.ZodBoolean>;
         }, z.core.$strip>>;
@@ -106,7 +97,6 @@ export declare const EDConfigSchema: z.ZodObject<{
             dataCache: z.ZodDefault<z.ZodEnum<{
                 none: "none";
                 "in-memory": "in-memory";
-                kv: "kv";
             }>>;
         }, z.core.$strip>>;
         pageDataTTL: z.ZodDefault<z.ZodNumber>;

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;AAIvB,OAAO,EAAE,OAAO,EAAyB,MAAM,cAAc,CAAA;AAE7D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;iBAqB9B,CAAA;AAqBF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;2BAwChC,CAAA;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwHzB,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;YAclB,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;AAIvB,OAAO,EAAE,OAAO,EAAyB,MAAM,cAAc,CAAA;AAE7D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;iBAmB9B,CAAA;AAqBF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;2BAwChC,CAAA;AAEF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwHzB,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;YAclB,UAAU;IAiCxB,OAAO,CAAC,WAAW;IAOnB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO;CAUzD"}

package/dist/node/project/config.js

@@ -8,19 +8,17 @@ import { projectLog as console } from "./project.js";
 export const EDCacheConfigSchema = z.object({
     wordpress: z
         .object({
-        /** @deprecated */
-        strategy: z.enum(["always", "ssr-always-fresh"]).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."),
     })
-        .default({ strategy: "always", cacheHeaders: true, transients: true }),
+        .default({ cacheHeaders: true, transients: true }),
     serverless: z
         .object({
-        isr: z.boolean().default(true).describe("Whether to use Incremental Static Regeneration for this origin."),
+        isr: z.boolean().default(true).describe("Whether to use serverless response caching/ISR for this origin."),
         dataCache: z
-            .enum(["in-memory", "kv", "none"])
+            .enum(["in-memory", "none"])
             .default("in-memory")
-            .describe("The cache strategy to use for page data."),
+            .describe("The serverless origin-data cache strategy."),
     })
         .default({ isr: true, dataCache: "in-memory" }),
     pageDataTTL: z.number().default(300).describe("The number of seconds to cache page data."),
@@ -175,7 +173,7 @@ export const EDConfigSchema = z.object({
             appDataTTL: 300,
             queryHooksTTL: 300,
             serverless: { isr: true, dataCache: "in-memory" },
-            wordpress: { strategy: "always", cacheHeaders: true, transients: true },
+            wordpress: { cacheHeaders: true, transients: true },
         },
     })
         .describe("A map of WordPress origin hostnames -> cache settings. Wildcards can be used for each domain."),

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "eddev",
-  "version": "2.3.10",
+  "version": "2.3.11-beta.1",
   "description": "",
   "main": "index.js",
   "type": "module",
-  "bin": "./bin/eddev.js",
+  "bin": {
+    "eddev": "./bin/eddev.js"
+  },
   "exports": {
     "./routing": {
       "types": "./dist/app/lib/routing/index.d.ts",

package/types.meta.d.ts

@@ -73,8 +73,8 @@ declare global {
      *
      * * *Not to be confused with `flags`*!
      *
-     * "root" is a special tag that allows the block to be used at the root level of the post.
-     * "inline" is a convention which applies to blocks which can be used within rich text areas.
+     * "#root" is a special tag that allows the block to be used at the root level of the post.
+     * "#inline" is a convention which applies to blocks which can be used within rich text areas.
      *
      * For child blocks, you can either:
      *
@@ -82,7 +82,7 @@ declare global {
      * - Leave this blank, and use `conditions: { parent: ['some-parent-block'] }`
      * - Set this to a value, such as `["accordion-item"]`, and use `<InnerBlocks allowedBlocks={["accordion-item"]}` (Best for sites with many nested block types)
      */
-    tags?: ("root" | "inline" | BlockTagName | (string & {}))[]
+    tags?: ("#root" | "#inline" | BlockTagName | (string & {}))[]
 
     /**
      * Conditions allow you to limit the availability of this block to specific post types and templates.