eddev 2.0.0-beta.12 → 2.0.0-beta.121

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,18 +28,41 @@ export function envPlugin(args) {
         return result;
     };
     return replace({
-        values: expandDefines(envDefines, ["process.env.", "process.", "env."]),
+        values: {
+            ...expandDefines(envDefines, ["process.env.", "process.", "env."]),
+        },
         preventAssignment: true,
     });
 }
-export function reactPlugin() {
+export function reactPlugin(args = {}) {
+    let currentFile = null;
     return react({
         babel: {
             overrides: [{ test: /types\./, compact: true }],
             plugins: [
                 {
                     visitor: {
-                        ExportNamedDeclaration: (path) => {
+                        Program: {
+                            enter: (path, state) => {
+                                const filename = state.file.opts.filename;
+                                if (filename.match(/.\/blocks\/.+\.tsx/)) {
+                                    currentFile = { type: "block", id: filename.replace(/.*\/blocks\/(.+)\.tsx/, "$1") };
+                                }
+                                else if (filename.match(/.\/views\/.+\.tsx/)) {
+                                    currentFile = { type: "view", id: filename.replace(/.*\/views\/(.+)\.tsx/, "$1") };
+                                }
+                                else {
+                                    currentFile = null;
+                                }
+                            },
+                            exit: (path, state) => {
+                                currentFile = null;
+                                // console.log("Exiting", state.file.opts.filename)
+                            },
+                        },
+                        ExportNamedDeclaration: (path, state) => {
+                            if (!currentFile)
+                                return;
                             const decl = path.node.declaration;
                             if (decl?.type !== "VariableDeclaration")
                                 return;
@@ -47,11 +70,20 @@ export function reactPlugin() {
                             if (!t.isIdentifier(id))
                                 return;
                             if (id.name === "meta") {
-                                path.remove();
+                                if (args.retainBlockMeta && currentFile?.type === "block") {
+                                    // Adds a defineBlock.meta("name", meta) call, which can be used by the editor
+                                    path.replaceWith(t.callExpression(t.memberExpression(t.identifier("defineBlock"), t.identifier("meta")), [
+                                        t.stringLiteral(currentFile.id),
+                                        decl.declarations[0].init,
+                                    ]));
+                                }
+                                else {
+                                    path.remove();
+                                }
                             }
                         },
                         ExportDefaultDeclaration: (path) => {
-                            if (!path.hub.file.opts.filename.match(/\/(blocks|views)\//))
+                            if (!currentFile)
                                 return;
                             if (path.node.declaration.type === "CallExpression") {
                                 const call = path.node.declaration;
@@ -66,7 +98,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 +121,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;
         },
     };
@@ -114,12 +176,15 @@ function buildStatusPlugin(console) {
 }
 export function corePlugins(args) {
     return [
-        tsconfigPaths(),
-        reactPlugin(),
-        args.mode === "development" && args.serverless && ssrPlugin(),
+        args.serverless && ssrPlugin(),
         envPlugin(args),
+        tsconfigPaths(),
+        reactPlugin({ retainBlockMeta: args.target === "cms" }),
     ].flat();
 }
+export function storybookVitePlugins(args) {
+    return [args.serverless && ssrPlugin(), envPlugin(args), tsconfigPaths()].flat();
+}
 export function getViteConfig(args) {
     const console = args.console;
     const logger = createLogger();
@@ -134,6 +199,7 @@ export function getViteConfig(args) {
     logger.clearScreen = () => {
         args.console.resetLog();
     };
+    const entryFile = `./.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`;
     /** Initial config */
     const config = {
         appType: "custom",
@@ -145,16 +211,30 @@ export function getViteConfig(args) {
         define: {
             "process.env.NODE_ENV": JSON.stringify(args.mode),
         },
-        plugins: [tsconfigPaths(), envPlugin(args), reactPlugin(), buildStatusPlugin(console)],
+        plugins: [
+            tsconfigPaths(),
+            envPlugin(args),
+            reactPlugin({
+                retainBlockMeta: args.target === "cms",
+            }),
+            buildStatusPlugin(console),
+        ],
         build: {
             manifest: true,
             sourcemap: true,
             minify: args.mode === "production",
             modulePreload: false,
             outDir: args.outDir,
-            watch: {},
+            lib: args.target === "cms"
+                ? {
+                    entry: [entryFile],
+                    fileName: (format, entryName) => `${entryName}.${format}.js`,
+                    name: "eddev",
+                    formats: ["iife"],
+                }
+                : undefined,
             rollupOptions: {
-                input: `/.eddev/${args.mode === "production" ? "prod" : "dev"}-spa/entry.${args.target === "cms" ? "admin" : "client"}.tsx`,
+                input: args.target === "frontend" ? entryFile : undefined,
                 external: args.target === "cms" ? ["react", "react-dom"] : [],
                 onwarn(warning, warn) {
                     if (!cliMode.verbose &&
@@ -169,8 +249,8 @@ export function getViteConfig(args) {
                 },
                 output: args.target === "cms"
                     ? {
-                        entryFileNames: "main.admin.js",
-                        format: "iife",
+                        // entryFileNames: "main.admin.js",
+                        // format: "iife",
                         globals: {
                             react: "window.React",
                             "react-dom": "window.ReactDOM",

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,
                     }),
                 ],
             },