eddev 2.0.0-beta.24 → 2.0.0-beta.241

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

@@ -4,6 +4,7 @@ import tsconfigPaths from "vite-tsconfig-paths";
 import { StatefulLog } from "../utils/stateful-log.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/" +
@@ -11,19 +12,45 @@ export function createVinxiApp(args) {
             mode: args.mode,
             serverless: true,
         });
+    const cacheConfig = getCacheConfig(args.origin, args.config);
     return createApp({
         server: {
             // experimental: {
             //   websocket: true,
             // },
+            compatibilityDate: "2025-05-21",
             preset: args.preset,
             routeRules: {
                 "/wp-content/uploads/**": {
                     proxy: joinURL(args.origin, "wp-content/uploads/**"),
-                    headers: {
-                        "Cache-Control": "max-age=86400",
-                        "CDN-Cache-Control": "max-age=86400",
-                        "Vercel-CDN-Cache-Control": "max-age=86400",
+                    static: true,
+                    cache: {
+                        maxAge: 86400,
+                        varies: [],
+                    },
+                },
+                "/favicon.ico": {
+                    proxy: joinURL(args.origin, "favicon.ico"),
+                    static: true,
+                    cache: {
+                        maxAge: 86400,
+                        varies: [],
+                    },
+                },
+                "/robots.txt": {
+                    cache: {
+                        maxAge: 3600,
+                        varies: [],
+                    },
+                },
+                "/sitemap.xml": {
+                    cache: {
+                        maxAge: 3600,
+                    },
+                },
+                "/sitemap*.xml": {
+                    cache: {
+                        maxAge: 3600,
                     },
                 },
                 "/wp-content/plugins/**": {
@@ -36,54 +63,106 @@ export function createVinxiApp(args) {
                 },
                 "/wp-content/**": { proxy: joinURL(args.origin, "wp-content/**") },
                 "/wp-includes/**": { proxy: joinURL(args.origin, "wp-includes/**") },
-                "/*": {
-                    isr: 300,
+                "/_data/route/**": {
+                    isr: {
+                        expiration: cacheConfig.pageDataTTL ?? 0,
+                        allowQuery: [],
+                        group: 1,
+                        passQuery: false,
+                    },
+                    cache: {
+                        varies: ["Authorization", "woocommerce-session"],
+                    },
+                },
+                "/_data/query/**": {
+                    isr: {
+                        expiration: cacheConfig.queryHooksTTL ?? 0,
+                        allowQuery: [],
+                        group: 1,
+                        passQuery: false,
+                    },
+                    cache: {
+                        varies: ["Authorization", "woocommerce-session"],
+                    },
+                },
+                ...args.rpcBases?.reduce((acc, base) => {
+                    return {
+                        ...acc,
+                        ["/" + base.replace(/(^\/|\/$)/g, "") + "/**/*"]: {
+                            isr: false,
+                            // swr: false,
+                        },
+                    };
+                }, {}),
+                "/**/*": {
+                    isr: {
+                        expiration: cacheConfig.pageDataTTL ?? 0,
+                        allowQuery: [],
+                        group: 1,
+                        passQuery: false,
+                    },
+                    cache: {
+                        maxAge: cacheConfig.pageDataTTL ?? 0,
+                        // swr: true,
+                        staleMaxAge: 3600,
+                    },
+                },
+            },
+            vercel: {
+                config: {
+                    bypassToken: process.env.VERCEL_BYPASS_TOKEN,
                 },
             },
         },
         routers: [
+            ...args.config.serverless.themeAssets.map((folder) => {
+                const folderName = folder
+                    .split("/")
+                    .filter((p) => !p.includes("*") && p !== ".")
+                    .join("/");
+                return {
+                    name: "public_" + folderName,
+                    type: "static",
+                    dir: args.rootDir + "/" + folderName,
+                    base: joinURL(args.publicUrl, folderName),
+                };
+            }),
             {
-                name: "public",
-                type: "static",
-                dir: "./assets",
-                base: joinURL(args.publicUrl, "assets"),
-            },
-            {
-                name: "data-api",
+                name: "bypass-api",
                 type: "http",
-                base: "/_data/",
-                handler: `${folder}/handler.data-api.ts`,
+                base: "/_bypass",
+                handler: `${folder}/handler.bypass.ts`,
                 target: "server",
                 plugins: () => [
                     tsconfigPaths(),
                     envPlugin({
                         rootDir: args.rootDir,
                         console: log,
-                        mode: "development",
-                        publicUrl: args.publicUrl,
-                        serverless: true,
-                        target: "frontend",
-                    }),
-                ],
-            },
-            {
-                name: "wp-proxy",
-                type: "http",
-                base: "/wp-",
-                handler: `${folder}/handler.wp-proxy.ts`,
-                target: "server",
-                plugins: () => [
-                    tsconfigPaths(),
-                    envPlugin({
-                        rootDir: args.rootDir,
-                        console: log,
-                        mode: "development",
+                        mode: args.mode,
                         publicUrl: args.publicUrl,
                         serverless: true,
                         target: "frontend",
+                        client: false,
                     }),
                 ],
             },
+            // {
+            //   name: "wp-proxy",
+            //   type: "http",
+            //   base: "/wp-",
+            //   handler: `${folder}/handler.wp-proxy.ts`,
+            //   target: "server",
+            //   plugins: () => [
+            //     ...corePlugins({
+            //       rootDir: args.rootDir,
+            //       console: log,
+            //       mode: args.mode,
+            //       publicUrl: args.publicUrl,
+            //       serverless: true,
+            //       target: "frontend",
+            //     }),
+            //   ],
+            // },
             {
                 name: "client",
                 type: "client",
@@ -93,10 +172,11 @@ export function createVinxiApp(args) {
                     ...corePlugins({
                         rootDir: args.rootDir,
                         console: log,
-                        mode: "development",
+                        mode: args.mode,
                         publicUrl: args.publicUrl,
                         serverless: true,
                         target: "frontend",
+                        client: true,
                     }),
                 ],
                 base: "/_build",
@@ -110,14 +190,33 @@ export function createVinxiApp(args) {
                     ...corePlugins({
                         rootDir: args.rootDir,
                         console: log,
-                        mode: "development",
+                        mode: args.mode,
                         publicUrl: args.publicUrl,
                         serverless: true,
                         target: "cms",
+                        client: true,
                     }),
                 ],
                 base: "/_admin",
             },
+            // ...((args.rpcBases ?? []).map((base) => ({
+            //   name: "trpc" + base.replace(/^\//, "-"),
+            //   type: "http",
+            //   base: "/" + base.replace(/^\//, ""),
+            //   handler: `${folder}/handler.trpc-api.ts`,
+            //   target: "server",
+            //   plugins: () => [
+            //     tsconfigPaths(),
+            //     envPlugin({
+            //       rootDir: args.rootDir,
+            //       console: log,
+            //       mode: args.mode,
+            //       publicUrl: args.publicUrl,
+            //       serverless: true,
+            //       target: "frontend",
+            //     }),
+            //   ],
+            // })) as RouterSchemaInput[]),
             {
                 name: "ssr",
                 type: "http",
@@ -127,10 +226,11 @@ export function createVinxiApp(args) {
                     ...corePlugins({
                         rootDir: args.rootDir,
                         console: log,
-                        mode: "development",
+                        mode: args.mode,
                         publicUrl: args.publicUrl,
                         serverless: true,
                         target: "frontend",
+                        client: false,
                     }),
                 ],
             },

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

@@ -10,3 +10,4 @@ export declare function getVinxiFolder(opts: Pick<Options, "mode" | "serverless"
 export declare function runVinxiCodegen(opts: Options): Promise<void>;
 export declare function createVinxiCodegen(opts: Options): FSCodegen;
 export {};
+//# sourceMappingURL=vinxi-codegen.d.ts.map

package/dist/node/compiler/vinxi-codegen.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vinxi-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/compiler/vinxi-codegen.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAGlD,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAExE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,iBAIlD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,aA0sB/C"}