@cedarjs/cli 4.2.0 → 4.2.1-next.258

package/dist/commands/serve.js

@@ -1,7 +1,7 @@
-import { fork } from "node:child_process";
 import fs from "node:fs";
-import net from "node:net";
 import path from "node:path";
+import { pathToFileURL } from "node:url";
+import { serve as serveSrvx } from "srvx";
 import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
@@ -11,6 +11,35 @@ import * as webServerCLIConfig from "@cedarjs/web-server";
 import { getPaths, getConfig } from "../lib/index.js";
 import { serverFileExists } from "../lib/project.js";
 import { webSsrServerHandler } from "./serveWebHandler.js";
+function resolveUDEntryPath() {
+  const base = path.join(getPaths().api.dist, "ud", "index");
+  for (const ext of [".mjs", ".js"]) {
+    const entryPath = base + ext;
+    if (fs.existsSync(entryPath)) {
+      return entryPath;
+    }
+  }
+  return null;
+}
+async function startUDServer(entryPath, host, port) {
+  const mod = await import(pathToFileURL(entryPath).href);
+  const fetchable = mod.default ?? mod;
+  if (!fetchable || typeof fetchable.fetch !== "function") {
+    throw new Error(
+      `UD entry at ${entryPath} does not export a Fetchable (\`export default { fetch }\`).`
+    );
+  }
+  const server = serveSrvx({
+    ...fetchable,
+    port,
+    hostname: host,
+    gracefulShutdown: false,
+    manual: true
+  });
+  server.serve();
+  await server.ready();
+  return server;
+}
 const command = "serve [side]";
 const description = "Start a server for serving both the api and web sides";
 const builder = async (yargs) => {
@@ -43,14 +72,11 @@ const builder = async (yargs) => {
           );
           process.exit(1);
         }
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
@@ -77,61 +103,52 @@ const builder = async (yargs) => {
         const webPort = argv.webPort ?? getWebPort();
         const webHost = argv.webHost ?? getWebHost();
         const apiRootPath = argv.apiRootPath ?? "/";
-        const apiProxyTarget = [
-          "http://",
-          apiHost.includes(":") ? `[${apiHost}]` : apiHost,
-          ":",
-          apiPort,
-          apiRootPath
-        ].join("");
-        const { redwoodFastifyWeb } = await import("@cedarjs/fastify-web");
-        const { createFastifyInstance } = await import("@cedarjs/api-server/fastify");
-        const webFastify = await createFastifyInstance();
-        webFastify.register(redwoodFastifyWeb, {
-          redwood: {
-            apiProxyTarget
-          }
-        });
-        await webFastify.listen({
-          port: webPort,
-          host: webHost
-        });
-        const child = fork(
-          udEntryPath,
-          ["--port", String(apiPort), "--host", apiHost],
-          {
-            execArgv: process.execArgv,
-            env: {
-              ...process.env,
-              NODE_ENV: process.env.NODE_ENV ?? "production",
-              PORT: String(apiPort),
-              HOST: apiHost
+        const apiTarget = `http://${apiHost.includes(":") ? `[${apiHost}]` : apiHost}:${apiPort}`;
+        const { serveStatic } = await import("srvx/static");
+        const apiUrl = getConfig().web.apiUrl;
+        const webDist = getPaths().web.dist;
+        const prerenderIndexPath = path.join(webDist, "200.html");
+        const fallbackIndexPath = fs.existsSync(prerenderIndexPath) ? prerenderIndexPath : path.join(webDist, "index.html");
+        const spaHtml = fs.readFileSync(fallbackIndexPath, "utf-8");
+        const webServer = serveSrvx({
+          // Dummy fetch handler. All requests are handled by middleware
+          fetch: async () => new Response("Not Found", { status: 404 }),
+          middleware: [
+            serveStatic({ dir: webDist }),
+            async (req, next) => {
+              const url = new URL(req.url, "http://localhost");
+              if (!url.pathname.startsWith(apiUrl)) {
+                return next();
+              }
+              const targetPath = url.pathname.slice(apiUrl.length) || "/";
+              const root = apiRootPath === "/" ? "" : apiRootPath;
+              const targetUrl = `${apiTarget}${root}${targetPath}${url.search}`;
+              return fetch(targetUrl, {
+                method: req.method,
+                headers: req.headers,
+                body: req.body,
+                // @ts-expect-error - `duplex` is required when forwarding a
+                // request body via fetch (Node 18+).
+                duplex: "half"
+              });
+            },
+            () => {
+              const headers = { "Content-Type": "text/html" };
+              return new Response(spaHtml, { headers });
             }
-          }
-        );
-        child.on("error", (err) => {
-          console.error(
-            c.error(`
- Failed to start UD API server: ${err.message}
-`)
-          );
-          process.exit(1);
-        });
-        child.on("exit", (code) => {
-          if (code !== 0) {
-            console.error(
-              c.error(`
- UD API server exited with code ${code}
-`)
-            );
-            process.exit(1);
-          }
+          ],
+          port: webPort,
+          hostname: webHost,
+          gracefulShutdown: false,
+          manual: true
         });
+        webServer.serve();
+        await webServer.ready();
         console.log(`Web server listening at http://${webHost}:${webPort}`);
         process.stdout.write(
           `API server starting at http://${apiHost}:${apiPort}...`
         );
-        await waitForPort(apiHost, apiPort);
+        await startUDServer(udEntryPath, apiHost, apiPort);
         process.stdout.write(
           `\rAPI server listening at http://${apiHost}:${apiPort}
 `
@@ -177,61 +194,25 @@ const builder = async (yargs) => {
         apiRootPath: argv.apiRootPath
       });
       if (argv.ud) {
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
         }
-        const udArgs = [];
-        if (argv.port) {
-          udArgs.push("--port", String(argv.port));
-        }
-        if (argv.host) {
-          udArgs.push("--host", argv.host);
-        }
-        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", (err) => {
-          console.error(
-            c.error(`
- Failed to start UD server: ${err.message}
-`)
-          );
-          process.exit(1);
-        });
         const apiPort = argv.port ?? parseInt(process.env.PORT ?? "8911", 10);
         const apiHost = argv.host ?? process.env.HOST ?? "localhost";
         process.stdout.write(
           `API server starting at http://${apiHost}:${apiPort}...`
         );
-        await waitForPort(apiHost, apiPort);
+        await startUDServer(udEntryPath, apiHost, apiPort);
         process.stdout.write(
           `\rAPI server listening at http://${apiHost}:${apiPort}
 `
         );
-        await new Promise((resolve, reject) => {
-          child.on("exit", (code) => {
-            if (code !== 0) {
-              reject(new Error(`UD server exited with code ${code}`));
-            } else {
-              resolve();
-            }
-          });
-        });
         return;
       }
       if (serverFileExists()) {
@@ -296,14 +277,11 @@ const builder = async (yargs) => {
         process.exit(1);
       }
       if (argv.ud) {
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
@@ -320,14 +298,11 @@ const builder = async (yargs) => {
         process.exit(1);
       }
       if (argv.ud) {
-        const udEntryPath = path.join(getPaths().api.dist, "ud", "index.js");
-        if (!fs.existsSync(udEntryPath)) {
+        const udEntryPath = resolveUDEntryPath();
+        if (!udEntryPath) {
           console.error(
             c.error(
-              `
- Universal Deploy server entry not found at ${udEntryPath}.
- Please run \`yarn cedar build --ud\` before serving.
-`
+              "\n Universal Deploy server entry not found.  Please run `yarn cedar build --ud` before serving.\n"
             )
           );
           process.exit(1);
@@ -372,34 +347,6 @@ function webSideIsBuilt(isStreamingOrRSC) {
     return fs.existsSync(path.join(getPaths().web.dist, "index.html"));
   }
 }
-function waitForPort(host, port) {
-  const maxAttempts = 50;
-  const intervalMs = 200;
-  return new Promise((resolve, reject) => {
-    let attempts = 0;
-    const tryConnect = () => {
-      attempts++;
-      const socket = net.createConnection({ host, port });
-      socket.on("connect", () => {
-        socket.destroy();
-        resolve();
-      });
-      socket.on("error", () => {
-        socket.destroy();
-        if (attempts >= maxAttempts) {
-          reject(
-            new Error(
-              `API server did not become ready on port ${port} after ${maxAttempts * intervalMs}ms`
-            )
-          );
-        } else {
-          setTimeout(tryConnect, intervalMs);
-        }
-      });
-    };
-    tryConnect();
-  });
-}
 export {
   builder,
   command,

package/dist/commands/serveApiHandler.js

@@ -1,16 +1,16 @@
-import execa from "execa";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths } from "@cedarjs/project-config";
-const apiServerFileHandler = async (argv) => {
-  const args = ["node", "server.js", "--apiRootPath", argv.apiRootPath];
+async function apiServerFileHandler(argv) {
+  const args = ["server.js", "--apiRootPath", argv.apiRootPath ?? "/"];
   if (argv.port) {
     args.push("--apiPort", String(argv.port));
   }
   const filteredArgs = args.filter((arg) => Boolean(arg));
-  await execa("yarn", filteredArgs, {
+  await runBin("node", filteredArgs, {
     cwd: getPaths().api.dist,
     stdio: "inherit"
   });
-};
+}
 export {
   apiServerFileHandler
 };

package/dist/commands/serveBothHandler.js

@@ -1,13 +1,15 @@
 import path from "path";
 import concurrently from "concurrently";
-import execa from "execa";
 import { handler as apiServerHandler } from "@cedarjs/api-server/cjs/apiCliConfigHandler";
 import {
   getAPIHost,
   getAPIPort,
+  getAPIRootPath,
   getWebHost,
   getWebPort
 } from "@cedarjs/api-server/cjs/cliHelpers";
+import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { exitWithError } from "../lib/exit.js";
@@ -18,7 +20,7 @@ const hasStringMessage = (error) => {
 const bothServerFileHandler = async (argv) => {
   if (getConfig().experimental?.rsc?.enabled || getConfig().experimental?.streamingSsr?.enabled) {
     logSkippingFastifyWebServer();
-    await execa("yarn", ["cedar-serve-fe"], {
+    await runBin("cedar-serve-fe", [], {
       cwd: getPaths().web.base,
       stdio: "inherit"
     });
@@ -27,24 +29,25 @@ const bothServerFileHandler = async (argv) => {
     argv.apiHost ??= getAPIHost();
     argv.webPort ??= getWebPort();
     argv.webHost ??= getWebHost();
+    const apiRootPath = argv.apiRootPath ?? getAPIRootPath();
     const apiProxyTarget = [
       "http://",
       argv.apiHost.includes(":") ? `[${argv.apiHost}]` : argv.apiHost,
       ":",
       argv.apiPort,
-      argv.apiRootPath
+      apiRootPath
     ].join("");
     const { result } = concurrently(
       [
         {
           name: "api",
-          command: `yarn node ${path.join("dist", "server.js")} --apiPort ${argv.apiPort} --apiHost ${argv.apiHost} --apiRootPath ${argv.apiRootPath}`,
+          command: `${formatRunBinCommand("node", [path.join("dist", "server.js"), "--apiPort", String(argv.apiPort), "--apiHost", argv.apiHost, "--apiRootPath", apiRootPath])}`,
           cwd: getPaths().api.base,
           prefixColor: "cyan"
         },
         {
           name: "web",
-          command: `yarn cedar-web-server --port ${argv.webPort} --host ${argv.webHost} --api-proxy-target ${apiProxyTarget}`,
+          command: `${formatRunBinCommand("cedar-web-server", ["--port", String(argv.webPort), "--host", argv.webHost, "--api-proxy-target", apiProxyTarget])}`,
           cwd: getPaths().base,
           prefixColor: "blue"
         }
@@ -71,11 +74,11 @@ const bothServerFileHandler = async (argv) => {
 };
 const bothSsrRscServerHandler = async (argv, rscEnabled) => {
   const apiPromise = apiServerHandler({
-    apiRootPath: argv.apiRootPath,
+    apiRootPath: argv.apiRootPath ?? getAPIRootPath(),
     host: argv.apiHost,
     port: argv.apiPort
   });
-  const fePromise = execa("yarn", ["cedar-serve-fe"], {
+  const fePromise = runBin("cedar-serve-fe", [], {
     cwd: getPaths().web.base,
     stdio: "inherit",
     env: rscEnabled ? {

package/dist/commands/serveWebHandler.js

@@ -1,7 +1,7 @@
-import execa from "execa";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths } from "@cedarjs/project-config";
 const webSsrServerHandler = async (rscEnabled) => {
-  await execa("yarn", ["cedar-serve-fe"], {
+  await runBin("cedar-serve-fe", [], {
     cwd: getPaths().web.base,
     stdio: "inherit",
     env: rscEnabled ? {

package/dist/commands/setup/auth/auth.js

@@ -1,11 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { terminalLink } from "termi-link";
 import {
   recordTelemetryAttributes,
   standardAuthBuilder
 } from "@cedarjs/cli-helpers";
+import { addRootPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { getPaths } from "../../../lib/index.js";
 const command = "auth <provider>";
 const description = "Set up an auth configuration";
@@ -198,7 +198,7 @@ async function getAuthSetupHandler(module) {
     } else {
       customRequire = require;
     }
-  } catch (error) {
+  } catch {
     customRequire = require;
   }
   const packageJsonPath = customRequire.resolve("@cedarjs/cli/package.json");
@@ -216,16 +216,22 @@ async function getAuthSetupHandler(module) {
       if (packument.error) {
         throw new Error(packument.error);
       }
-    } catch (error) {
+    } catch (e) {
       throw new Error(
-        `Couldn't fetch packument for ${module}: ${error.message}`
+        `Couldn't fetch packument for ${module}: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+    if (!packument.versions || typeof packument.versions !== "object" || Array.isArray(packument.versions)) {
+      throw new Error(
+        `Couldn't fetch packument for ${module}: invalid versions field`
       );
     }
     const versionIsPublished = Object.keys(packument.versions).includes(version);
     if (!versionIsPublished) {
       version = "canary";
     }
-    await execa.command(`yarn add -D ${module}@${version}`, {
+    await addRootPackages([`${module}@${version}`], {
+      dev: true,
       stdio: "inherit",
       cwd: getPaths().base
     });
@@ -254,7 +260,7 @@ function isInstalled(module) {
     return possiblePaths.some((modulePath) => {
       return fs.existsSync(path.join(modulePath, "package.json"));
     });
-  } catch (error) {
+  } catch {
     return false;
   }
 }

package/dist/commands/setup/cache/cacheHandler.js

@@ -14,15 +14,18 @@ const CLIENT_HOST_MAP = {
   memcached: "localhost:11211",
   redis: "redis://localhost:6379"
 };
-const handler = async ({ client, force }) => {
-  const extension = isTypeScriptProject ? "ts" : "js";
+const handler = async ({
+  client,
+  force
+}) => {
+  const extension = isTypeScriptProject() ? "ts" : "js";
   const tasks = new Listr([
     await addPackagesTask({
       packages: [CLIENT_PACKAGE_MAP[client]],
       side: "api"
     }),
     {
-      title: `Writing api/src/lib/cache.js`,
+      title: `Writing api/src/lib/cache.${extension}`,
       task: () => {
         const template = fs.readFileSync(
           path.join(
@@ -59,9 +62,11 @@ const handler = async ({ client, force }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/deploy/deploy.js

@@ -1,5 +1,3 @@
-const command = "deploy <target>";
-const description = "Setup deployment to various targets";
 import { terminalLink } from "termi-link";
 import * as setupDeployBaremetal from "./providers/baremetal.js";
 import * as setupDeployCoherence from "./providers/coherence.js";
@@ -7,8 +5,11 @@ import * as setupDeployFlightcontrol from "./providers/flightcontrol.js";
 import * as setupDeployNetlify from "./providers/netlify.js";
 import * as setupDeployRender from "./providers/render.js";
 import * as setupDeployServerless from "./providers/serverless.js";
+import * as setupDeployUniversalDeploy from "./providers/universal-deploy.js";
 import * as setupDeployVercel from "./providers/vercel.js";
-const builder = (yargs) => yargs.command(setupDeployBaremetal).command(setupDeployCoherence).command(setupDeployFlightcontrol).command(setupDeployNetlify).command(setupDeployRender).command(setupDeployServerless).command(setupDeployVercel).demandCommand().option("force", {
+const command = "deploy <target>";
+const description = "Setup deployment to various targets";
+const builder = (yargs) => yargs.command(setupDeployBaremetal).command(setupDeployCoherence).command(setupDeployFlightcontrol).command(setupDeployNetlify).command(setupDeployRender).command(setupDeployServerless).command(setupDeployUniversalDeploy).command(setupDeployVercel).demandCommand().option("force", {
   alias: "f",
   default: false,
   description: "Overwrite existing configuration",

package/dist/commands/setup/deploy/helpers/helpers.js

@@ -1,6 +1,10 @@
 function createHandler(componentName) {
   return async function handler(argv) {
-    const { handler: importedHandler } = await import(`../providers/${componentName}Handler.js`);
+    const { existsSync } = await import("node:fs");
+    const tsPath = `../providers/${componentName}Handler.ts`;
+    const jsPath = `../providers/${componentName}Handler.js`;
+    const resolvedPath = existsSync(new URL(tsPath, import.meta.url)) ? tsPath : jsPath;
+    const { handler: importedHandler } = await import(resolvedPath);
     return importedHandler(argv);
   };
 }