eddev 2.0.0-beta.6 → 2.0.0-beta.61

package/dist/node/cli/cli.js

@@ -4,8 +4,9 @@ import { setDefaultResultOrder } from "dns";
 import { config as importDotEnv } from "dotenv";
 import { AdminBundler, adminLog } from "../compiler/bundler.admin.js";
 import { FrontendBundler, frontendLog } from "../compiler/bundler.frontend.js";
-import { ServerlessDevServer, serverlessLog } from "../compiler/serverless.dev.js";
-import { graphqlLog } from "../graphql/graphql-codegen.js";
+import { DevServer, serverlessLog } from "../compiler/dev-server.js";
+import { createVinxiCodegen } from "../compiler/vinxi-codegen.js";
+import { GraphQLGenerator, graphqlLog } from "../graphql/graphql-codegen.js";
 import { BuildInfoWriter } from "../project/eddev-build-file.js";
 import { Project, projectLog } from "../project/project.js";
 import { describeBlockManifest } from "../types/block-type.js";
@@ -14,6 +15,9 @@ import { configureCliMode } from "./cli-mode.js";
 import { CLIWorker } from "./cli-worker.js";
 import { bootCLIUI } from "./display/boot-cli-app.js";
 import { VERSION } from "./version.js";
+import { buildVinxi } from "../compiler/build-vinxi.js";
+import { createConsole } from "../utils/stateful-log.js";
+import { join } from "path";
 importDotEnv();
 const program = new Command()
     .version(VERSION)
@@ -24,13 +28,18 @@ const init = (verbose) => {
 };
 program
     .command("dev")
