eddev 2.0.0-beta.21 → 2.0.0-beta.211

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

@@ -1,7 +1,12 @@
-import { parseURL, stringifyParsedURL, withQuery } from "ufo";
+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";
-const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control"];
+import { pageCache, queryCache, swr } from "./utils/swr-cache.js";
+import { QueryMonitor } from "../utils/query-monitor.js";
+import chalk from "chalk";
+import { inspect } from "node:util";
+const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control", /woocommerce/, "location"];
 const PROXY_REQUEST_HEADERS = [
     "content-type",
     "accept",
@@ -11,19 +16,38 @@ const PROXY_REQUEST_HEADERS = [
     "referer",
     "user-agent",
     "authorization",
+    "woocommerce-session",
 ];
+const VARIES_HEADERS = ["Authorization", "woocommerce-session"];
+let runtime;
 export class ServerContext {
     dev;
     origin;
-    getManifest;
-    replaceUrls;
+    _urlReplacer;
+    rpcBases = [];
+    config;
+    static main;
     constructor(conf) {
         this.dev = conf.dev;
         this.origin = conf.origin;
-        this.getManifest = conf.getManifest;
+        this.rpcBases = conf.rpcBases ?? [];
+        this.config = conf.config;
         if (conf.replaceUrls) {
-            this.replaceUrls = createUrlReplacer(conf.replaceUrls);
+            this._urlReplacer = createUrlReplacer(conf.replaceUrls);
         }
+        ServerContext.main = this;
+    }
+    replaceUrls(text, origin) {
+        if (this._urlReplacer) {
+            return this._urlReplacer(text, origin);
+        }
+        return text;
+    }
+    get runtime() {
+        return runtime;
+    }
+    static setRuntime(rt) {
+        runtime = rt;
     }
     getOriginUrl(url) {
         const parsed = parseURL(url);
@@ -34,13 +58,11 @@ export class ServerContext {
     }
     async fetchOrigin(url, opts) {
         url = this.getOriginUrl(url);
-        const response = await fetch(url, {
-            ...opts,
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
-                ...opts?.headers,
-            },
+        const fetchOps = { ...opts };
+        delete fetchOps.replaceUrls;
+        delete fetchOps.newOrigin;
+        const response = await fetchWP(url, {
+            ...fetchOps,
         });
         if (!response.ok) {
             return response;
@@ -52,8 +74,8 @@ export class ServerContext {
             }
         });
         let text = await response.text();
-        if (opts?.replaceUrls && this.replaceUrls) {
-            text = this.replaceUrls(text);
+        if (opts?.replaceUrls) {
+            text = this.replaceUrls(text, opts.newOrigin);
         }
         return new Response(text, {
             status: response.status,
@@ -61,22 +83,209 @@ export class ServerContext {
             headers,
         });
     }
+    debugLogQueryMonitor(kind, uri, monitor) {
+        if (!QueryMonitor.hasLogEntries(monitor))
+            return;
+        let indentLevel = 2;
+        const finalOutput = [];
+        let label = "";
+        if (kind === "props") {
+            label = "While fetching props for route '" + uri + "'";
+        }
+        else if (kind === "query") {
+            label = "While querying " + uri + " via REST API";
+        }
+        else if (kind === "mutation") {
+            label = "While mutating " + uri + " via REST API";
+        }
+        else if (kind === "app") {
+            label = "While fetching app data";
+        }
+        finalOutput.push(chalk.whiteBright("➜ " + label));
+        function printEntry(entry) {
+            finalOutput.push(indent(indentLevel, chalk.whiteBright("➜ " + entry.file) + " " + chalk.gray(entry.label ? `(${entry.label})` : "")));
+            indentLevel += 2;
+            if (entry.log && entry.log.length) {
+                for (let item of entry.log) {
+                    let output = "";
+                    let prefix = "";
+                    let message = item.message;
+                    let stack = [];
+                    if (item.type === "php_error") {
+                        prefix = chalk.red("PHP Error:");
+                    }
+                    else if (item.type === "php_warning") {
+                        prefix = chalk.yellow("PHP Warning:");
+                    }
+                    else if (item.type === "php_notice") {
+                        prefix = chalk.yellow("PHP Notice:");
+                    }
+                    else if (item.type === "GRAPHQL_DEBUG") {
+                        prefix = chalk.cyan("debug:");
+                    }
+                    else if (item.type === "error" && item.extensions?.category === "user") {
+                        prefix = chalk.red("UserError:");
+                    }
+                    else {
+                        prefix = chalk.gray((item.type || "Log") + ":");
+                    }
+                    if (typeof message !== "string") {
+                        message = inspect(message, { depth: 4 });
+                    }
+                    if (item.debugMessage) {
+                        message += "\n" + chalk.gray(item.debugMessage);
+                    }
+                    output += prefix + " " + message;
+                    if (item.path) {
+                        stack.push(chalk.gray(" at path " + JSON.stringify(item.path)));
+                    }
+                    if (item.file) {
+                        stack.push(chalk.gray(`at ${chalk.white(item.file)} line ${item.line || "??"}`));
+                    }
+                    if (item.stack?.length) {
+                        stack.push(item.stack
+                            .filter((line) => {
+                            return line !== item.file + ":" + item.line;
+                        })
+                            .slice(0, 4)
+                            .map((line) => "  " + chalk.gray(line))
+                            .join("\n"));
+                    }
+                    if (stack.length > 0) {
+                        output += indent(2, "\n" + stack.join("\n"));
+                    }
+                    finalOutput.push(indent(indentLevel, "➜ " + output));
+                }
+            }
+            for (let child of entry.children ?? []) {
+                printEntry(child);
+            }
+            indentLevel -= 2;
+        }
+        for (let entry of monitor) {
+            printEntry(entry);
+        }
+    }
     async fetchRouteData(req) {
-        const fetchUrl = withQuery(req.pathname, {
-            ...req.query,
-            _props: req.withAppData ? "all" : "1",
-            _ssr: "1",
-            _debug: this.dev ? "1" : undefined,
+        /**
+         * 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,
+            forceFresh: this.dev,
+            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 = 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);
+                }
+                return {
+                    status: resultStatus,
+                    headers: resultHeaders,
+                    data: JSON.stringify(resultData),
+                };
+            },
         });
-        return this.fetchOrigin(fetchUrl, {
-            cache: "no-cache",
-            replaceUrls: true,
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
-                ...this.extractRequestHeaders(req.headers),
+        return new Response(result.data, {
+            status: result.status,
+            headers: result.headers,
+        });
+    }
+    async fetchAppData() {
+        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;
+                }
+                if (result.queryMonitor) {
+                    this.debugLogQueryMonitor("app", "", result.queryMonitor);
+                }
+                result.__generated = new Date().toISOString();
+                return result;
             },
+            forceFresh: this.dev,
         });
+        return data;
     }
     extractRequestHeaders(req) {
         const headers = {};
@@ -90,19 +299,57 @@ export class ServerContext {
         return headers;
     }
     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 url = `/wp-json/ed/v1/query/${req.name.replace(/^\//, "")}?params=${encodeURIComponent(JSON.stringify(req.params))}`;
+        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();
+            }
+            if (resultData.queryMonitor) {
+                this.debugLogQueryMonitor("query", req.name, resultData.queryMonitor);
+            }
+            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,
+                forceFresh: this.dev,
+                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) {
-        const url = `/wp-json/ed/v1/mutation/${req.name}`;
+        const url = `/wp-json/ed/v1/mutation/${req.name.replace(/^\//, "")}`;
         return this.fetchOrigin(url, {
             method: "POST",
             cache: "no-cache",
@@ -115,4 +362,54 @@ export class ServerContext {
             body: JSON.stringify(req.body),
         });
     }
+    get allowedCorsOrigins() {
+        let result = [];
+        if (this.config.serverless.endpoints) {
+            result.push(...Object.keys(this.config.serverless.endpoints));
+            result.push(...Object.values(this.config.serverless.endpoints));
+            result = result.filter((origin) => origin !== "*");
+        }
+        if (this.config.serverless.cors?.origins) {
+            result.push(...this.config.serverless.cors.origins.map((origin) => origin.replace(/(https?:\/\/|\/$)/, "")));
+        }
+        return result;
+    }
+    getCorsOrigin(originHeader) {
+        const parsed = parseURL(originHeader);
+        if (this.allowedCorsOrigins.includes(parsed.host)) {
+            return originHeader;
+        }
+        if (this.allowedCorsOrigins.includes("*")) {
+            return "*";
+        }
+    }
+    getCorsHeaders(origin) {
+        if (!origin)
+            return {};
+        const allowedOrigin = this.getCorsOrigin(origin);
+        if (allowedOrigin) {
+            return {
+                "Access-Control-Allow-Methods": "OPTIONS,GET,HEAD,PUT,PATCH,POST,DELETE",
+                "Access-Control-Allow-Origin": allowedOrigin,
+                "Access-Control-Allow-Credentials": "true",
+                "Access-Control-Allow-Headers": "*",
+                "Access-Control-Expose-Headers": "*",
+            };
+        }
+        return {};
+    }
+}
+function indent(count, str) {
+    const indent = " ".repeat(count);
+    return str
+        .split("\n")
+        .map((line) => indent + line)
+        .join("\n");
+}
+function indentAllButFirst(count, str) {
+    const indent = " ".repeat(count);
+    return str
+        .split("\n")
+        .map((line, i) => (i === 0 ? line : indent + line))
+        .join("\n");
 }

package/dist/app/server/server-custom-config.d.ts

@@ -0,0 +1,3 @@
+export type ServerConfig = {};
+export declare function defineServerConfig(): void;
+//# sourceMappingURL=server-custom-config.d.ts.map

package/dist/app/server/server-custom-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-custom-config.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-custom-config.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,EAAE,CAAA;AAE7B,wBAAgB,kBAAkB,SAAK"}

package/dist/app/server/server-custom-config.js

@@ -0,0 +1 @@
+export function defineServerConfig() { }

package/dist/app/server/utils/content-security.d.ts

@@ -0,0 +1,26 @@
+import type { EDConfig } from "../../../node/project/config";
+import { RouteMetaTag, TrackerTags } from "../../lib/routing";
+declare const CSP_KEYS: readonly ["childSrc", "connectSrc", "defaultSrc", "fencedFrameSrc", "fontSrc", "frameSrc", "imgSrc", "manifestSrc", "mediaSrc", "objectSrc", "scriptSrc", "scriptSrcElem", "scriptSrcAttr", "styleSrc", "styleSrcElem", "styleSrcAttr", "workerSrc", "baseUri", "formAction", "frameAncestors", "reportTo", "requireTrustedTypesFor", "trustedTypes", "upgradeInsecureRequests"];
+export type CSPKey = (typeof CSP_KEYS)[number];
+export type CSPParams = Record<CSPKey, Set<string>>;
+export type ContentSecurityPolicyRequestContext = {
+    url: string;
+    type: "page";
+    tags: RouteMetaTag[];
+};
+export declare class SecureHeaderBuilder {
+    protected csp: CSPParams;
+    protected headers: Headers;
+    private cspEnabled;
+    private autodetectCspOrigins;
+    private useNonce;
+    private commonCspOrigins;
+    readonly nonce: string | undefined;
+    constructor(config: EDConfig);
+    addTrackingTags(tags: TrackerTags): TrackerTags;
+    addMetaTags(tags: RouteMetaTag[]): RouteMetaTag[];
+    getHeaders(): Headers;
+    getCSPHeaderValue(): string | undefined;
+}
+export {};
+//# sourceMappingURL=content-security.d.ts.map

package/dist/app/server/utils/content-security.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-security.d.ts","sourceRoot":"","sources":["../../../../src/app/server/utils/content-security.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG7D,QAAA,MAAM,QAAQ,kXAyBJ,CAAA;AAEV,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAA;AAE9C,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;AAEnD,MAAM,MAAM,mCAAmC,GAAG;IAChD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,YAAY,EAAE,CAAA;CACrB,CAAA;AAED,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,GAAG,EAAE,SAAS,CAAA;IACxB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAgB;IAE1C,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,oBAAoB,CAAO;IACnC,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,gBAAgB,CAAe;IAEvC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;gBAEtB,MAAM,EAAE,QAAQ;IAgC5B,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW;IAkB/C,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE;IAkBhC,UAAU,IAAI,OAAO;IAWrB,iBAAiB,IAAI,MAAM,GAAG,SAAS;CAexC"}

package/dist/app/server/utils/content-security.js

@@ -0,0 +1,124 @@
+import buildCsp from "content-security-policy-builder";
+const CSP_KEYS = [
+    "childSrc",
+    "connectSrc",
+    "defaultSrc",
+    "fencedFrameSrc",
+    "fontSrc",
+    "frameSrc",
+    "imgSrc",
+    "manifestSrc",
+    "mediaSrc",
+    "objectSrc",
+    "scriptSrc",
+    "scriptSrcElem",
+    "scriptSrcAttr",
+    "styleSrc",
+    "styleSrcElem",
+    "styleSrcAttr",
+    "workerSrc",
+    "baseUri",
+    "formAction",
+    "frameAncestors",
+    "reportTo",
+    "requireTrustedTypesFor",
+    "trustedTypes",
+    "upgradeInsecureRequests",
+];
+export class SecureHeaderBuilder {
+    csp;
+    headers = new Headers();
+    cspEnabled = false;
+    autodetectCspOrigins = true;
+    useNonce = false;
+    commonCspOrigins = [];
+    nonce;
+    constructor(config) {
+        this.cspEnabled = config.serverless.csp.enabled;
+        this.autodetectCspOrigins = config.serverless.csp.autoDetect;
+        this.useNonce = config.serverless.csp.nonce;
+        this.commonCspOrigins = config.serverless.csp.commonOrigins ?? [];
+        if (this.useNonce) {
+            this.nonce = crypto.randomUUID();
+        }
+        // Default CSP header parameters
+        this.csp = {};
+        for (let key of CSP_KEYS) {
+            const defaults = [];
+            if (key.match(/Src$/i)) {
+                defaults.push("'self'");
+                if (this.commonCspOrigins.length) {
+                    defaults.push(...this.commonCspOrigins);
+                }
+                if (config.serverless.csp.values) {
+                    const value = config.serverless.csp.values[key];
+                    if (value) {
+                        defaults.push(...value);
+                    }
+                }
+                if (this.useNonce && !defaults.includes("'unsafe-inline'")) {
+                    defaults.push(`'nonce-${this.nonce}'`);
+                }
+            }
+            this.csp[key] = new Set(defaults);
+        }
+    }
+    addTrackingTags(tags) {
+        if (!this.autodetectCspOrigins || !this.cspEnabled)
+            return tags;
+        const handle = (value) => {
+            if (value) {
+                return value.replaceAll(/<(script|style)/g, (tag) => {
+                    return tag + ` nonce="${this.nonce}"`;
+                });
+            }
+        };
+        return {
+            head: handle(tags.head),
+            body: handle(tags.body),
+            footer: handle(tags.footer),
+        };
+    }
+    addMetaTags(tags) {
+        if (!this.autodetectCspOrigins || !this.cspEnabled)
+            return tags;
+        return tags.map((tag) => {
+            if (this.nonce) {
+                if (tag.tagName === "script" || tag.tagName === "style") {
+                    return {
+                        ...tag,
+                        attributes: {
+                            ...tag.attributes,
+                            nonce: this.nonce,
+                        },
+                    };
+                }
+            }
+            return tag;
+        });
+    }
+    getHeaders() {
+        const result = new Headers(this.headers);
+        const cspHeaderValue = this.getCSPHeaderValue();
+        if (cspHeaderValue) {
+            result.set("Content-Security-Policy", cspHeaderValue);
+        }
+        return result;
+    }
+    getCSPHeaderValue() {
+        if (!this.cspEnabled)
+            return undefined;
+        const directives = [];
+        for (let key of CSP_KEYS) {
+            if (this.csp[key].size > 0) {
+                directives.push([key, Array.from(this.csp[key])]);
+            }
+        }
+        if (directives.length) {
+            return buildCsp({
+                directives: Object.fromEntries(directives),
+            });
+        }
+        return undefined;
+    }
+}

package/dist/app/server/utils/headers.d.ts

@@ -3,3 +3,4 @@ export declare const BRANDED_HEADERS: {
     "X-Powered-By": string;
 };
 export declare function extractHeaders(rawHeaders: Headers): Record<string, string>;
+//# sourceMappingURL=headers.d.ts.map

package/dist/app/server/utils/headers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../../src/app/server/utils/headers.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,WAOrE;AAED,eAAO,MAAM,eAAe;;CAE3B,CAAA;AAYD,wBAAgB,cAAc,CAAC,UAAU,EAAE,OAAO,0BAOjD"}

package/dist/app/server/utils/replace-host.d.ts

@@ -7,4 +7,5 @@ export type UrlReplacerConf = {
         replace: boolean;
     }[];
 };
-export declare function createUrlReplacer(conf: UrlReplacerConf): (text: string) => string;
+export declare function createUrlReplacer(conf: UrlReplacerConf): (text: string, newOrigin?: string) => string;
+//# sourceMappingURL=replace-host.d.ts.map

package/dist/app/server/utils/replace-host.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"replace-host.d.ts","sourceRoot":"","sources":["../../../../src/app/server/utils/replace-host.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;IACV,0FAA0F;IAC1F,QAAQ,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CACjD,CAAA;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,UAIvC,MAAM,cAAc,MAAM,YAiEzC"}

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

@@ -2,7 +2,7 @@ export function createUrlReplacer(conf) {
     // Create a regular expression to match the URL
     // Note that that the regex doesn't necessarily match the entire URL
     const lookup = new RegExp(conf.from.replace(/https?[:\\\/]+/, "https?[:\\/\\\\]+") + "([a-z0-9\\-_/\\\\]+)", "ig");
-    return (text) => {
+    return (text, newOrigin) => {
         return text.replace(lookup, (url) => {
             // Strip out the origin, to create a relative path
             const path = url.replace(/https?:[\/\\]+[^\/\\]+/, "");
@@ -18,10 +18,18 @@ export function createUrlReplacer(conf) {
                         return url;
                     }
                     else {
-                        return path;
+                        break;
                     }
                 }
             }
+            if (newOrigin) {
+                if (isEscaped) {
+                    return newOrigin.replace(/\//g, "\\/") + path;
+                }
+                else {
+                    return newOrigin + path;
+                }
+            }
             return path;
             // if (path.startsWith("/wp-content/uploads/")) {
             //   if (!conf.ignoreUploads) {

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

@@ -0,0 +1,5 @@
+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>;
+//# sourceMappingURL=swr-cache.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"swr-cache.d.ts","sourceRoot":"","sources":["../../../../src/app/server/utils/swr-cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,KAAK,EAAY,gBAAgB,EAAmB,MAAM,qBAAqB,CAAA;AAuB/G,eAAO,MAAM,SAAS,YAAgB,CAAA;AACtC,eAAO,MAAM,UAAU,YAAgB,CAAA;AAEvC,wBAAgB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,cAO/C"}