eddev 2.0.0-beta.1 → 2.0.0-beta.11

package/dist/app/lib/hooks/queryUtils.js

@@ -15,7 +15,7 @@ const fetchGETQuery = async (name, params, opts) => {
         headers: opts?.headers,
     };
     if (env.serverless && env.client) {
-        url = `/api/rest/query/${name}`;
+        url = `/_data/query/${name}`;
     }
     else if (env.serverless) {
         url = joinURL(env.origin ?? "", `/wp-json/ed/v1/query/${name}`);
@@ -60,14 +60,6 @@ export function createUseQuery(init) {
     };
     return hook;
 }
-//  & {
-//   fetch: (
-//     args: OptionalMaybes<TVars>,
-//     options?: Omit<FetchInfiniteQueryOptions<TData, QueryError, InfiniteData<TData, string>>, "queryKey" | "queryFn"> & {
-//       headers?: Record<string, string>
-//     },
-//   ) => Promise<TData>
-// }
 function selectByPath(data, path) {
     return path.reduce((acc, key) => (acc ? acc[key] : null), data);
 }
@@ -109,10 +101,12 @@ export function createUseInfiniteQuery(init) {
                 const endCursor = selectByPath(data, init.paths.endCursorPath);
                 const hasNextPage = selectByPath(data, init.paths.hasNextPagePath);
                 const nodes = selectByPath(data, init.paths.nodesPath);
+                const total = selectByPath(data, [...init.paths.pageInfoPath, "total"]);
                 return {
                     nodes,
                     hasNextPage,
                     endCursor,
+                    total,
                 };
             },
             initialPageParam: "",
@@ -121,7 +115,10 @@ export function createUseInfiniteQuery(init) {
                 return lastPage.hasNextPage ? lastPage.endCursor : undefined;
             },
             select(data) {
-                return data.pages.flatMap((page) => page.nodes);
+                return {
+                    nodes: data.pages.flatMap((page) => page.nodes),
+                    total: data.pages[data.pages.length - 1]?.total,
+                };
             },
             ...options,
             ...initial,
