eddev 2.0.0-beta.2 → 2.0.0-beta.200

package/dist/node/compiler/serverless.dev.js

@@ -1,215 +0,0 @@
-import { getRequestListener } from "@hono/node-server";
-import express from "express";
-import expressProxy from "express-http-proxy";
-import { Agent as HttpAgent } from "http";
-import { Agent as HttpsAgent } from "https";
-import { listen } from "listhen";
-import fetch from "node-fetch";
-import { relative } from "path";
-import { parseURL } from "ufo";
-import { createServer as createViteServer, defineConfig, mergeConfig } from "vite";
-import { ProjectEnvUtils } from "../project/env.js";
-import { ensureSelfSignedCert } from "../utils/selfSignedCert.js";
-import { createConsole } from "../utils/statefulLog.js";
-import indexHtml from "./index.html.js";
-import { getViteConfig } from "./vite/get-vite-config.js";
-const console = createConsole("Dev Server", "dev");
-export const serverlessLog = console;
-export class ServerlessDevServer {
-    project;
-    opts;
-    constructor(project, opts) {
-        this.project = project;
-        this.opts = opts;
-        this.start();
-    }
-    async start() {
-        console.setWorking(true);
-        const siteURL = ProjectEnvUtils.get("SITE_URL");
-        const parsedSiteURL = parseURL(siteURL);
-        let serverlessPort = 8080;
-        let hmrPort = serverlessPort + 5;
-        const serverlessHost = parsedSiteURL.host?.endsWith(".local") ? parsedSiteURL.host : "localhost";
-        console.info(`Starting dev server...`);
-        const keys = await ensureSelfSignedCert(serverlessHost, this.project.rootDir);
-        const app = express();
-        const hotServer = await listen(() => { }, {
-            port: hmrPort,
-            hostname: serverlessHost,
-            qr: false,
-            showURL: false,
-            https: {
-                cert: keys.certFile,
-                key: keys.keyFile,
-                domains: [serverlessHost],
-            },
-        });
-        hmrPort = hotServer.address.port;
-        const mainServer = await listen(app, {
-            port: serverlessPort,
-            hostname: serverlessHost,
-            qr: false,
-            showURL: false,
-            https: {
-                cert: keys.certFile,
-                key: keys.keyFile,
-                domains: [serverlessHost],
-            },
-        });
-        const vite = await createViteServer(mergeConfig(getViteConfig({
-            console,
-            mode: this.opts.mode,
-            project: this.project,
-            rootDir: this.project.rootDir,
-            outDir: relative(this.project.rootDir, "./dist/ssr/"),
-            serverless: true,
-            target: "frontend",
-        }), defineConfig({
-            mode: "development",
-            base: "/",
-            server: {
-                middlewareMode: true,
-                hmr: {
-                    server: hotServer.server,
-                    port: hmrPort,
-                    path: "/_hmr",
-                },
-            },
-            build: {
-                ssr: true,
-                sourcemap: true,
-                watch: {
-                    clearScreen: true,
-                },
-                rollupOptions: {
-                    onwarn(warning, warn) {
-                        if (warning.code === "SOURCEMAP_ERROR") {
-                            return;
-                        }
-                        warn(warning);
-                    },
-                },
-            },
-            appType: "custom",
-        })));
-        vite.watcher.on("change", (file) => {
-            console.resetLog();
-        });
-        console.setWorking(false);
-        const proxyTarget = "https://" + serverlessHost + ":" + serverlessPort + "/";
-        const proxyDest = parsedSiteURL.protocol + "//" + parsedSiteURL.host + "/";
-        console.info("Proxying WordPress from", proxyDest);
-        const replaceTargetString = proxyDest.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\/");
-        const replaceTargetEscapedString = proxyDest.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\\\/");
-        const replaceTarget = new RegExp(replaceTargetString, "g");
-        const replaceTargetEscaped = new RegExp(replaceTargetEscapedString, "g");
-        const replaceHost = (value) => {
-            return value.replace(replaceTarget, proxyTarget).replace(replaceTargetEscaped, proxyTarget.replaceAll("/", "\\/"));
-        };
-        const proxy = expressProxy(parsedSiteURL.protocol + "//" + parsedSiteURL.host, {
-            proxyReqOptDecorator: function (proxyReqOpts, originalReq) {
-                // @ts-ignore
-                proxyReqOpts.rejectUnauthorized = false;
-                // @ts-ignore
-                proxyReqOpts.headers["X-ED-Dev-Proxy"] = "true";
-                return proxyReqOpts;
-            },
-            userResHeaderDecorator(headers, userReq, userRes, proxyReq, proxyRes) {
-                for (let [key, value] of Object.entries(headers)) {
-                    if (typeof value === "string") {
-                        headers[key] = replaceHost(value);
-                    }
-                    else if (Array.isArray(value)) {
-                        headers[key] = value.map((v) => {
-                            return replaceHost(v);
-                        });
-                    }
-                }
-                return headers;
-            },
-            userResDecorator(proxyRes, proxyResData, userReq, userRes) {
-                if (userReq.path.includes(".php") || !userReq.path.includes(".") || userReq.path.startsWith("/wp-json")) {
-                    proxyResData = replaceHost(proxyResData.toString("utf8"));
-                }
-                return proxyResData;
-            },
-        });
-        app.use(async (req, res, next) => {
-            if (!req.originalUrl.includes(".php") && !req.originalUrl.includes("/?")) {
-                vite.middlewares.handle(req, res, next);
-            }
-            else {
-                next();
-            }
-        });
-        /**
-         * Allow https access from self-signed certificates, when working locally during development
-         */
-        const httpsAgent = new HttpsAgent({
-            rejectUnauthorized: false,
-        });
-        const httpAgent = new HttpAgent({});
-        const fetchImpl = (...args) => {
-            return fetch(args[0], {
-                ...(args[1] ?? {}),
-                agent: function (_parsedURL) {
-                    if (_parsedURL.protocol == "http:") {
-                        return httpAgent;
-                    }
-                    else {
-                        return httpsAgent;
-                    }
-                },
-            });
-        };
-        app.use(async (req, res, next) => {
-            if (!req.path.startsWith("/api"))
-                return next();
-            const { getHonoAPI, patchConsole } = await vite.ssrLoadModule("/_ssr.js", {
-                fixStacktrace: true,
-            });
-            patchConsole(console);
-            const hono = getHonoAPI({
-                fetchImpl,
-                replaceUrls: {
-                    from: proxyDest,
-                    to: "/",
-                },
-            });
-            const handler = getRequestListener(hono.fetch, {
-                errorHandler: (err) => {
-                    console.error(err);
-                },
-            });
-            await handler(req, res);
-        });
-        app.use(async (req, res, next) => {
-            const url = req.originalUrl;
-            if (url.includes(".") || url.startsWith("/wp-") || url.startsWith("/graphql"))
-                return next();
-            const { patchConsole, setFetchImpl, getHonoSSR, setIndexTransformer } = await vite.ssrLoadModule("/_ssr.js", {
-                fixStacktrace: true,
-            });
-            patchConsole(console);
-            const hono = getHonoSSR({
-                fetchImpl,
-                indexTransformer: async (index) => await vite.transformIndexHtml(url, indexHtml),
-                replaceUrls: {
-                    from: proxyDest,
-                    to: "/",
-                },
-            });
-            const handler = getRequestListener(hono.fetch, {
-                errorHandler: (err) => {
-                    console.error(err);
-                },
-            });
-            await handler(req, res);
-        });
-        app.use(proxy);
-        console.setState({
-            serverlessUrl: "https://" + serverlessHost + ":" + mainServer.address.port + "/",
-            wordpressUrl: proxyDest,
-        });
-    }
-}

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

