eddev 2.0.0-beta.70 → 2.0.0-beta.72

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

@@ -5,7 +5,6 @@ import { ServerContext } from "./server-context.js";
 import { renderErrorPage } from "./render-ssr-page.js";
 export async function proxyWpAdmin(event) {
     const serverContext = ServerContext.main;
-    const replaceUrls = serverContext.replaceUrls;
     const req = getWebRequest(event);
     const reqUrl = getRequestURL(event);
     const serverlessConfig = serverContext.config.serverless;
@@ -46,8 +45,8 @@ export async function proxyWpAdmin(event) {
             cookies.push(...splitSetCookieString(value));
             return;
         }
-        if (key === "location" && replaceUrls) {
-            value = replaceUrls(value);
+        if (key === "location") {
+            value = serverContext.replaceUrls(value);
         }
         res.headers.set(key, value);
     });
@@ -61,9 +60,7 @@ export async function proxyWpAdmin(event) {
     // Replace URLs pointing to the origin server from the response itself
     // This is only done for text-based content types, like application/json, text/plain, text/html etc
     if (contentType?.match(/(application|text)\//)) {
-        if (replaceUrls) {
-            body = replaceUrls((await response.text()) ?? "");
-        }
+        body = serverContext.replaceUrls((await response.text()) ?? "", reqUrl.origin);
         // If the content type is text/html, inject the Vite assets into the response — assuming the placeholder comments are found
         if (contentType.startsWith("text/html")) {
             const clientManifest = serverContext.runtime.getManifest("admin");

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

@@ -7,6 +7,7 @@ export declare function getSsrStream(args: SSRArgs): Promise<ReadableStream<Uint
 type RenderArgs = {
     pathname: string;
     statusCode?: number;
+    newOrigin?: string;
 };
 export declare function renderPage(args: RenderArgs): Promise<Response>;
 type RenderErrorPageArgs = {

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

@@ -60,6 +60,7 @@ export async function renderPage(args) {
                 withAppData: false,
                 headers: {},
                 query: {},
+                newOrigin: args.newOrigin,
             }),
         ]);
         let data;

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

@@ -23,22 +23,25 @@ type ServerAppData = {
 export declare class ServerContext {
     dev: boolean;
     origin: string;
-    replaceUrls?: (text: string) => string;
+    _urlReplacer?: (text: string, origin?: string) => string;
     rpcBases: string[];
     config: EDConfig;
     static main: ServerContext;
     constructor(conf: ServerContextArgs);
+    replaceUrls(text: string, origin?: string): string;
     get runtime(): ServerContextRuntime;
     static setRuntime(rt: ServerContextRuntime): void;
     getOriginUrl(url: string): string;
     fetchOrigin(url: string, opts?: RequestInit & {
         replaceUrls?: boolean;
+        newOrigin?: string;
     }): Promise<Response>;
     fetchRouteData(req: {
         pathname: string;
         query?: Record<string, any>;
         headers?: RequestHeaders;
         withAppData?: boolean;
+        newOrigin?: string;
     }): Promise<Response>;
     fetchAppData(): Promise<ServerAppData>;
     extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("vinxi/http").HTTPHeaderName, string | undefined>>;

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

@@ -17,7 +17,7 @@ let runtime;
 export class ServerContext {
     dev;
     origin;
-    replaceUrls;
+    _urlReplacer;
     rpcBases = [];
     config;
     static main;
@@ -27,10 +27,16 @@ export class ServerContext {
         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;
     }
@@ -66,8 +72,8 @@ export class ServerContext {
         });
         // console.log("Returning headers", headers)
         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,
@@ -86,6 +92,7 @@ export class ServerContext {
         const result = await this.fetchOrigin(fetchUrl, {
             cache: "no-cache",
             replaceUrls: true,
+            newOrigin: req.newOrigin,
             headers: {
                 "Content-Type": "application/json",
                 Accept: "application/json",
@@ -112,7 +119,6 @@ export class ServerContext {
         return result;
     }
     async fetchAppData() {
-        // console.log("Fetching app data")
         const response = await this.fetchOrigin("/_appdata", {
             cache: "no-cache",
             replaceUrls: true,
@@ -121,9 +127,7 @@ export class ServerContext {
                 Accept: "application/json",
             },
         });
-        // console.log("Decoding app data")
         const result = await response.json();
-        // console.log("Done with app done")
         return result;
     }
     extractRequestHeaders(req) {

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

@@ -7,4 +7,4 @@ 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;

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,19 @@ export function createUrlReplacer(conf) {
                         return url;
                     }
                     else {
-                        return path;
+                        break;
                     }
                 }
             }
+            console.log("Replacing", url, "with", newOrigin);
+            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,7 @@
+import { Cache } from "@epic-web/cachified";
+export declare function swr<T>(args: {
+    key: string;
+    fetcher: () => Promise<T>;
+    ttl?: number;
+    cache?: Cache;
+}): Promise<T>;

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

@@ -0,0 +1,29 @@
+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);
+    },
+};
+export function swr(args) {
+    return cachified({
+        key: args.key,
+        cache: args.cache ?? lru,
+        getFreshValue: args.fetcher,
+        ttl: args.ttl,
+        swr: 3600_000,
+        fallbackToCache: 15_000,
+    });
+}

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

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

package/dist/node/cli/version.js

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

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

@@ -33,6 +33,20 @@ export function createVinxiApp(args) {
                         varies: [],
                     },
                 },
+                "/robots.txt": {
+                    proxy: joinURL(args.origin, "robots.txt"),
+                    static: true,
+                    cache: {
+                        maxAge: 3600,
+                        varies: [],
+                    },
+                },
+                "/sitemap*.xml": {
+                    cache: {
+                        maxAge: 3600,
+                        swr: true,
+                    },
+                },
                 "/wp-content/plugins/**": {
                     proxy: joinURL(args.origin, "wp-content/plugins/**"),
                     headers: {
@@ -116,8 +130,7 @@ export function createVinxiApp(args) {
                 handler: `${folder}/handler.wp-proxy.ts`,
                 target: "server",
                 plugins: () => [
-                    tsconfigPaths(),
-                    envPlugin({
+                    ...corePlugins({
                         rootDir: args.rootDir,
                         console: log,
                         mode: args.mode,

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

@@ -20,7 +20,7 @@ export function createVinxiCodegen(opts) {
             name: "context.ts",
             generate: async () => {
                 const args = {
-                    dev: true,
+                    dev: opts.mode === "development",
                     origin: project.origin,
                     replaceUrls: {
                         from: project.origin,
@@ -181,7 +181,7 @@ export function createVinxiCodegen(opts) {
             name: "handler.data-api.ts",
             generate: code /* tsx */ `
         /// <reference types="vinxi/types/server" />
-        import { createRouter, eventHandler, getRouterParam, getQuery, getWebRequest, getRequestHeaders } from "vinxi/http"
+        import { createRouter, eventHandler, getRouterParam, getQuery, getWebRequest, getRequestHeaders, getRequestURL } from "vinxi/http"
         import { serverContext } from "./context.js"
 
         const router = createRouter()
@@ -189,10 +189,12 @@ export function createVinxiCodegen(opts) {
             "/route/",
             eventHandler(async (event) => {
               const id = "/"
+              const url = getRequestURL(event);
 
               return await serverContext.fetchRouteData({
                 pathname: id,
                 withAppData: false,
+                newOrigin: url.origin,
               })
             }),
           )
@@ -200,10 +202,12 @@ export function createVinxiCodegen(opts) {
             "/route/**:name",
             eventHandler(async (event) => {
               const id = "/" + getRouterParam(event, "name")
+              const url = getRequestURL(event);
 
               return await serverContext.fetchRouteData({
                 pathname: id,
                 withAppData: false,
+                newOrigin: url.origin,
               })
             }),
           )
@@ -268,7 +272,7 @@ export function createVinxiCodegen(opts) {
               return proxyWpAdmin(event)
             }
 
-            return renderPage({ pathname: url.pathname })
+            return renderPage({ pathname: url.pathname, newOrigin: url.origin })
           }
         })
     `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "2.0.0-beta.70",
+  "version": "2.0.0-beta.72",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -77,6 +77,7 @@
   "dependencies": {
     "@babel/types": "^7.25.2",
     "@clack/prompts": "^0.7.0",
+    "@epic-web/cachified": "^5.2.0",
     "@graphql-codegen/core": "^4.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",
@@ -105,6 +106,7 @@
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
     "listhen": "^1.6.0",
+    "lru-cache": "^11.0.2",
     "mkcert": "^3.2.0",
     "obj-console": "^1.0.2",
     "object-code": "^1.3.3",