@@ -142,7 +139,7 @@ const fetchMutation = async (name, params, opts) => {
     };
     if (env.serverless && env.client) {
         // Relative request (in browser)
-        url = `/api/rest/mutation/${name}`;
+        url = `/_data/mutation/${name}`;
     }
     else if (env.serverless) {
         // Request to the origin server (server to server)

package/dist/app/lib/internal/internal-store.d.ts

@@ -1,9 +1,7 @@
 import { FunctionComponent } from "react";
-import { Config as TailwindConfig } from "tailwindcss";
 type BlockManifest = Record<string, FunctionComponent<any>>;
 type Store = {
     blocks: BlockManifest;
-    tailwindConfig: TailwindConfig | null;
 };
 export declare const internalStore: Store & {
     set<K extends keyof Store>(key: K, value: Store[K]): void;

package/dist/app/lib/internal/internal-store.js

@@ -1,9 +1,7 @@
 import { proxy, ref } from "valtio";
 export const internalStore = proxy({
     blocks: {},
-    tailwindConfig: null,
     set(key, value) {
-        ;
-        internalStore[key] = value ? ref(value) : value;
+        internalStore[key] = (value ? ref(value) : value);
     },
 });

package/dist/app/lib/routing/components/ClientOnly.d.ts

@@ -8,5 +8,5 @@ type Props = PropsWithChildren<{
  *
  * The optional 'fallback' prop can be used to show a loading state or placeholder content while the client bundle is loading.
  */
-export declare function ClientOnly(props: Props): string | number | boolean | Iterable<import("react").ReactNode> | import("react/jsx-runtime").JSX.Element | null;
+export declare function ClientOnly(props: Props): string | number | boolean | import("react/jsx-runtime").JSX.Element | Iterable<import("react").ReactNode> | null;
 export {};

package/dist/app/lib/routing/loader.js

@@ -31,10 +31,12 @@ export class RouteLoader {
         const origin = parseURL(sampleUrl);
         let propsPath = withTrailingSlash(pathname);
         let query = {};
-        if (opts.serverless) {
-            query["_debug"] = opts.debug ? "1" : "0";
-            query["_props"] = opts.appData ? "all" : "1";
-            query["_ssr"] = "1";
+        if (env.serverless && env.client) {
+            propsPath = "/_data/route" + propsPath;
+            query = {};
+            // query["_debug"] = opts.debug ? "1" : "0"
+            // query["_props"] = opts.appData ? "all" : "1"
+            // query["_ssr"] = "1"
         }
         else {
             query["_debug"] = opts.debug ? "1" : "0";

package/dist/app/server/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./render-ssr-page";
+export * from "./server-context";
+export * from "./proxy-wp-admin";

package/dist/app/server/index.js

@@ -0,0 +1,3 @@
+export * from "./render-ssr-page";
+export * from "./server-context";
+export * from "./proxy-wp-admin";

package/dist/app/server/proxy-wp-admin.d.ts

@@ -0,0 +1,3 @@
+import { EventHandlerRequest, H3Event } from "vinxi/http";
+import { ServerContext } from "./server-context";
+export declare function proxyWpAdmin(event: H3Event<EventHandlerRequest>, serverContext: ServerContext): Promise<Response>;

package/dist/app/server/proxy-wp-admin.js

@@ -0,0 +1,106 @@
+/// <reference types="vinxi/types/server" />
+import { splitSetCookieString } from "cookie-es";
+import { getProxyRequestHeaders, getRequestURL, getWebRequest } from "vinxi/http";
+import { getManifest } from "vinxi/manifest";
+export async function proxyWpAdmin(event, serverContext) {
+    const replaceUrls = serverContext.replaceUrls;
+    const req = getWebRequest(event);
+    const proxyUrl = serverContext.getOriginUrl(getRequestURL(event).href);
+    // Prepare request headers to be sent to the origin server
+    const proxyHeaders = getProxyRequestHeaders(event);
+    proxyHeaders["X-ED-Dev-Proxy"] = "true";
+    // Forward the request to the origin server
+    const response = await fetch(proxyUrl, {
+        method: req.method,
+        referrer: req.referrer,
+        referrerPolicy: req.referrerPolicy,
+        headers: proxyHeaders,
+        body: req.method.match(/get|head|options/i) ? undefined : await req.blob(),
+        redirect: "manual",
+        cache: "no-cache",
+    });
+    const contentType = response.headers.get("content-type");
+    let body;
+    let res = { status: response.status, statusText: response.statusText, headers: new Headers() };
+    const cookies = [];
+    response.headers.forEach((value, key) => {
+        if (key === "content-encoding" || key === "content-length" || key === "transfer-encoding") {
+            return;
+        }
+        if (key === "set-cookie") {
+            cookies.push(...splitSetCookieString(value));
+            return;
+        }
+        if (key === "location" && replaceUrls) {
+            value = replaceUrls(value);
+        }
+        res.headers.set(key, value);
+    });
+    // Set cookies in the response headers
+    // TODO: May need to rewrite cookie domain here before setting.
+    if (cookies.length > 0) {
+        for (const cookie of cookies) {
+            res.headers.append("set-cookie", cookie);
+        }
+    }
+    // Replace URLs pointing to the origin server from the response itself
+    // This is only done for text-based content types, like application/json, text/plain, text/html etc
+    if (contentType?.match(/(application|text)\//)) {
+        if (replaceUrls) {
+            body = replaceUrls((await response.text()) ?? "");
+        }
+        // If the content type is text/html, inject the Vite assets into the response — assuming the placeholder comments are found
+        if (contentType.startsWith("text/html")) {
+            const clientManifest = getManifest("admin");
+            const assets = await clientManifest.inputs[clientManifest.handler].assets();
+            body = body.replace("<!---VITE_HEADER--->", () => assets.map((asset) => renderAsset(asset)).join("\n"));
+            body = body.replace("<!---VITE_FOOTER--->", () => renderAsset({
+                tag: "script",
+                attrs: {
+                    type: "module",
+                    src: clientManifest.inputs[clientManifest.handler].output.path,
+                },
+                children: "",
+            }));
+        }
+    }
+    else {
+        // Otherwise just stream the response as is
+        body = response.body;
+    }
+    return new Response(body, res);
+}
+function printElement(element, props, innerText) {
+    if (typeof innerText === "string") {
+        return `<${element}${Object.entries(props)
+            .map(([key, value]) => ` ${key}="${value}"`)
+            .join("")}>${innerText}</${element}>`;
+    }
+    else {
+        return `<${element}${Object.entries(props)
+            .map(([key, value]) => ` ${key}="${value}"`)
+            .join("")} />`;
+    }
+}
+function renderAsset({ tag, attrs: { key, ...attrs } = {}, children, }) {
+    switch (tag) {
+        case "script":
+            if (attrs.src) {
+                return printElement("script", { ...attrs, key: attrs.src }, "");
+            }
+            else {
+                return printElement("script", {
+                    ...attrs,
+                    key: key,
+                }, children ?? "");
+            }
+        case "link":
+            return printElement("link", { ...attrs, key: key });
+        case "style":
+            return printElement("style", {
+                ...attrs,
+                key: key,
+            }, children ?? "");
+    }
+    return "";
+}

package/dist/app/server/render-ssr-page.d.ts

@@ -0,0 +1,2 @@
+import type { RouteData } from "../lib/routing/types.js";
+export declare function renderPageToSSRStream(pathname: string, initialData: RouteData): Promise<unknown>;

package/dist/app/server/render-ssr-page.js

@@ -0,0 +1,22 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { renderAsset } from "@vinxi/react";
+import { Suspense } from "react";
+import { renderToPipeableStream } from "react-dom/server";
+import { getManifest } from "vinxi/manifest";
+import { SSRRoot } from "../entry/ssr-root.js";
+import { RouteLoader } from "../lib/routing/loader.js";
+export async function renderPageToSSRStream(pathname, initialData) {
+    const clientManifest = getManifest("client");
+    const assets = await clientManifest.inputs[clientManifest.handler].assets();
+    const jsx = (_jsx(SSRRoot, { assets: _jsx(Suspense, { children: assets.map((m) => renderAsset(m)) }), pathname: pathname, initialData: initialData, loader: new RouteLoader() }));
+    const stream = await new Promise(async (resolve) => {
+        const stream = renderToPipeableStream(jsx, {
+            onShellReady() {
+                resolve(stream);
+            },
+            bootstrapModules: [clientManifest.inputs[clientManifest.handler].output.path],
+            bootstrapScriptContent: `window.manifest = ${JSON.stringify(await clientManifest.json())}; window._PAGE_DATA = ${JSON.stringify(initialData)}`,
+        });
+    });
+    return stream;
+}

package/dist/app/server/server-context.d.ts

@@ -0,0 +1,34 @@
+import { UrlReplacerConf } from "./utils/replace-host.js";
+import { RequestHeaders } from "vinxi/http";
+export type ServerContextArgs = {
+    dev: boolean;
+    origin: string;
+    replaceUrls?: UrlReplacerConf;
+};
+export declare class ServerContext {
+    dev: boolean;
+    origin: string;
+    replaceUrls?: (text: string) => string;
+    constructor(conf: ServerContextArgs);
+    getOriginUrl(url: string): string;
+    fetchOrigin(url: string, opts?: RequestInit & {
+        replaceUrls?: boolean;
+    }): Promise<Response>;
+    fetchRouteData(req: {
+        pathname: string;
+        query?: Record<string, any>;
+        headers?: RequestHeaders;
+        withAppData?: boolean;
+    }): Promise<Response>;
+    extractRequestHeaders(req?: RequestHeaders): Partial<Record<import("vinxi/http").HTTPHeaderName, string | undefined>>;
+    fetchNamedQuery(req: {
+        name: string;
+        params: object;
+        headers: RequestHeaders;
+    }): Promise<Response>;
+    fetchMutation(req: {
+        name: string;
+        body: object;
+        headers: RequestHeaders;
+    }): Promise<Response>;
+}

package/dist/app/server/server-context.js

@@ -0,0 +1,116 @@
+import { parseURL, stringifyParsedURL, withQuery } from "ufo";
+import { filterHeader } from "./utils/headers.js";
+import { createUrlReplacer } from "./utils/replace-host.js";
+const PROXY_RESPONSE_HEADERS = ["content-type", "set-cookie", /^x-/, "cache-control"];
+const PROXY_REQUEST_HEADERS = [
+    "content-type",
+    "accept",
+    "accept-encoding",
+    "accept-language",
+    "origin",
+    "referer",
+    "user-agent",
+    "authorization",
+];
+export class ServerContext {
+    dev;
+    origin;
+    replaceUrls;
+    constructor(conf) {
+        this.dev = conf.dev;
+        this.origin = conf.origin;
+        if (conf.replaceUrls) {
+            this.replaceUrls = createUrlReplacer(conf.replaceUrls);
+        }
+    }
+    getOriginUrl(url) {
+        const parsed = parseURL(url);
+        const parsedOrigin = parseURL(env.origin);
+        parsed.host = parsedOrigin.host;
+        parsed.protocol = parsedOrigin.protocol;
+        return stringifyParsedURL(parsed);
+    }
+    async fetchOrigin(url, opts) {
+        url = this.getOriginUrl(url);
+        const response = await fetch(url, {
+            ...opts,
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+                ...opts?.headers,
+            },
+        });
+        if (!response.ok) {
+            return response;
+        }
+        const headers = {};
+        response.headers.forEach((value, key) => {
+            if (filterHeader(key, PROXY_RESPONSE_HEADERS)) {
+                headers[key] = value;
+            }
+        });
+        let text = await response.text();
+        if (opts?.replaceUrls && this.replaceUrls) {
+            text = this.replaceUrls(text);
+        }
+        return new Response(text, {
+            status: response.status,
+            statusText: response.statusText,
+            headers,
+        });
+    }
+    async fetchRouteData(req) {
+        const fetchUrl = withQuery(req.pathname, {
+            ...req.query,
+            _props: req.withAppData ? "all" : "1",
+            _ssr: "1",
+            _debug: this.dev ? "1" : undefined,
+        });
+        return this.fetchOrigin(fetchUrl, {
+            cache: "no-cache",
+            replaceUrls: true,
+            headers: {
+                "Content-Type": "application/json",
+                Accept: "application/json",
+                ...this.extractRequestHeaders(req.headers),
+            },
+        });
+    }
+    extractRequestHeaders(req) {
+        const headers = {};
+        if (req) {
+            for (let key of PROXY_REQUEST_HEADERS) {
+                if (req[key]) {
+                    headers[key] = req[key];
+                }
+            }
+        }
+        return headers;
+    }
+    async fetchNamedQuery(req) {
+        const url = `/wp-json/ed/v1/query/${req.name}?params=${encodeURIComponent(JSON.stringify(req.params))}`;
+        return this.fetchOrigin(url, {
+            cache: "no-cache",
+            replaceUrls: true,
+            headers: {
+                ...this.extractRequestHeaders(req.headers),
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+        });
+    }
+    async fetchMutation(req) {
+        const url = `/wp-json/ed/v1/mutation/${req.name}`;
+        return this.fetchOrigin(url, {
+            method: "POST",
+            cache: "no-cache",
+            replaceUrls: true,
+            headers: {
+                ...this.extractRequestHeaders(req.headers),
+                "Content-Type": "application/json",
+                Accept: "application/json",
+            },
+            body: JSON.stringify(req.body),
+        });
+    }
+}

package/dist/app/server/utils/headers.d.ts

@@ -2,3 +2,4 @@ export declare function filterHeader(key: string, allowed: (string | RegExp)[]):
 export declare const BRANDED_HEADERS: {
     "X-Powered-By": string;
 };
+export declare function extractHeaders(rawHeaders: Headers): Record<string, string>;

package/dist/app/server/utils/headers.js

@@ -9,3 +9,20 @@ export function filterHeader(key, allowed) {
 export const BRANDED_HEADERS = {
     "X-Powered-By": "ed.studio",
 };
+const IGNORE_REQUEST_HEADERS = [
+    "host",
+    "connection",
+    "accept-encoding",
+    "accept-language",
+    "origin",
+    "referer",
+    "user-agent",
+];
+export function extractHeaders(rawHeaders) {
+    const headers = {};
+    rawHeaders.forEach((value, key) => {
+        headers[key] = value;
+    });
+    IGNORE_REQUEST_HEADERS.forEach((key) => delete headers[key]);
+    return headers;
+}

package/dist/app/server/utils/replace-host.d.ts

@@ -1,8 +1,10 @@
 export type UrlReplacerConf = {
     from: string;
     to: string;
-    https: boolean;
-    ignoreUploads: boolean;
-    ignorePlugins: boolean;
+    /** A dictionary of prefixes (eg /wp-content), and whether to replace them (true/false) */
+    prefixes: {
+        prefix: string;
+        replace: boolean;
+    }[];
 };
-export declare function createUrlReplacer(conf: UrlReplacerConf): (value: string) => string;
+export declare function createUrlReplacer(conf: UrlReplacerConf): (text: string) => string;

package/dist/app/server/utils/replace-host.js

@@ -1,14 +1,61 @@
 export function createUrlReplacer(conf) {
-    const from = conf.from;
-    const to = conf.to;
-    const https = conf.https;
-    const ignoreUploads = conf.ignoreUploads;
-    const ignorePlugins = conf.ignorePlugins;
-    const replaceTargetString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\/");
-    const replaceTargetEscapedString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\\\/");
-    const replaceTarget = new RegExp(replaceTargetString, "g");
-    const replaceTargetEscaped = new RegExp(replaceTargetEscapedString, "g");
-    return (value) => {
-        return value.replaceAll(replaceTarget, to).replace(replaceTargetEscaped, to.replaceAll("/", "\\/"));
+    // Create a regular expression to match the URL
+    // Note that that the regex doesn't necessarily match the entire URL
+    const lookup = new RegExp(conf.from.replace(/https?[:\\\/]+/, "https?[:\\/\\\\]+") + "([a-z0-9\\-_/\\\\]+)", "ig");
+    return (text) => {
+        return text.replace(lookup, (url) => {
+            // Strip out the origin, to create a relative path
+            const path = url.replace(/https?:[\/\\]+[^\/\\]+/, "");
+            const isEscaped = url.includes(":\\/\\/");
+            const key = "/" +
+                path
+                    .split(/[\/\\]+/g)
+                    .filter((v) => v)
+                    .join("/");
+            for (let item of conf.prefixes) {
+                if (key.startsWith(item.prefix)) {
+                    if (item.replace) {
+                        return url;
+                    }
+                    else {
+                        return path;
+                    }
+                }
+            }
+            return path;
+            // if (path.startsWith("/wp-content/uploads/")) {
+            //   if (!conf.ignoreUploads) {
+            //     return path
+            //   } else {
+            //     return url
+            //   }
+            //   // } else if (path.startsWith("/wp-content/themes/")) {
+            //   //   if (settings?.uploads === "proxy") {
+            //   //     return path
+            //   //   } else if (settings?.uploads === "remote") {
+            //   //     return url
+            //   //   }
+            //   // } else if (path.startsWith("/wp-content/plugins/")) {
+            //   //   if (settings?.uploads === "proxy") {
+            //   //     return path
+            //   //   } else if (settings?.uploads === "remote") {
+            //   //     return url
+            //   //   }
+            // } else {
+            //   return path
+            // }
+        });
     };
+    // const from = conf.from
+    // const to = conf.to
+    // const https = conf.https
+    // const ignoreUploads = conf.ignoreUploads
+    // const ignorePlugins = conf.ignorePlugins
+    // const replaceTargetString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\/")
+    // const replaceTargetEscapedString = from.replaceAll(/https?:/g, "https?:").replaceAll("/", "\\\\/")
+    // const replaceTarget = new RegExp(replaceTargetString, "g")
+    // const replaceTargetEscaped = new RegExp(replaceTargetEscapedString, "g")
+    // return (value: string) => {
+    //   return value.replaceAll(replaceTarget, to).replace(replaceTargetEscaped, to.replaceAll("/", "\\/"))
+    // }
 }

package/dist/node/cli/cli-worker.d.ts

@@ -1,5 +1,5 @@
 import { Worker } from "node:worker_threads";
-import { StatefulLog } from "../utils/statefulLog.js";
+import { StatefulLog } from "../utils/stateful-log.js";
 type WorkerMode = "admin" | "frontend" | "graphql" | "serverless";
 export declare class CLIWorker {
     worker: Worker;

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

@@ -46,6 +46,8 @@ export class CLIWorker {
 }
 if (!isMainThread) {
     const mode = workerData.mode;
+    /** Ignore self-signed certificate errors in dev mode */
+    process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = "0";
     configureCliMode({
         interactive: true,
         readonly: false,
@@ -84,6 +86,7 @@ if (!isMainThread) {
     }
     function pipeLog(log) {
         log.subscribe((log) => {
+            // We ignore SSL errors in dev mode.
             parentPort?.postMessage(JSON.stringify({ type: "log", log: serializeLogData(log) }));
         });
     }

package/dist/node/cli/cli.js

@@ -2,9 +2,10 @@ import chalk from "chalk";
 import { Command } from "commander";
 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 { adminLog } from "../compiler/bundler.admin.js";
+import { 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 { BuildInfoWriter } from "../project/eddev-build-file.js";
 import { Project, projectLog } from "../project/project.js";
@@ -14,6 +15,8 @@ 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";
 importDotEnv();
 const program = new Command()
     .version(VERSION)
@@ -24,12 +27,13 @@ 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("--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}`));
     const tasks = {
         admin: !options.mode || options.mode.includes("admin"),
@@ -66,6 +70,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 +101,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 +112,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",
         });
     }
@@ -125,17 +148,25 @@ program
         watch: false,
         rootDir: process.cwd(),
     });
+    const console = createConsole("build");
     // Load the project info
     const project = await Project.create({
         rootDir: process.cwd(),
     });
+    const buildServerless = options.serverless || process.env.VERCEL;
+    if (buildServerless) {
+        await buildVinxi({
+            project,
+            console,
+        });
+    }
     // Load the compiler
-    new AdminBundler(project, {
-        mode: "development",
-    });
-    new FrontendBundler(project, {
-        mode: "production",
-    });
+    // new AdminBundler(project, {
+    //   mode: "development",
+    // })
+    // new FrontendBundler(project, {
+    //   mode: "production",
+    // })
 });
 program
     .command("info")