@@ -1,13 +0,0 @@
-import { InlineConfig } from "vite";
-import { Project } from "../../project/project.js";
-import { StatefulLog } from "../../utils/statefulLog.js";
-export type Args = {
-    mode: "development" | "production";
-    serverless: boolean;
-    target: "frontend" | "cms";
-    rootDir: string;
-    outDir: string;
-    project: Project;
-    console: StatefulLog<any>;
-};
-export declare function getViteConfig(args: Args): InlineConfig;

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

@@ -1,315 +0,0 @@
-import * as t from "@babel/types";
-import replace from "@rollup/plugin-replace";
-import react from "@vitejs/plugin-react";
-import { pascalCase } from "change-case-all";
-import { join } from "path";
-import { withoutTrailingSlash } from "ufo";
-import { createLogger } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
-import { cliMode } from "../../cli/cli-mode.js";
-import { pluginAdminManifest } from "./plugin-admin.js";
-import { pluginBlocks } from "./plugin-blocks.js";
-import { pluginEntryFile } from "./plugin-entry.js";
-import { pluginResolvedTailwind } from "./plugin-resolved-tailwind.js";
-import { pluginThemeManifest } from "./plugin-theme.js";
-import { pluginViews } from "./plugin-views.js";
-export function getViteConfig(args) {
-    const console = args.console;
-    const logger = createLogger();
-    logger.info = (msg) => args.console.info(msg.replace(/\n/, ""));
-    logger.warn = (msg) => {
-        if (typeof msg === "string" && msg.includes("Error when using sourcemap for reporting"))
-            return;
-        return args.console.warn(msg.replace(/\n/, ""));
-    };
-    logger.error = (msg) => args.console.fail(msg.replace(/\n/, ""));
-    logger.warnOnce = (msg) => args.console.warn(msg.replace(/\n/, ""));
-    logger.clearScreen = () => {
-        args.console.resetLog();
-    };
-    const envDefines = {
-        client: args.serverless ? "!import.meta.env.SSR" : "true",
-        serverless: args.serverless ? "true" : "false",
-        dev: args.mode === "development" ? "true" : "false",
-        admin: args.mode === "development" && args.serverless
-            ? `(typeof __wp_admin !== "undefined")`
-            : args.target === "cms"
-                ? "true"
-                : "false",
-        themePath: JSON.stringify(args.project.publicUrl),
-        devUI: args.mode === "development" ? "true" : "false",
-        serverlessOrigin: JSON.stringify("http://serverleress-endpoint"),
-        rpcEnabled: "false",
-        origin: JSON.stringify(process.env.SITE_URL ?? "/"),
-    };
-    const expandDefines = (obj, prefixes = []) => {
-        const result = {};
-        for (const prefix of prefixes) {
-            for (const [key, value] of Object.entries(obj)) {
-                result[prefix + key] = value;
-            }
-        }
-        return result;
-    };
-    /** Initial config */
-    const config = {
-        appType: "custom",
-        mode: args.mode,
-        root: args.rootDir,
-        customLogger: logger,
-        logLevel: cliMode.verbose ? "info" : "warn",
-        base: withoutTrailingSlash(args.project.publicUrl) + "/dist/" + args.target,
-        define: {
-            "process.env.NODE_ENV": JSON.stringify(args.mode),
-            // ssrLoadModule: "() => Promise.resolve({})",
-        },
-        // optimizeDeps: {
-        //   force: true,
-        //   holdUntilCrawlEnd: true,
-        //   include: ["zustand"],
-        //   noDiscovery: true,
-        //   exclude: ["react-external.js", "react-dom-external.js", "react", "react-dom"],
-        //   esbuildOptions: {},
-        // },
-        resolve: {
-            alias: [
-                { find: "@manifest/blocks", replacement: join(args.project.rootDir, "__block-manifest.js") },
-                { find: "@manifest/views", replacement: join(args.project.rootDir, "__view-manifest.js") },
-                { find: "@manifest/theme", replacement: join(args.project.rootDir, "__theme-manifest.js") },
-                { find: "@manifest/admin", replacement: join(args.project.rootDir, "__admin-manifest.js") },
-                { find: "@manifest/tailwind", replacement: join(args.project.rootDir, "__resolved-tailwind.js") },
-            ],
-        },
-        legacy: {
-            proxySsrExternalModules: true,
-        },
-        plugins: [
-            tsconfigPaths(),
-            // pluginShimReact(args),
-            react({
-                babel: {
-                    overrides: [{ test: /types\./, compact: true }],
-                    plugins: [
-                        {
-                            visitor: {
-                                // TODO: Move this to a separate file
-                                // TODO: Attach the title to the block component, so we can use it for debugging
-                                ExportNamedDeclaration: (path) => {
-                                    const decl = path.node.declaration;
-                                    if (decl?.type !== "VariableDeclaration")
-                                        return;
-                                    const id = decl.declarations[0].id;
-                                    if (!t.isIdentifier(id))
-                                        return;
-                                    if (id.name === "meta") {
-                                        path.remove();
-                                    }
-                                },
-                                ExportDefaultDeclaration: (path) => {
-                                    if (path.node.declaration.type === "CallExpression") {
-                                        const call = path.node.declaration;
-                                        if (call.callee.type === "Identifier" && ["defineBlock", "defineView"].includes(call.callee.name)) {
-                                            const type = call.callee.name.replace("define", "");
-                                            const args = call.arguments;
-                                            if (args.length === 2 &&
-                                                args[0].type === "StringLiteral" &&
-                                                args[1].type === "ArrowFunctionExpression") {
-                                                const name = args[0].value;
-                                                let body = args[1].body;
-                                                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)));
-                                            }
-                                        }
-                                    }
-                                },
-                            },
-                        },
-                    ],
-                },
-            }),
-            replace({
-                values: expandDefines(envDefines, ["process.env.", "process.", "env."]),
-                preventAssignment: true,
-            }),
-            // SPA Frontend, to be served by WordPress
-            args.target === "frontend" &&
-                !args.serverless &&
-                pluginEntryFile({
-                    code: `
-            import boot from 'eddev/_internal/_entry/main.frontend.spa.js'
-            import "./views/index.css"
-            boot()
-          `,
-                    id: "eddev-bootup",
-                    path: "/_boot.js",
-                }),
-            // SPA Admin bundle, to be served by WordPress admin
-            args.target === "cms" &&
-                !args.serverless &&
-                pluginEntryFile({
-                    code: `
-            import boot from 'eddev/_internal/_entry/main.admin.js'
-            import "./views/index.css"
-            boot()
-          `,
-                    id: "eddev-bootup",
-                    path: "/_boot.js",
-                }),
-            // Frontend + Admin, used during development
-            args.serverless &&
-                pluginEntryFile({
-                    code: `
-            import boot from 'eddev/_internal/_entry/main.serverless.dev.js'
-            import "./views/index.css"
-            boot()
-          `,
-                    id: "eddev-bootup",
-                    path: "/_boot.js",
-                }),
-            args.serverless &&
-                pluginEntryFile({
-                    code: `
-          import React from 'react'
-          import ReactDOM from 'react-dom/client'
-          Object.assign(React, window.React)
-          Object.assign(ReactDOM, window.ReactDOM)
-        `,
-                    id: "eddev-test-shim",
-                    path: "/_boot_test_shim.js",
-                }),
-            // Frontend + Admin, used during development
-            args.serverless &&
-                pluginEntryFile({
-                    code: `
-          import '/_boot_test_shim.js'
-          import boot from 'eddev/_internal/_entry/main.serverless.dev.js'
-          import "./views/index.css"
-          boot()
-        `,
-                    id: "eddev-bootup-serverless-admin",
-                    path: "/_boot_admin.js",
-                }),
-            // SSR Bundle, used for rendering on the server
-            args.serverless &&
-                pluginEntryFile({
-                    code: `
-            export * from 'eddev/_internal/_entry/main.frontend.ssr.js'
-            import "./views/index.css"
-          `,
-                    id: "eddev-ssr",
-                    path: "/_ssr.js",
-                }),
-            // args.serverless && {
-            //   name: "eddev:serverless",
-            //   (chunk) {
-            //     console.log("Chunk", chunk)
-            //     return ""
-            //   },
-            // },
-            pluginResolvedTailwind(args.project, args.console, args.serverless),
-            pluginBlocks(args.project, args.console, args.serverless),
-            pluginViews(args.project, args.console, args.serverless),
-            pluginThemeManifest(args.project, args.console),
-            pluginAdminManifest(args.project, args.console),
-            !args.serverless && buildStatus(console),
-            // args.serverless
-            //   ? pluginEntryFile({
-            //       code: indexHtml,
-            //       id: "index.html",
-            //       path: join(args.rootDir, "index.html"),
-            //     })
-            //   : null,
-        ],
-        build: args.target === "cms"
-            ? {
-                manifest: true,
-                sourcemap: true,
-                modulePreload: false,
-                minify: args.mode === "production",
-                outDir: args.outDir,
-                watch: {},
-                rollupOptions: {
-                    input: "/_boot.js",
-                    external: ["react", "react-dom"],
-                    onwarn(warning, warn) {
-                        if (warning.code === "SOURCEMAP_ERROR") {
-                            return;
-                        }
-                        warn(warning);
-                    },
-                    output: {
-                        entryFileNames: "main.admin.js",
-                        format: "iife",
-                        globals: {
-                            react: "window.React",
-                            "react-dom": "window.ReactDOM",
-                        },
-                    },
-                },
-            }
-            : args.serverless
-                ? {
-                    rollupOptions: {
-                        input: "/_boot.js",
-                        external: ["react", "react-dom"],
-                        onwarn(warning, warn) {
-                            if (warning.code === "SOURCEMAP_ERROR") {
-                                return;
-                            }
-                            warn(warning);
-                        },
-                        output: args.mode === "production"
-                            ? {
-                                entryFileNames: "main.admin.js",
-                                format: "iife",
-                                globals: {
-                                    react: "window.React",
-                                    "react-dom": "window.ReactDOM",
-                                },
-                            }
-                            : undefined,
-                    },
-                }
-                : {
-                    manifest: true,
-                    sourcemap: true,
-                    minify: args.mode === "production",
-                    modulePreload: false,
-                    outDir: args.outDir,
-                    watch: {},
-                    rollupOptions: {
-                        input: "/_boot.js",
-                        onwarn(warning, warn) {
-                            if (warning.code === "SOURCEMAP_ERROR") {
-                                return;
-                            }
-                            warn(warning);
-                        },
-                    },
-                },
-    };
-    return config;
-}
-function buildStatus(console) {
-    let timer = 0;
-    return {
-        name: "eddev:logging",
-        enforce: "post",
-        watchChange() {
-            console.resetLog();
-            clearTimeout(timer);
-        },
-        buildStart() {
-            clearTimeout(timer);
-            console.setWorking(true);
-        },
-        buildEnd() {
-            clearTimeout(timer);
-            timer = setTimeout(() => {
-                console.setWorking(false);
-            }, 0);
-        },
-    };
-}

