@cedarjs/cli 4.0.0-canary.13868 → 4.0.0-canary.13870

package/dist/commands/build/buildHandler.js

@@ -20,6 +20,7 @@ import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
 import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
 import {} from "@cedarjs/project-config";
 import { timedTelemetry } from "@cedarjs/telemetry";
+import { buildUDApiServer } from "@cedarjs/vite/buildUDApiServer";
 import { generatePrismaCommand } from "../../lib/generatePrismaClient.js";
 import { getPaths, getConfig } from "../../lib/index.js";
 import { buildPackagesTask } from "./buildPackagesTask.js";
@@ -76,7 +77,8 @@ const handler = async ({
   workspace = ["api", "web", "packages/*"],
   verbose = false,
   prisma = true,
-  prerender = true
+  prerender = true,
+  ud = false
 }) => {
   recordTelemetryAttributes({
     command: "build",
@@ -161,6 +163,11 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
       title: "Verifying graphql schema...",
       task: loadAndValidateSdls
     },
+    // The API build has two sequential steps:
+    // 1. esbuild compiles api/src/** → api/dist/ (functions, services, etc.)
+    // 2. Vite wraps api/dist/functions/ into a self-contained UD Node server
+    //    entry at api/dist/ud/index.js for `cedar serve api`
+    // Step 2 depends on step 1 having completed.
     workspace.includes("api") && {
       title: "Building API...",
       task: async () => {
@@ -168,6 +175,12 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
         await buildApiWithVite();
       }
     },
+    ud && workspace.includes("api") && {
+      title: "Bundling API server entry (Universal Deploy)...",
+      task: async () => {
+        await buildUDApiServer({ verbose });
+      }
+    },
     workspace.includes("web") && {
       title: "Building Web...",
       task: async () => {

package/dist/commands/build.js

@@ -25,6 +25,10 @@ const builder = (yargs) => {
     alias: "db",
     default: true,
     description: "Generate the Prisma client"
+  }).option("ud", {
+    type: "boolean",
+    default: false,
+    description: "Build the Universal Deploy server entry (api/dist/ud/index.js)."
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

package/dist/commands/dev/devHandler.js

@@ -18,7 +18,8 @@ const handler = async ({
   workspace = ["api", "web", "packages/*"],
   forward = "",
   generate = true,
-  apiDebugPort
+  apiDebugPort,
+  ud = false
 }) => {
   recordTelemetryAttributes({
     command: "dev",
@@ -28,22 +29,26 @@ const handler = async ({
   const cedarPaths = getPaths();
   const serverFile = serverFileExists();
   const apiPreferredPort = parseInt(String(getConfig().api.port));
+  let apiAvailablePort;
+  let apiPortChangeNeeded = false;
+  if (workspace.includes("api")) {
+    if (!serverFile) {
+      apiAvailablePort = await getFreePort(apiPreferredPort);
+      if (apiAvailablePort === -1) {
+        exitWithError(void 0, {
+          message: `Could not determine a free port for the api server`
+        });
+      }
+      apiPortChangeNeeded = apiAvailablePort !== apiPreferredPort;
+    } else {
+      apiAvailablePort = apiPreferredPort;
+    }
+  }
   let webPreferredPort = parseInt(
     String(getConfig().web.port)
   );
-  let apiAvailablePort = apiPreferredPort;
-  let apiPortChangeNeeded = false;
   let webAvailablePort = webPreferredPort;
   let webPortChangeNeeded = false;
-  if (workspace.includes("api") && !serverFile) {
-    apiAvailablePort = await getFreePort(apiPreferredPort);
-    if (apiAvailablePort === -1) {
-      exitWithError(void 0, {
-        message: `Could not determine a free port for the api server`
-      });
-    }
-    apiPortChangeNeeded = apiAvailablePort !== apiPreferredPort;
-  }
   if (workspace.includes("web")) {
     const forwardedPortMatches = [
       ...forward.matchAll(/\-\-port(\=|\s)(?<port>[^\s]*)/g)
@@ -52,10 +57,10 @@ const handler = async ({
       const port = forwardedPortMatches.pop()?.groups?.port;
       webPreferredPort = port ? parseInt(port, 10) : void 0;
     }
-    webAvailablePort = await getFreePort(webPreferredPort, [
-      apiPreferredPort,
-      apiAvailablePort
-    ]);
+    webAvailablePort = await getFreePort(
+      webPreferredPort,
+      apiAvailablePort !== void 0 ? [apiPreferredPort, apiAvailablePort] : [apiPreferredPort]
+    );
     if (webAvailablePort === -1) {
       exitWithError(void 0, {
         message: `Could not determine a free port for the web server`
@@ -63,21 +68,17 @@ const handler = async ({
     }
     webPortChangeNeeded = webAvailablePort !== webPreferredPort;
   }
-  if (apiPortChangeNeeded || webPortChangeNeeded) {
+  if (webPortChangeNeeded) {
     const message = [
-      "The currently configured ports for the development server are",
-      "unavailable. Suggested changes to your ports, which can be changed in",
-      "cedar.toml (or redwood.toml), are:\n",
-      apiPortChangeNeeded && ` - API to use port ${apiAvailablePort} instead`,
-      apiPortChangeNeeded && "of your currently configured",
-      apiPortChangeNeeded && `${apiPreferredPort}
+      "The currently configured port for the development server is",
+      "unavailable. Suggested change to your port, which can be changed in",
+      "cedar.toml (or redwood.toml):\n",
+      ` - Web to use port ${webAvailablePort} instead`,
+      "of your currently configured",
+      `${webPreferredPort}
 `,
-      webPortChangeNeeded && ` - Web to use port ${webAvailablePort} instead`,
-      webPortChangeNeeded && "of your currently configured",
-      webPortChangeNeeded && `${webPreferredPort}
-`,
-      "\nCannot run the development server until your configured ports are",
-      "changed or become available."
+      "\nCannot run the development server until your configured port is",
+      "changed or becomes available."
     ].filter(Boolean).join(" ");
     exitWithError(void 0, { message });
   }
@@ -89,19 +90,8 @@ const handler = async ({
       errorTelemetry(process.argv, `Error generating prisma client: ${message}`);
       console.error(c.error(message));
     }
-    if (!serverFile) {
-      try {
-        await shutdownPort(apiAvailablePort);
-      } catch (e) {
-        const message = getErrorMessage(e);
-        errorTelemetry(process.argv, `Error shutting down "api": ${message}`);
-        console.error(
-          `Error whilst shutting down "api" port: ${c.error(message)}`
-        );
-      }
-    }
   }
-  if (workspace.includes("web")) {
+  if (workspace.includes("web") && webAvailablePort !== void 0) {
     try {
       await shutdownPort(webAvailablePort);
     } catch (e) {
@@ -127,6 +117,9 @@ const handler = async ({
     fs.readFileSync(rootPackageJsonPath, "utf8")
   );
   const buildUnifiedDevCommand = () => {
+    if (!ud) {
+      return null;
+    }
     if (streamingSsrEnabled) {
       return null;
     }
@@ -149,6 +142,20 @@ const handler = async ({
     ].join(" ").replace(/\s+/g, " ").trim();
   };
   const unifiedDevCommand = buildUnifiedDevCommand();
+  if (!unifiedDevCommand && apiPortChangeNeeded) {
+    const message = [
+      "The currently configured port for the development server is",
+      "unavailable. Suggested change to your port, which can be changed in",
+      "cedar.toml (or redwood.toml):\n",
+      ` - API to use port ${apiAvailablePort} instead`,
+      "of your currently configured",
+      `${apiPreferredPort}
+`,
+      "\nCannot run the development server until your configured port is",
+      "changed or becomes available."
+    ].filter(Boolean).join(" ");
+    exitWithError(void 0, { message });
+  }
   const jobs = [];
   if (unifiedDevCommand) {
     jobs.push({

package/dist/commands/dev.js

@@ -24,6 +24,10 @@ const builder = (yargs) => {
   }).option("apiDebugPort", {
     type: "number",
     description: "Port on which to expose API server debugger. If you supply the flag with no value it defaults to 1 prepended to the api port (e.g. api port 8913 -> debug port 18913)."
+  }).option("ud", {
+    type: "boolean",
+    default: false,
+    description: "Use the unified Vite dev server that handles both web and API in a single process (experimental)."
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

package/dist/commands/serve.js

@@ -1,5 +1,6 @@
+import { fork } from "node:child_process";
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
 import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
@@ -43,7 +44,18 @@ const builder = async (yargs) => {
   }).command({
     command: "api",
     description: apiServerCLIConfig.description,
-    builder: apiServerCLIConfig.builder,
+    builder: (yargs2) => {
+      if (typeof apiServerCLIConfig.builder === "function") {
+        apiServerCLIConfig.builder(yargs2);
+      }
+      return yargs2.option("ud", {
+        // UD serving is opt-in. Pass --ud to use the new srvx server instead
+        // of the legacy Fastify server.
+        description: "Use the Universal Deploy server (srvx). Pass --ud to opt in; the default is Fastify.",
+        type: "boolean",
+        default: false
+      });
+    },
     handler: async (argv) => {
       recordTelemetryAttributes({
         command: "serve",
@@ -52,6 +64,47 @@ const builder = async (yargs) => {
         socket: argv.socket,
         apiRootPath: argv.apiRootPath
       });
+      if (argv.ud) {
+        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
+        if (!fs.existsSync(udEntryPath)) {
+          console.error(
+            c.error(
+              `
+ Universal Deploy server entry not found at ${udEntryPath}.
+ Please run \`yarn cedar build api\` before serving.
+`
+            )
+          );
+          process.exit(1);
+        }
+        const udArgs = [];
+        if (argv.port) {
+          udArgs.push("--port", String(argv.port));
+        }
+        if (argv.host) {
+          udArgs.push("--host", argv.host);
+        }
+        await new Promise((resolve, reject) => {
+          const child = fork(udEntryPath, udArgs, {
+            execArgv: process.execArgv,
+            env: {
+              ...process.env,
+              NODE_ENV: process.env.NODE_ENV ?? "production",
+              PORT: argv.port ? String(argv.port) : process.env.PORT,
+              HOST: argv.host ?? process.env.HOST
+            }
+          });
+          child.on("error", reject);
+          child.on("exit", (code) => {
+            if (code !== 0) {
+              reject(new Error(`UD server exited with code ${code}`));
+            } else {
+              resolve();
+            }
+          });
+        });
+        return;
+      }
       if (serverFileExists()) {
         const { apiServerFileHandler } = await import("./serveApiHandler.js");
         await apiServerFileHandler(argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "4.0.0-canary.13868+ab9cc3863a",
+  "version": "4.0.0-canary.13870+b45da21869",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,16 +33,16 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "4.0.0-canary.13868",
-    "@cedarjs/cli-helpers": "4.0.0-canary.13868",
-    "@cedarjs/fastify-web": "4.0.0-canary.13868",
-    "@cedarjs/internal": "4.0.0-canary.13868",
-    "@cedarjs/prerender": "4.0.0-canary.13868",
-    "@cedarjs/project-config": "4.0.0-canary.13868",
-    "@cedarjs/structure": "4.0.0-canary.13868",
-    "@cedarjs/telemetry": "4.0.0-canary.13868",
-    "@cedarjs/utils": "4.0.0-canary.13868",
-    "@cedarjs/web-server": "4.0.0-canary.13868",
+    "@cedarjs/api-server": "4.0.0-canary.13870",
+    "@cedarjs/cli-helpers": "4.0.0-canary.13870",
+    "@cedarjs/fastify-web": "4.0.0-canary.13870",
+    "@cedarjs/internal": "4.0.0-canary.13870",
+    "@cedarjs/prerender": "4.0.0-canary.13870",
+    "@cedarjs/project-config": "4.0.0-canary.13870",
+    "@cedarjs/structure": "4.0.0-canary.13870",
+    "@cedarjs/telemetry": "4.0.0-canary.13870",
+    "@cedarjs/utils": "4.0.0-canary.13870",
+    "@cedarjs/web-server": "4.0.0-canary.13870",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab9cc3863af0e084f0b089f032bf806f1a33e65f"
+  "gitHead": "b45da21869cec79bedc40b47868d54fd598786ac"
 }