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

package/dist/app/utils/query-client.js

@@ -1,4 +1,5 @@
-import { QueryClient } from "@tanstack/react-query";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
 let queryClient = null;
 export function getQueryClient() {
     if (!queryClient) {
@@ -14,3 +15,6 @@ export function getQueryClient() {
     }
     return queryClient;
 }
+export function QueryProvider(props) {
+    return _jsx(QueryClientProvider, { client: getQueryClient(), children: props.children });
+}

package/dist/app/utils/query-monitor.d.ts

@@ -0,0 +1,26 @@
+export declare namespace QueryMonitor {
+    type LogEntry = {
+        type: "php_warning" | "php_error" | "php_notice" | "error" | "GRAPHQL_DEBUG" | (string & {});
+        message: any;
+        line?: number;
+        file?: string;
+        stack?: string[];
+        locations?: {
+            line: number;
+            column: number;
+        }[];
+        path?: string[];
+        extensions?: {
+            category?: string;
+        };
+        debugMessage?: string;
+    };
+    type Entry = {
+        file: string;
+        duration: number;
+        label?: "app" | "page" | "block" | "query" | "mutation" | (string & {});
+        log: LogEntry[];
+        children?: Entry[];
+    };
+    function hasLogEntries(entry: Entry[]): boolean;
+}

package/dist/app/utils/query-monitor.js

@@ -0,0 +1,7 @@
+export var QueryMonitor;
+(function (QueryMonitor) {
+    function hasLogEntries(entry) {
+        return entry.some((e) => e.log.length > 0 || (e.children && hasLogEntries(e.children)));
+    }
+    QueryMonitor.hasLogEntries = hasLogEntries;
+})(QueryMonitor || (QueryMonitor = {}));

package/dist/app/utils/trpc-client.d.ts

@@ -0,0 +1,2 @@
+import { TRPCUntypedClient } from "@trpc/client";
+export declare function getRPCClient(): TRPCUntypedClient<any>;

package/dist/app/utils/trpc-client.js

@@ -0,0 +1,39 @@
+import { createTRPCUntypedClient, httpLink, splitLink, unstable_httpSubscriptionLink, } from "@trpc/client";
+import SuperJSON from "superjson";
+import { parseURL, stringifyParsedURL } from "ufo";
+const updatePath = (url) => {
+    const parsed = parseURL(url);
+    parsed.pathname = "/" + parsed.pathname.replace(/(^\/|\/$)/g, "").replace(/\./g, "/") + "/";
+    return stringifyParsedURL(parsed);
+};
+let client;
+export function getRPCClient() {
+    if (env.rpcEnabled) {
+        if (!client) {
+            // @ts-ignore
+            const endpoint = env.serverless ? "/" : window.SERVERLESS_ENDPOINT ?? "/";
+            client = createTRPCUntypedClient({
+                links: [
+                    splitLink({
+                        condition: (op) => op.type === "subscription",
+                        true: unstable_httpSubscriptionLink({
+                            url: endpoint,
+                            transformer: SuperJSON,
+                        }),
+                        false: httpLink({
+                            url: endpoint,
+                            fetch: (url, opts) => {
+                                return fetch(updatePath(url), {
+                                    ...opts,
+                                    credentials: "omit",
+                                });
+                            },
+                            transformer: SuperJSON,
+                        }),
+                    }),
+                ],
+            });
+        }
+    }
+    return client;
+}

package/dist/node/cli/cli-worker.js

@@ -47,7 +47,7 @@ export class CLIWorker {
 if (!isMainThread) {
     const mode = workerData.mode;
     /** Ignore self-signed certificate errors in dev mode */
-    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
+    // process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0"
     configureCliMode({
         interactive: true,
         readonly: false,
@@ -86,25 +86,30 @@ if (!isMainThread) {
     }
     function pipeLog(log) {
         log.subscribe((log) => {
-            // We ignore SSL errors in dev mode.
             parentPort?.postMessage(JSON.stringify({ type: "log", log: serializeLogData(log) }));
         });
     }
     if (mode === "admin") {
-        new AdminBundler(project, {
+        const bundler = new AdminBundler(project, {
             mode: "development",
         });
+        bundler.start();
         pipeLog(adminLog);
     }
     else if (mode === "frontend") {
-        new FrontendBundler(project, {
+        const bundler = new FrontendBundler(project, {
             mode: "development",
             watch: true,
         });
+        bundler.start();
         pipeLog(frontendLog);
     }
     else if (mode === "graphql") {
-        const codegen = new GraphQLGenerator(project);
+        const codegen = new GraphQLGenerator(project, {
+            generate: true,
+            optimize: true,
+            watch: true,
+        });
         codegen.start();
         pipeLog(graphqlLog);
     }

package/dist/node/cli/cli.js

@@ -2,11 +2,11 @@ import chalk from "chalk";
 import { Command } from "commander";
 import { setDefaultResultOrder } from "dns";
 import { config as importDotEnv } from "dotenv";
-import { adminLog } from "../compiler/bundler.admin.js";
-import { frontendLog } from "../compiler/bundler.frontend.js";
+import { AdminBundler, adminLog } from "../compiler/bundler.admin.js";
+import { FrontendBundler, frontendLog } from "../compiler/bundler.frontend.js";
 import { DevServer, serverlessLog } from "../compiler/dev-server.js";
 import { createVinxiCodegen } from "../compiler/vinxi-codegen.js";
-import { graphqlLog } from "../graphql/graphql-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";
@@ -17,6 +17,7 @@ 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)
@@ -29,12 +30,23 @@ program
     .command("dev")
     .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) => {
+    console.error = (...args) => { };
+    console.log = (...args) => { };
+    console.info = (...args) => { };
+    console.warn = (...args) => { };
+    // if (typeof args[0] === "string" && args[0].includes("NODE_TLS_REJECT_UNAUTHORIZED")) return
+    // serverlessLog.error(...args)
+    // }
     process.env["NODE_ENV"] = "development";
     /** Ignore self-signed certificate errors in dev mode */
-    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
+    // 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"),
@@ -67,6 +79,12 @@ program
         rootDir: process.cwd(),
         reportPluginCompatibility: true,
     });
+    // const result = await project.verifyOriginAccess()
+    // if (!result.success) {
+    //   projectLog.fail(result.message)
+    //   process.exit(1)
+    //   return
+    // }
     const infoWriter = new BuildInfoWriter(project);
     infoWriter.watch();
     infoWriter.write();
@@ -104,6 +122,8 @@ program
             // We ignore SSL errors in dev mode.
             if (typeof args[0] === "string" && args[0].includes("NODE_TLS_REJECT_UNAUTHORIZED"))
                 return;
+            if (typeof args[0] === "string" && args[0].includes("useLayoutEffect does nothing"))
+                return;
             serverlessLog.error(...args);
         };
         console.warn = (...args) => {
@@ -138,6 +158,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,
@@ -155,18 +178,65 @@ program
     });
     const buildServerless = options.serverless || process.env.VERCEL;
     if (buildServerless) {
+        // Verify that the we have access to the origin
+        const result = await project.verifyOriginAccess();
+        if (!result.success) {
+            console.error(result.message);
+            process.exit(1);
+            return;
+        }
         await buildVinxi({
             project,
             console,
         });
     }
-    // Load the compiler
-    // new AdminBundler(project, {
-    //   mode: "development",
-    // })
-    // new FrontendBundler(project, {
-    //   mode: "production",
-    // })
+    else {
+        const infoWriter = new BuildInfoWriter(project);
+        // 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([infoWriter.write(), 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.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/boot-cli-app.js

@@ -5,6 +5,6 @@ export function bootCLIUI(props) {
     console.clear();
     render(_jsx(CLIApp, { ...props }), {
         exitOnCtrlC: true,
-        patchConsole: true,
+        patchConsole: false,
     });
 }

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/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.0.0-beta.12";
+export declare const VERSION = "2.0.0-beta.120";

package/dist/node/cli/version.js

@@ -1 +1 @@
-export const VERSION = "2.0.0-beta.12";
+export const VERSION = "2.0.0-beta.120";

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

@@ -16,8 +16,9 @@ export async function buildVinxi(opts) {
         origin: project.origin,
         publicUrl: project.publicUrl,
         rootDir: project.rootDir,
-        // log: console,
+        rpcBases: (await project.serverRoutes.get()).bases,
         preset,
+        config: project.config,
     };
     const codegen = createVinxiCodegen({
         mode: "production",

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

@@ -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

@@ -10,7 +10,6 @@ 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...`);
@@ -22,6 +21,7 @@ export class AdminBundler {
             outDir: relative(this.project.rootDir, "./dist/cms/"),
             serverless: false,
             target: "cms",
+            client: true,
         });
         console.verbose("Vite config:", baseConfig);
         await build(mergeConfig(baseConfig, defineConfig({

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,12 +8,18 @@ export type Args = {
     outDir?: string;
     publicUrl: string;
     console: StatefulLog<any>;
+    client: boolean;
 };
 export declare function envPlugin(args: Args): PluginOption;
-export declare function reactPlugin(): PluginOption[];
+type ReactPluginArgs = {
+    retainBlockMeta?: boolean;
+};
+export declare function reactPlugin(args?: ReactPluginArgs): PluginOption[];
 /**
  * Turns on SSR module proxying,
  */
 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;
+export {};