package/dist/node/compiler/vite/plugin-admin.d.ts

@@ -1,4 +0,0 @@
-import { Plugin } from "vite";
-import { Project } from "../../project/project.js";
-import { StatefulLog } from "../../utils/statefulLog.js";
-export declare function pluginAdminManifest(project: Project, console: StatefulLog<any>): Plugin;

package/dist/node/compiler/vite/plugin-admin.js

@@ -1,67 +0,0 @@
-import { join } from "path";
-export function pluginAdminManifest(project, console) {
-    const virtualId = "\0virtual:admin-manifest.js";
-    let server = null;
-    const fakePath = join(project.rootDir, "__admin-manifest.js");
-    let lastHash = "";
-    project.views.subscribeFuture(async (manifest) => {
-        if (server) {
-            const hash = Object.keys(manifest.views).join("");
-            const virtualModule = server.moduleGraph.getModuleById(virtualId);
-            if (virtualModule && hash !== lastHash && lastHash !== "") {
-                server.moduleGraph.invalidateModule(virtualModule);
-            }
-            lastHash = hash;
-        }
-    });
-    return {
-        name: "eddev:adminManifest",
-        resolveId(id) {
-            if (id === fakePath) {
-                return virtualId;
-            }
-        },
-        async load(id) {
-            if (id === virtualId) {
-                const fieldManifest = await project.fields.get();
-                const widgetManifest = await project.widgets.get();
-                return `
-          import { adminManifestReader } from 'eddev/_internal'
-          import editorConfig from './blocks/_editor'
-
-          const fields = {${Object.entries(fieldManifest.fields)
-                    .map(([name, field]) => {
-                    const importStatement = `() => import(${JSON.stringify("./" + field.fileName)}).then(m => m.default)`;
-                    return JSON.stringify(field.slug) + ": " + importStatement;
-                })
-                    .join(",\n")}}
-          const widgets = {${Object.entries(widgetManifest.widgets)
-                    .map(([name, widget]) => {
-                    const importStatement = `() => import(${JSON.stringify("./" + widget.fileName)}).then(m => m.default)`;
-                    return JSON.stringify(widget.slug) + ": " + importStatement;
-                })
-                    .join(",\n")}}
-
-          const manifest = {
-            fields,
-            widgets,
-            editorConfig
-          }
-
-          adminManifestReader.set(manifest)
-          
-          export default manifest
-
-          export { editorConfig }
-
-          if (import.meta.hot) {
-            import.meta.hot.accept()
-          }
-        `;
-            }
-        },
-        configureServer(_server) {
-            server = _server;
-        },
-    };
-}

package/dist/node/compiler/vite/plugin-blocks.d.ts

@@ -1,4 +0,0 @@
-import { Plugin } from "vite";
-import { Project } from "../../project/project.js";
-import { StatefulLog } from "../../utils/statefulLog.js";
-export declare function pluginBlocks(project: Project, console: StatefulLog<any>, ssr: boolean): Plugin;