eddev 2.0.0-beta.11 → 2.0.0-beta.111

package/dist/node/compiler/bundler.frontend.js

@@ -10,7 +10,6 @@ export class FrontendBundler {
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
-        this.start();
     }
     async start() {
         console.info(`Creating ${this.opts.mode} SPA build...`);
@@ -22,6 +21,7 @@ export class FrontendBundler {
             outDir: relative(this.project.rootDir, "./dist/frontend/"),
             serverless: false,
             target: "frontend",
+            client: true,
         });
         console.verbose("Vite config:", baseConfig);
         await build(mergeConfig(baseConfig, defineConfig({

package/dist/node/compiler/dev-server.js

@@ -25,18 +25,22 @@ export class DevServer {
     }
     async start() {
         console.setWorking(true);
+        // console.log("Setting up vinxi codegen")
         const codegen = createVinxiCodegen({
             mode: "development",
             project: this.project,
             serverless: true,
         });
         await codegen.runAndWatch();
+        // console.log("Has run once")
         const app = createVinxiApp({
             mode: "development",
             origin: this.origin,
             publicUrl: this.project.publicUrl,
             rootDir: this.project.rootDir,
             log: console,
+            rpcBases: (await this.project.serverRoutes.get()).bases,
+            config: this.project.config,
         });
         const preset = process.env.TARGET ??
             process.env.PRESET ??
@@ -45,7 +49,9 @@ export class DevServer {
             process.env.NITRO_PRESET ??
             process.env.NITRO_TARGET ??
             (process.versions.bun !== undefined ? "bun" : "node-server");
+        // console.log("Ensuring self signed cert")
         const keys = await ensureSelfSignedCert(this.hostname, this.project.rootDir);
+        // console.log("Done")
         const httpsConfig = {
             cert: keys.certFile,
             key: keys.keyFile,
@@ -61,6 +67,7 @@ export class DevServer {
                 devApp = args.devApp;
             },
         });
+        // console.log("Creating dev server")
         await createDevServer(app, {
             force: false,
             devtools: false,
@@ -71,11 +78,13 @@ export class DevServer {
             preset: preset,
             https: httpsConfig,
         });
+        // console.log("Rnning listen hook")
         // @ts-ignore
         await app.hooks.callHook("app:dev:server:listener:creating", {
             app,
             devApp,
         });
+        // console.log("Creating another listener")
         const listener = await devApp.listen(this.port, {
             hostname: this.hostname,
             port: this.port,
@@ -88,6 +97,7 @@ export class DevServer {
             devApp,
             listener,
         });
+        // console.log("Listening")
         console.setWorking(false);
         console.setState({
             serverlessUrl: this.hostOrigin,

package/dist/node/compiler/get-vite-config.d.ts

@@ -8,6 +8,7 @@ export type Args = {
     outDir?: string;
     publicUrl: string;
     console: StatefulLog<any>;
+    client: boolean;
 };
 export declare function envPlugin(args: Args): PluginOption;
 export declare function reactPlugin(): PluginOption[];
@@ -16,4 +17,5 @@ export declare function reactPlugin(): PluginOption[];
  */
 export declare function ssrPlugin(): PluginOption;
 export declare function corePlugins(args: Args): PluginOption[];
+export declare function storybookVitePlugins(args: Args): PluginOption[];
 export declare function getViteConfig(args: Args): InlineConfig;

package/dist/node/compiler/get-vite-config.js

@@ -8,14 +8,14 @@ import tsconfigPaths from "vite-tsconfig-paths";
 import { cliMode } from "../cli/cli-mode.js";
 export function envPlugin(args) {
     const envDefines = {
-        client: args.serverless ? "!import.meta.env.SSR" : "true",
+        client: args.client ? "true" : "false",
         serverless: args.serverless ? "true" : "false",
         dev: args.mode === "development" ? "true" : "false",
         admin: args.target === "cms" ? "true" : "false",
         themePath: JSON.stringify(args.publicUrl),
         devUI: args.mode === "development" ? "true" : "false",
         serverlessOrigin: JSON.stringify("http://serverleress-endpoint"),
-        rpcEnabled: "false",
+        rpcEnabled: "true",
         origin: JSON.stringify(process.env.SITE_URL ?? "/"),
     };
     const expandDefines = (obj, prefixes = []) => {
@@ -28,7 +28,9 @@ export function envPlugin(args) {
         return result;
     };
     return replace({
-        values: expandDefines(envDefines, ["process.env.", "process.", "env."]),
+        values: {
+            ...expandDefines(envDefines, ["process.env.", "process.", "env."]),
+        },
         preventAssignment: true,
     });
 }
@@ -66,7 +68,11 @@ export function reactPlugin() {
                                         if (t.isExpression(body)) {
                                             body = t.blockStatement([t.returnStatement(body)]);
                                         }
-                                        path.replaceWith(t.exportDefaultDeclaration(t.functionDeclaration(t.identifier(pascalCase(type + "-" + name)), args[1].params, body, args[1].generator, args[1].async)));
+                                        const componentName = pascalCase(type) + "_" + name.replace(/[^a-z0-9]/g, "_").replace(/_+/g, "_");
+                                        path.replaceWithMultiple([
+                                            t.exportDefaultDeclaration(t.functionDeclaration(t.identifier(componentName), args[1].params, body, args[1].generator, args[1].async)),
+                                            t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier(componentName), t.identifier("displayName")), t.stringLiteral(pascalCase(type) + "(" + name + ")"))),
+                                        ]);
                                     }
                                 }
                             }
@@ -85,8 +91,34 @@ export function ssrPlugin() {
         name: "proxy-external-ssr-modules",
         config(config) {
             config.legacy = {
+                ...config.legacy,
                 proxySsrExternalModules: true,
             };
+            config.ssr = {
+                ...config.ssr,
+                noExternal: [
+                    "eddev",
+                    "vinxi",
+                    "react-use",
+                    // @ts-ignore
+                    ...(config?.optimizeDeps?.noExternal ?? []),
+                ],
+                optimizeDeps: {
+                    exclude: ["eddev", "vinxi"],
+                },
+            };
+            config.optimizeDeps = {
+                ...config.optimizeDeps,
+                include: [
+                    "valtio",
+                    "@tanstack/react-query",
+                    "qs",
+                    "react",
+                    "react-dom/client",
+                    ...(config?.optimizeDeps?.include ?? []),
+                ],
+                exclude: ["eddev", "vinxi", ...(config?.optimizeDeps?.exclude ?? [])],
+            };
             return config;
         },
     };
@@ -113,12 +145,10 @@ function buildStatusPlugin(console) {
     };
 }
 export function corePlugins(args) {
-    return [
-        tsconfigPaths(),
-        reactPlugin(),
-        args.mode === "development" && args.serverless && ssrPlugin(),
-        envPlugin(args),
-    ].flat();
+    return [args.serverless && ssrPlugin(), envPlugin(args), tsconfigPaths(), reactPlugin()].flat();
+}
+export function storybookVitePlugins(args) {
+    return [args.serverless && ssrPlugin(), envPlugin(args), tsconfigPaths()].flat();
 }
 export function getViteConfig(args) {
     const console = args.console;
@@ -152,9 +182,9 @@ export function getViteConfig(args) {
             minify: args.mode === "production",
             modulePreload: false,
             outDir: args.outDir,
-            watch: {},
+            // watch: {},
             rollupOptions: {
-                input: `/.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
+                input: `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
                 external: args.target === "cms" ? ["react", "react-dom"] : [],
                 onwarn(warning, warn) {
                     if (!cliMode.verbose &&

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

@@ -1,4 +1,5 @@
 import { StatefulLog } from "../utils/stateful-log.js";
+import { EDConfig } from "../project/config.js";
 export type AppArgs = {
     mode: "development" | "production";
     publicUrl: string;
@@ -6,5 +7,16 @@ export type AppArgs = {
     origin: string;
     log?: StatefulLog<any>;
     preset?: string;
+    routes?: CustomRoute[];
+    rpcBases?: string[];
+    config: EDConfig;
+};
+type HTTPMethod = "GET" | "POST" | "PUT" | "OPTIONS" | "HEAD";
+type CustomRouteFunction = (req: Request) => Response;
+type CustomRouteModule = Record<HTTPMethod, CustomRouteFunction>;
+type CustomRoute = {
+    pattern: string;
+    handler: () => Promise<CustomRouteModule>;
 };
 export declare function createVinxiApp(args: AppArgs): import("vinxi").App;
+export {};

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

@@ -18,53 +18,140 @@ export function createVinxiApp(args) {
             // },
             preset: args.preset,
             routeRules: {
+                "/wp-content/uploads/**": {
+                    proxy: joinURL(args.origin, "wp-content/uploads/**"),
+                    static: true,
+                    cache: {
+                        maxAge: 86400,
+                        varies: [],
+                    },
+                },
+                "/favicon.ico": {
+                    proxy: joinURL(args.origin, "favicon.ico"),
+                    static: true,
+                    cache: {
+                        maxAge: 3600,
+                        varies: [],
+                    },
+                },
+                "/robots.txt": {
+                    cache: {
+                        maxAge: 3600,
+                        varies: [],
+                    },
+                },
+                "/sitemap.xml": {
+                    cache: {
+                        maxAge: 3600,
+                        swr: true,
+                    },
+                },
+                "/sitemap*.xml": {
+                    cache: {
+                        maxAge: 3600,
+                        swr: true,
+                    },
+                },
+                "/wp-content/plugins/**": {
+                    proxy: joinURL(args.origin, "wp-content/plugins/**"),
+                    headers: {
+                        "Cache-Control": "max-age=86400",
+                        "CDN-Cache-Control": "max-age=86400",
+                        "Vercel-CDN-Cache-Control": "max-age=86400",
+                    },
+                },
                 "/wp-content/**": { proxy: joinURL(args.origin, "wp-content/**") },
                 "/wp-includes/**": { proxy: joinURL(args.origin, "wp-includes/**") },
+                "/_data/route/**": {
+                    isr: 300,
+                    swr: true,
+                    cache: {
+                        maxAge: 300,
+                        swr: true,
+                        varies: ["Authorization", "woocommerce-session"],
+                    },
+                },
+                "/_data/query/**": {
+                    isr: false,
+                    cache: {
+                        maxAge: 300,
+                        varies: ["Authorization", "woocommerce-session"],
+                    },
+                },
+                ...args.rpcBases?.reduce((acc, base) => {
+                    return {
+                        ...acc,
+                        ["/" + base.replace(/(^\/|\/$)/g, "") + "/**/*"]: {
+                            isr: false,
+                            swr: false,
+                        },
+                    };
+                }, {}),
+                "/**/*": {
+                    isr: 300,
+                    swr: true,
+                    cache: {
+                        maxAge: 300,
+                        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",
-                type: "http",
-                base: "/_data/",
-                handler: `${folder}/handler.data-api.ts`,
-                target: "server",
-                plugins: () => [
-                    tsconfigPaths(),
-                    envPlugin({
-                        rootDir: args.rootDir,
-                        console: log,
-                        mode: "development",
-                        publicUrl: args.publicUrl,
-                        serverless: true,
-                        target: "frontend",
-                    }),
-                ],
-            },
-            {
-                name: "wp-proxy",
+                name: "bypass-api",
                 type: "http",
-                base: "/wp-",
-                handler: `${folder}/handler.wp-proxy.ts`,
+                base: "/_bypass",
+                handler: `${folder}/handler.bypass.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",
@@ -74,10 +161,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",
@@ -91,28 +179,47 @@ 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",
                 handler: `${folder}/handler.ssr-page.ts`,
                 target: "server",
                 plugins: () => [
-                    // reactRefresh(),
                     ...corePlugins({
                         rootDir: args.rootDir,
                         console: log,
-                        mode: "development",
+                        mode: args.mode,
                         publicUrl: args.publicUrl,
                         serverless: true,
                         target: "frontend",
+                        client: false,
                     }),
                 ],
             },