-    .description("Build in dev mode")
-    .option("-s, --serverless", 'Build in "serverless" mode', false)
-    .option("-m, --mode <mode>", 'Defaults to all modes, but use "frontend", "admin" or "graphql" to run in just one mode', undefined)
+    .description("Run in dev mode")
+    .option("-m, --mode <mode>", "Comma separated list of modes, or a single mode.", "frontend,admin,graphql,serverless")
+    .option("--fast", "Shorthand for --mode graphql,serverless", false)
     .option("--verbose", "Show extra debugging info", false)
     .action(async (options) => {
-    process.env.NODE_ENV = "development";
+    process.env["NODE_ENV"] = "development";
+    /** Ignore self-signed certificate errors in dev mode */
+    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
     serverlessLog.info(chalk.yellowBright(`⚡️ ED. Stack v${VERSION}`));
+    if (options.fast) {
+        options.mode = "graphql,serverless";
+    }
     const tasks = {
         admin: !options.mode || options.mode.includes("admin"),
         frontend: !options.mode || options.mode.includes("frontend"),
@@ -66,6 +75,15 @@ program
     const infoWriter = new BuildInfoWriter(project);
     infoWriter.watch();
     infoWriter.write();
+    if (tasks.admin || tasks.frontend) {
+        const spaStaging = createVinxiCodegen({
+            mode: "development",
+            project,
+            serverless: false,
+            endpoint: "",
+        });
+        spaStaging.runAndWatch();
+    }
     // Boot up admin in a worker
     if (tasks.admin) {
         new CLIWorker({
@@ -88,6 +106,9 @@ program
             serverlessLog.log(...args);
         };
         console.error = (...args) => {
+            // We ignore SSL errors in dev mode.
+            if (typeof args[0] === "string" && args[0].includes("NODE_TLS_REJECT_UNAUTHORIZED"))
+                return;
             serverlessLog.error(...args);
         };
         console.warn = (...args) => {
@@ -96,7 +117,14 @@ program
         console.info = (...args) => {
             serverlessLog.info(...args);
         };
-        new ServerlessDevServer(project, {
+        const serverlessStaging = createVinxiCodegen({
+            mode: "development",
+            project,
+            serverless: true,
+            endpoint: "",
+        });
+        await serverlessStaging.runAndWatch();
+        new DevServer(project, {
             mode: "development",
         });
     }
@@ -115,6 +143,9 @@ program
     .option("-s, --serverless", 'Build in "serverless" mode', false)
     .option("--verbose", "Show extra debugging info", false)
     .action(async (options) => {
+    process.env["NODE_ENV"] = "production";
+    /** Ignore self-signed certificate errors in dev mode */
+    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
     init(options.verbose);
     configureCliMode({
         interactive: false,
@@ -125,17 +156,64 @@ program
         watch: false,
         rootDir: process.cwd(),
     });
+    const console = createConsole("build");
     // Load the project info
     const project = await Project.create({
         rootDir: process.cwd(),
     });
-    // Load the compiler
-    new AdminBundler(project, {
-        mode: "development",
-    });
-    new FrontendBundler(project, {
-        mode: "production",
+    const buildServerless = options.serverless || process.env.VERCEL;
+    if (buildServerless) {
+        await buildVinxi({
+            project,
+            console,
+        });
+    }
+    else {
+        // Generate bootstrap files
+        const codegen = createVinxiCodegen({
+            mode: "production",
+            project: project,
+            serverless: false,
+        });
+        await codegen.run();
+        console.info("Building for SPA WordPress (Frontend and Admin)");
+        // Load the compiler
+        const admin = new AdminBundler(project, {
+            mode: "production",
+        });
+        const frontend = new FrontendBundler(project, {
+            mode: "production",
+        });
+        const graphql = new GraphQLGenerator(project, {
+            optimize: true,
+        });
+        await Promise.all([admin.start(), frontend.start(), graphql.start()]);
+        console.log("Done building SPA WordPress");
+    }
+});
+program
+    .command("preview")
+    .description("Run a local production build, which was previously built with `eddev build --serverless`")
+    .option("--host", "Hostname to serve the application", "127.0.0.1")
+    .option("--port", "Port to serve the application", "3000")
+    .action(async (options) => {
+    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
+    process.env["NODE_ENV"] = "production";
+    process.env["HOST"] = options.host;
+    process.env["PORT"] = options.port;
+    init(options.verbose);
+    configureCliMode({
+        interactive: true,
+        readonly: false,
+        exitOnValidationError: true,
+        detailed: true,
+        verbose: options.verbose,
+        watch: false,
+        rootDir: process.cwd(),
     });
+    const entry = ".output/server/index.mjs";
+    console.info("Looking for production serverless build in: " + entry + "...");
+    await import(join(process.cwd(), ".output/server/index.mjs"));
 });
 program
     .command("info")

package/dist/node/cli/display/CLIApp.d.ts

@@ -2,7 +2,7 @@ import type { graphqlLog } from "../../graphql/graphql-codegen.js";
 import type { Project, projectLog } from "../../project/project.js";
 import type { adminLog } from "../../compiler/bundler.admin.js";
 import type { frontendLog } from "../../compiler/bundler.frontend.js";
-import { serverlessLog } from "../../compiler/serverless.dev.js";
+import { serverlessLog } from "../../compiler/dev-server.js";
 export type CLIDisplayProps = {
     getProject: () => Project;
     logs: {

package/dist/node/cli/display/CLIApp.js

@@ -5,7 +5,7 @@ import { VERSION } from "../version.js";
 import { LogEntries, LogItem } from "./components/LogEntries.js";
 import { useStatefulLogs } from "./hooks/useStatefulLog.js";
 import { statusColor, statusIcon } from "./util/colors.js";
-import { serverlessLog } from "../../compiler/serverless.dev.js";
+import { serverlessLog } from "../../compiler/dev-server.js";
 import { useEffect, useState } from "react";
 import TextInput from "./components/TextInput.js";
 import { findTools } from "./tools/cli-tools.js";
@@ -37,7 +37,7 @@ export function CLIApp(props) {
                 process.stdout.write("\u001b[3J\u001b[1J");
                 console.clear();
                 props.logs.serverless?.resetLog();
-                redraw();
+                setImmediate(redraw);
             }
             else if (input === "q") {
                 process.exit(0);
@@ -83,17 +83,14 @@ function MainMenu(props) {
         else if (key.return) {
             const match = matches[focusIndex];
             if (match) {
-                props.onSelect(match.tool.id);
+                // props.onSelect(match.tool.id)
             }
         }
     });
     return (_jsx(Panel, { label: "Main Menu", icon: "\u25C8", color: "yellow", info: "[ESC] to close", children: _jsxs(Box, { width: "100%", flexDirection: "column", paddingX: 1, paddingY: 0, children: [_jsxs(Box, { gap: 1, flexDirection: "row", children: [_jsx(Text, { color: "whiteBright", children: "What would you like to do?" }), _jsx(Text, { color: "gray", children: "[ESC] to close" })] }), _jsxs(Box, { paddingBottom: 1, children: [_jsx(Text, { color: "white", children: "> " }), _jsx(TextInput, { value: search, onChange: (value) => {
                                 setSearch(value);
                                 setFocusIndex(0);
-                            }, showCursor: true, focus: true, placeholder: "Search..." })] }), matches.length === 0 ? _jsx(Text, { color: "redBright", children: "😓 No results" }) : null, matches.map((item, index) => {
-                    const focused = focusIndex === index;
-                    return (_jsxs(Box, { children: [_jsx(Box, { width: 3, children: _jsx(Text, { children: focused ? "👉" : "" }) }), _jsxs(Box, { children: [_jsx(Text, { color: focused ? "yellow" : "white", children: item.tool.name }), _jsx(Text, { children: String(item.score) })] })] }, item.tool.id));
-                })] }) }));
+                            }, showCursor: true, focus: true, placeholder: "Search..." })] }), matches.length === 0 ? _jsx(Text, { color: "redBright", children: "😓 No results" }) : null] }) }));
 }
 function MiniLog({ log, border }) {
     const color = statusColor(log.status);

package/dist/node/cli/display/components/LogEntries.d.ts

@@ -1,4 +1,4 @@
-import type { LogEntry, LogGroup, LogGroupOrEntry } from "../../../utils/statefulLog.js";
+import type { LogEntry, LogGroup, LogGroupOrEntry } from "../../../utils/stateful-log.js";
 export declare function LogEntries(props: {
     entries: LogGroupOrEntry[];
 }): import("react/jsx-runtime").JSX.Element;

package/dist/node/cli/display/hooks/useStatefulLog.d.ts

@@ -1,4 +1,4 @@
-import { StatefulLog } from "../../../utils/statefulLog.js";
+import { StatefulLog } from "../../../utils/stateful-log.js";
 export type LogInfo<T extends StatefulLog<any> | undefined> = {
     label: string;
     value: Exclude<T, undefined>["state"];

package/dist/node/cli/display/tools/CreateBlock.d.ts

@@ -1,2 +1,2 @@
-import { ToolProps } from "./cli-tools";
+import { ToolProps } from "./cli-tools.js";
 export declare function CreateBlock(props: ToolProps): import("react/jsx-runtime").JSX.Element;

package/dist/node/cli/display/tools/cli-tools.d.ts

@@ -12,15 +12,5 @@ export type ToolInfo = {
     keywords?: string[];
     component: FunctionComponent<ToolProps>;
 };
-export declare function findTools(term: string): {
-    tool: {
-        id: string;
-        type: ToolType;
-        keywords?: string[] | undefined;
-        name: string;
-        component: FunctionComponent<ToolProps>;
-    };
-    score: number;
-    matches: import("@nozbe/microfuzz").FuzzyMatches;
-}[];
+export declare function findTools(term: string): ToolInfo[];
 export {};

package/dist/node/cli/display/tools/cli-tools.js

@@ -1,15 +1,15 @@
-import microfuzz from "@nozbe/microfuzz";
 import { TOOLS } from "./cli-tool-list.js";
 const toolList = Object.entries(TOOLS).map(([key, value]) => ({ ...value, id: key }));
 // https://github.com/Nozbe/microfuzz/issues/1
 // @ts-ignore
-const fuzzy = (typeof microfuzz === "function" ? microfuzz : microfuzz.default);
-const fuzzyIndex = fuzzy(toolList, {
-    getText: (tool) => [tool.name, ...(tool.keywords ? tool.keywords : [])],
-});
+// const fuzzy = (typeof microfuzz === "function" ? microfuzz : microfuzz.default) as typeof microfuzz
+// const fuzzyIndex = fuzzy(toolList, {
+//   getText: (tool) => [tool.name, ...(tool.keywords ? tool.keywords : [])],
+// })
 export function findTools(term) {
-    if (!term) {
-        return toolList.map((tool) => ({ tool, score: 1, matches: [] }));
-    }
-    return fuzzyIndex(term).map((result) => ({ tool: result.item, score: result.score, matches: result.matches }));
+    return [];
+    // if (!term) {
+    //   return toolList.map((tool) => ({ tool, score: 1, matches: [] }))
+    // }
+    // return fuzzyIndex(term).map((result) => ({ tool: result.item, score: result.score, matches: result.matches }))
 }

package/dist/node/cli/display/util/colors.d.ts

@@ -1,4 +1,4 @@
-import { LogStatus } from "../../../utils/statefulLog.js";
-export declare function statusColor(status: LogStatus): "greenBright" | "redBright" | "blueBright" | "whiteBright" | "#FF890C" | "#0C86FF" | "grayBright";
+import { LogStatus } from "../../../utils/stateful-log.js";
+export declare function statusColor(status: LogStatus): "greenBright" | "redBright" | "#FF890C" | "blueBright" | "#0C86FF" | "grayBright" | "whiteBright";
 export declare function statusIcon(status: LogStatus): "✖" | "✔" | "⚠" | "ℹ" | "⚙" | "v" | "?" | "➜";
 export declare function statusLabel(status: LogStatus): "Error" | "Warning" | "Info" | "Working" | "Fail" | "Success" | "Verbose" | "Help" | "Log";

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

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.6";
+export declare const VERSION = "2.0.0-beta.61";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.6";
+export const VERSION = "2.0.0-beta.61";

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

@@ -0,0 +1,8 @@
+import { Project } from "../project/project.js";
+import { StatefulLog } from "../utils/stateful-log.js";
+type Options = {
+    project: Project;
+    console: StatefulLog<any>;
+};
+export declare function buildVinxi(opts: Options): Promise<void>;
+export {};

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

@@ -0,0 +1,38 @@
+import { code } from "ts-poet";
+import { createVinxiApp } from "./vinxi-app.js";
+import { createVinxiCodegen } from "./vinxi-codegen.js";
+export async function buildVinxi(opts) {
+    const { project, console } = opts;
+    const preset = process.env.TARGET ??
+        process.env.PRESET ??
+        process.env.SERVER_PRESET ??
+        process.env.SERVER_TARGET ??
+        process.env.NITRO_PRESET ??
+        process.env.NITRO_TARGET ??
+        (process.env.VERCEL ? "vercel" : undefined) ??
+        (process.versions.bun !== undefined ? "bun" : "node-server");
+    const appConf = {
+        mode: "production",
+        origin: project.origin,
+        publicUrl: project.publicUrl,
+        rootDir: project.rootDir,
+        rpcBases: (await project.serverRoutes.get()).bases,
+        // log: console,
+        preset,
+    };
+    const codegen = createVinxiCodegen({
+        mode: "production",
+        project: project,
+        serverless: true,
+    });
+    codegen.registerFile({
+        name: "../../app.config.mjs",
+        generate: code /* ts */ `
+      import { createVinxiApp } from 'eddev/_internal/create-vinxi-app.js'
+      export default createVinxiApp(${JSON.stringify(appConf)})
+    `,
+    });
+    await codegen.runAndWatch();
+    const app = createVinxiApp(appConf);
+    await app.build();
+}

package/dist/node/compiler/bundler.admin.d.ts

@@ -1,5 +1,5 @@
 import { Project } from "../project/project.js";
-export declare const adminLog: import("../utils/statefulLog.js").StatefulLog<unknown>;
+export declare const adminLog: import("../utils/stateful-log.js").StatefulLog<unknown>;
 type Options = {
     mode: "development" | "production";
     watch?: boolean;
@@ -8,6 +8,6 @@ export declare class AdminBundler {
     project: Project;
     opts: Options;
     constructor(project: Project, opts: Options);
-    protected start(): Promise<void>;
+    start(): Promise<void>;
 }
 export {};

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

@@ -1,7 +1,7 @@
 import { relative } from "path";
 import { build, defineConfig, mergeConfig } from "vite";
-import { createConsole } from "../utils/statefulLog.js";
-import { getViteConfig } from "./vite/get-vite-config.js";
+import { createConsole } from "../utils/stateful-log.js";
+import { getViteConfig } from "./get-vite-config.js";
 const console = createConsole("Admin Bundle", "admin");
 export const adminLog = console;
 export class AdminBundler {
@@ -10,14 +10,13 @@ export class AdminBundler {
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
-        this.start();
     }
     async start() {
         console.info(`Creating ${this.opts.mode} WordPress admin build...`);
         const baseConfig = getViteConfig({
             console,
             mode: this.opts.mode,
-            project: this.project,
+            publicUrl: this.project.publicUrl,
             rootDir: this.project.rootDir,
             outDir: relative(this.project.rootDir, "./dist/cms/"),
             serverless: false,

package/dist/node/compiler/bundler.frontend.d.ts

@@ -1,5 +1,5 @@
 import { Project } from "../project/project.js";
-export declare const frontendLog: import("../utils/statefulLog.js").StatefulLog<unknown>;
+export declare const frontendLog: import("../utils/stateful-log.js").StatefulLog<unknown>;
 type Options = {
     mode: "development" | "production";
     watch?: boolean;

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

@@ -1,7 +1,7 @@
 import { relative } from "path";
 import { build, defineConfig, mergeConfig } from "vite";
-import { createConsole } from "../utils/statefulLog.js";
-import { getViteConfig } from "./vite/get-vite-config.js";
+import { createConsole } from "../utils/stateful-log.js";
+import { getViteConfig } from "./get-vite-config.js";
 const console = createConsole("Frontend Bundler", "spa");
 export const frontendLog = console;
 export class FrontendBundler {
@@ -10,14 +10,13 @@ export class FrontendBundler {
     constructor(project, opts) {
         this.project = project;
         this.opts = opts;
-        this.start();
     }
     async start() {
         console.info(`Creating ${this.opts.mode} SPA build...`);
         const baseConfig = getViteConfig({
             console,
             mode: this.opts.mode,
-            project: this.project,
+            publicUrl: this.project.publicUrl,
             rootDir: this.project.rootDir,
             outDir: relative(this.project.rootDir, "./dist/frontend/"),
             serverless: false,

package/dist/node/compiler/{serverless.dev.d.ts → dev-server.d.ts}

@@ -3,13 +3,15 @@ export type ServerlessDevStatus = {
     serverlessUrl: string;
     wordpressUrl: string;
 };
-export declare const serverlessLog: import("../utils/statefulLog.js").StatefulLog<ServerlessDevStatus>;
-type Options = {
-    mode: "development" | "production";
-};
-export declare class ServerlessDevServer {
+export declare const serverlessLog: import("../utils/stateful-log.js").StatefulLog<ServerlessDevStatus>;
+type Options = {};
+export declare class DevServer {
     project: Project;
     opts: Options;
+    origin: string;
+    hostname: string;
+    hostOrigin: string;
+    port: number;
     constructor(project: Project, opts: Options);
     start(): Promise<void>;
 }

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

@@ -0,0 +1,106 @@
+import { parseURL } from "ufo";
+import { createDevServer } from "vinxi/dev-server";
+import { ProjectEnvUtils } from "../project/env.js";
+import { ensureSelfSignedCert } from "../utils/self-signed-cert.js";
+import { createConsole } from "../utils/stateful-log.js";
+import { createVinxiApp } from "./vinxi-app.js";
+import { createVinxiCodegen } from "./vinxi-codegen.js";
+const console = createConsole("Dev Server", "dev");
+export const serverlessLog = console;
+export class DevServer {
+    project;
+    opts;
+    origin;
+    hostname;
+    hostOrigin;
+    port = 8080;
+    constructor(project, opts) {
+        this.project = project;
+        this.opts = opts;
+        this.start();
+        this.origin = ProjectEnvUtils.get("SITE_URL");
+        const parsedSiteURL = parseURL(this.origin);
+        this.hostname = parsedSiteURL.host?.endsWith(".local") ? parsedSiteURL.host : "localhost";
+        this.hostOrigin = "https://" + this.hostname + ":" + this.port;
+    }
+    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,
+        });
+        const preset = process.env.TARGET ??
+            process.env.PRESET ??
+            process.env.SERVER_PRESET ??
+            process.env.SERVER_TARGET ??
+            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,
+            domains: [this.hostname, "localhost"],
+        };
+        let devApp = null;
+        app.hooks.addHooks({
+            "app:dev:start": async ({ app, serveConfig }) => {
+                serveConfig.https = httpsConfig;
+                serveConfig.hostname = this.hostname;
+            },
+            "app:dev:server:created": async (args) => {
+                devApp = args.devApp;
+            },
+        });
+        // console.log("Creating dev server")
+        await createDevServer(app, {
+            force: false,
+            devtools: false,
+            // @ts-ignore
+            hostname: this.hostname,
+            port: this.port,
+            // @ts-ignore
+            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,
+            https: httpsConfig,
+            qr: false,
+            showURL: false,
+        });
+        await app.hooks.callHook("app:dev:server:listener:created", {
+            app,
+            devApp,
+            listener,
+        });
+        // console.log("Listening")
+        console.setWorking(false);
+        console.setState({
+            serverlessUrl: this.hostOrigin,
+            wordpressUrl: this.origin,
+        });
+    }
+}

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

@@ -0,0 +1,19 @@
+import { InlineConfig, PluginOption } from "vite";
+import { StatefulLog } from "../utils/stateful-log.js";
+export type Args = {
+    mode: "development" | "production";
+    serverless: boolean;
+    target: "frontend" | "cms";
+    rootDir: string;
+    outDir?: string;
+    publicUrl: string;
+    console: StatefulLog<any>;
+};
+export declare function envPlugin(args: Args): PluginOption;
+export declare function reactPlugin(): PluginOption[];
+/**
+ * Turns on SSR module proxying,
+ */
+export declare function ssrPlugin(): PluginOption;
+export declare function corePlugins(args: Args): PluginOption[];
+export declare function getViteConfig(args: Args): InlineConfig;