@cedarjs/cli 5.0.0-canary.0 → 5.0.0-canary.13874

package/dist/cfw.js

@@ -6,7 +6,7 @@ import execa from "execa";
 import { terminalLink } from "termi-link";
 import { getConfigPath } from "@cedarjs/project-config";
 const config = new Configstore("@cedarjs/cli");
-const CFW_PATH = process.env.CFW_PATH || process.env.RWFW_PATH || process.env.RW_PATH || config.get("CFW_PATH") || config.get("RWFW_PATH");
+const CFW_PATH = process.env.CFW_PATH || config.get("CFW_PATH");
 if (!CFW_PATH) {
   console.error("Error: You must specify the path to Cedar Framework");
   console.error("Usage: `CFW_PATH=~/gh/cedarjs/cedar yarn cfw <command>");

package/dist/commands/build/buildHandler.js

@@ -10,13 +10,17 @@ import {
   formatRunWorkspaceScriptCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { buildApi, cleanApiBuild } from "@cedarjs/internal/dist/build/api";
+import {
+  buildApiWithVite,
+  cleanApiBuild
+} from "@cedarjs/internal/dist/build/api";
 import { generate } from "@cedarjs/internal/dist/generate/generate";
 import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 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";
@@ -73,7 +77,8 @@ const handler = async ({
   workspace = ["api", "web", "packages/*"],
   verbose = false,
   prisma = true,
-  prerender = true
+  prerender = true,
+  ud = false
 }) => {
   recordTelemetryAttributes({
     command: "build",
@@ -158,17 +163,22 @@ 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 () => {
         await cleanApiBuild();
-        const { errors, warnings } = await buildApi();
-        if (errors.length) {
-          console.error(errors);
-        }
-        if (warnings.length) {
-          console.warn(warnings);
-        }
+        await buildApiWithVite();
+      }
+    },
+    ud && workspace.includes("api") && {
+      title: "Bundling API server entry (Universal Deploy)...",
+      task: async () => {
+        await buildUDApiServer({ verbose });
       }
     },
     workspace.includes("web") && {
@@ -177,14 +187,14 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
         process.env.VITE_CJS_IGNORE_WARNING = "true";
         const createdRequire = createRequire(import.meta.url);
         const buildBinPath = createdRequire.resolve(
-          "@cedarjs/vite/bins/rw-vite-build.mjs"
+          "@cedarjs/vite/bins/cedar-vite-build.mjs"
         );
         await execa(
           `node ${buildBinPath} --webDir="${cedarPaths.web.base}" --verbose=${verbose}`,
           {
             stdio: verbose ? "inherit" : "pipe",
             shell: true,
-            // `cwd` is needed for yarn to find the rw-vite-build binary
+            // `cwd` is needed for yarn to find the cedar-vite-build binary
             // It won't change process.cwd for anything else here, in this
             // process
             cwd: cedarPaths.web.base

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}
-`,
-      webPortChangeNeeded && ` - Web to use port ${webAvailablePort} instead`,
-      webPortChangeNeeded && "of your currently configured",
-      webPortChangeNeeded && `${webPreferredPort}
+      "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}
 `,
-      "\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) {
@@ -120,48 +110,101 @@ const handler = async ({
       console.error(c.error(`Error generating gqlorm schema: ${message}`));
     }
   }
-  const cedarConfigPath = getConfigPath();
   const streamingSsrEnabled = getConfig().experimental?.streamingSsr?.enabled;
   process.env.VITE_CJS_IGNORE_WARNING = "true";
-  let webCommand = `yarn cross-env NODE_ENV=development rw-vite-dev ${forward}`;
-  if (streamingSsrEnabled) {
-    webCommand = `yarn cross-env NODE_ENV=development rw-dev-fe ${forward}`;
-  }
   const rootPackageJsonPath = path.join(cedarPaths.base, "package.json");
   const rootPackageJson = JSON.parse(
     fs.readFileSync(rootPackageJsonPath, "utf8")
   );
-  const isEsm = rootPackageJson.type === "module";
-  const serverWatchCommand = isEsm ? `cedarjs-api-server-watch` : `rw-api-server-watch`;
+  const buildUnifiedDevCommand = () => {
+    if (!ud) {
+      return null;
+    }
+    if (streamingSsrEnabled) {
+      return null;
+    }
+    if (!workspace.includes("api") || !workspace.includes("web")) {
+      return null;
+    }
+    if (serverFile) {
+      return null;
+    }
+    if (!fs.existsSync(cedarPaths.api.src) || !fs.existsSync(cedarPaths.web.src)) {
+      console.log("api.src or web.src does not exist");
+      return null;
+    }
+    return [
+      `yarn cross-env NODE_ENV=development cedar-unified-dev`,
+      `  --port ${webAvailablePort}`,
+      `  --apiPort ${apiAvailablePort}`,
+      getApiDebugFlag(apiDebugPort, apiAvailablePort),
+      forward
+    ].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 (workspace.includes("api")) {
+  if (unifiedDevCommand) {
     jobs.push({
-      name: "api",
-      command: [
-        "yarn nodemon",
-        "  --quiet",
-        `  --watch "${cedarConfigPath}"`,
-        `  --exec "yarn ${serverWatchCommand}`,
-        `    --port ${apiAvailablePort}`,
-        `    ${getApiDebugFlag(apiDebugPort, apiAvailablePort)}`,
-        '    | rw-log-formatter"'
-      ].join(" ").replace(/\s+/g, " "),
+      name: "dev",
+      command: unifiedDevCommand,
       env: {
         NODE_ENV: "development",
         NODE_OPTIONS: getDevNodeOptions()
       },
       prefixColor: "cyan",
-      runWhen: () => fs.existsSync(cedarPaths.api.src)
-    });
-  }
-  if (workspace.includes("web")) {
-    jobs.push({
-      name: "web",
-      command: webCommand,
-      prefixColor: "blue",
-      cwd: cedarPaths.web.base,
-      runWhen: () => fs.existsSync(cedarPaths.web.src)
+      cwd: cedarPaths.web.base
     });
+  } else {
+    if (workspace.includes("api")) {
+      const isEsm = rootPackageJson.type === "module";
+      const serverWatchCommand = isEsm ? `cedarjs-api-server-watch` : `cedar-api-server-watch`;
+      const cedarConfigPath = getConfigPath();
+      jobs.push({
+        name: "api",
+        command: [
+          "yarn nodemon",
+          "  --quiet",
+          `  --watch "${cedarConfigPath}"`,
+          `  --exec "yarn ${serverWatchCommand}`,
+          `    --port ${apiAvailablePort}`,
+          `    ${getApiDebugFlag(apiDebugPort, apiAvailablePort)}`,
+          `    | cedar-log-formatter"`
+        ].join(" ").replace(/\s+/g, " "),
+        env: {
+          NODE_ENV: "development",
+          NODE_OPTIONS: getDevNodeOptions()
+        },
+        prefixColor: "cyan",
+        runWhen: () => fs.existsSync(cedarPaths.api.src)
+      });
+    }
+    if (workspace.includes("web")) {
+      let webCommand = `yarn cross-env NODE_ENV=development cedar-vite-dev ${forward}`;
+      if (streamingSsrEnabled) {
+        webCommand = `yarn cross-env NODE_ENV=development cedar-dev-fe ${forward}`;
+      }
+      jobs.push({
+        name: "web",
+        command: webCommand,
+        prefixColor: "blue",
+        cwd: cedarPaths.web.base,
+        runWhen: () => fs.existsSync(cedarPaths.web.src)
+      });
+    }
   }
   if (generate) {
     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/experimental/live-queries/templates/migration.sql.template

@@ -56,11 +56,13 @@ DECLARE
   cmd record;
   schema_name text;
   table_name text;
+  ident_parts text[];
 BEGIN
   FOR cmd IN SELECT * FROM pg_event_trigger_ddl_commands() LOOP
     IF cmd.object_type = 'table' THEN
       schema_name := cmd.schema_name;
-      table_name := regexp_replace(cmd.object_identity, '^.*\\.', '');
+      ident_parts := parse_ident(cmd.object_identity);
+      table_name := ident_parts[array_length(ident_parts, 1)];
 
       IF schema_name IS NULL THEN
         CONTINUE;

package/dist/commands/experimental/templates/opentelemetry.ts.template

@@ -24,11 +24,12 @@ const resource = Resource.default().merge(
 )
 
 const studioPort = getConfig().studio.basePort
+const apiUrl = getConfig().web.apiUrl.replace(/\/$/, '')
 const exporter = new OTLPTraceExporter({
   // Update this URL to point to where your OTLP compatible collector is listening
   // The redwood development studio (`yarn cedar exp studio`) can collect your
   // telemetry at `http://127.0.0.1:<PORT>/v1/traces` (default PORT is 4318)
-  url: `http://127.0.0.1:${studioPort}/.redwood/functions/otel-trace`,
+  url: `http://127.0.0.1:${studioPort}${apiUrl}/otel-trace`,
   concurrencyLimit: 64,
 })
 

package/dist/commands/jobsHandler.js

@@ -13,11 +13,11 @@ const handler = async ({
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     args.push(String(value));
   }
-  let command = `yarn rw-jobs ${args.join(" ")}`;
+  let command = `yarn cedar-jobs ${args.join(" ")}`;
   const originalLogLevel = process.env.LOG_LEVEL;
   process.env.LOG_LEVEL = originalLogLevel || "warn";
   if (process.env.NODE_ENV !== "production") {
-    command += " | yarn rw-log-formatter";
+    command += " | yarn cedar-log-formatter";
     process.env.LOG_LEVEL = originalLogLevel || "debug";
   }
   execa.commandSync(command, {

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/dist/commands/serveBothHandler.js

@@ -18,7 +18,7 @@ const hasStringMessage = (error) => {
 const bothServerFileHandler = async (argv) => {
   if (getConfig().experimental?.rsc?.enabled || getConfig().experimental?.streamingSsr?.enabled) {
     logSkippingFastifyWebServer();
-    await execa("yarn", ["rw-serve-fe"], {
+    await execa("yarn", ["cedar-serve-fe"], {
       cwd: getPaths().web.base,
       stdio: "inherit"
     });
@@ -44,7 +44,7 @@ const bothServerFileHandler = async (argv) => {
         },
         {
           name: "web",
-          command: `yarn rw-web-server --port ${argv.webPort} --host ${argv.webHost} --api-proxy-target ${apiProxyTarget}`,
+          command: `yarn cedar-web-server --port ${argv.webPort} --host ${argv.webHost} --api-proxy-target ${apiProxyTarget}`,
           cwd: getPaths().base,
           prefixColor: "blue"
         }
@@ -75,7 +75,7 @@ const bothSsrRscServerHandler = async (argv, rscEnabled) => {
     host: argv.apiHost,
     port: argv.apiPort
   });
-  const fePromise = execa("yarn", ["rw-serve-fe"], {
+  const fePromise = execa("yarn", ["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 { getPaths } from "@cedarjs/project-config";
 const webSsrServerHandler = async (rscEnabled) => {
-  await execa("yarn", ["rw-serve-fe"], {
+  await execa("yarn", ["cedar-serve-fe"], {
     cwd: getPaths().web.base,
     stdio: "inherit",
     env: rscEnabled ? {

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

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { getConfigPath } from "@cedarjs/project-config";
+import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
   const configTomlPath = getConfigPath();
@@ -25,6 +25,9 @@ const updateApiURLTask = (apiUrl) => {
     }
   };
 };
+function getUserApiUrl() {
+  return getConfig().web.apiUrl;
+}
 const preRequisiteCheckTask = (preRequisites) => {
   return {
     title: "Checking pre-requisites",
@@ -101,6 +104,7 @@ export {
   addFilesTask,
   addToDotEnvTask,
   addToGitIgnoreTask,
+  getUserApiUrl,
   preRequisiteCheckTask,
   updateApiURLTask
 };

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

@@ -7,7 +7,7 @@ import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
-import { updateApiURLTask } from "../helpers/index.js";
+import { getUserApiUrl, updateApiURLTask } from "../helpers/index.js";
 import {
   flightcontrolConfig,
   databaseEnvVariables,
@@ -47,7 +47,7 @@ const getFlightcontrolJson = async (database) => {
             ...flightcontrolConfig.environments[0],
             services: [
               ...flightcontrolConfig.environments[0].services.map((service) => {
-                if (service.id === "redwood-api") {
+                if (service.id === "cedar-api") {
                   return {
                     ...service,
                     envVariables: {
@@ -96,7 +96,7 @@ const updateGraphQLFunction = () => {
     Couldn't find graphql handler in api/src/functions/graphql.js.
     You'll have to add the following cors config manually:
 
-      cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true}
+      cors: { origin: process.env.CEDAR_WEB_URL, credentials: true}
     `);
         return;
       }
@@ -109,14 +109,14 @@ const updateGraphQLFunction = () => {
     Couldn't find graphql handler in api/src/functions/graphql.js.
     You'll have to add the following cors config manually:
 
-      cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true}
+      cors: { origin: process.env.CEDAR_WEB_URL, credentials: true}
     `);
         return;
       }
       graphqlContent.splice(
         graphqlHanderIndex + 1,
         0,
-        "  cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true },"
+        "  cors: { origin: process.env.CEDAR_WEB_URL, credentials: true },"
       );
       fs.writeFileSync(graphqlFunctionsPath, graphqlContent.join(EOL));
     }
@@ -158,14 +158,14 @@ const updateDbAuth = () => {
     Couldn't find DbAuthHandler in api/src/functions/auth.js.
     You'll have to add the following cors config manually:
 
-      cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true}
+      cors: { origin: process.env.CEDAR_WEB_URL, credentials: true}
     `);
         return;
       }
       authContent.splice(
         dbHandlerIndex + 1,
         0,
-        "  cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true },"
+        "  cors: { origin: process.env.CEDAR_WEB_URL, credentials: true },"
       );
       fs.writeFileSync(authFnPath, authContent.join(EOL));
     }
@@ -229,13 +229,17 @@ const addToDotEnvDefaultTask = () => {
 
         You'll have to add the following env var manually:
 
-        REDWOOD_API_URL=/.redwood/functions
+        CEDAR_API_URL=${getUserApiUrl()}
         `;
       }
     },
     task: async (_ctx) => {
       const env = path.resolve(getPaths().base, ".env.defaults");
-      const line = "\n\nREDWOOD_API_URL=/.redwood/functions\n";
+      const apiUrl = getUserApiUrl();
+      const line = `
+
+CEDAR_API_URL=${apiUrl}
+`;
       fs.appendFileSync(env, line);
     }
   };
@@ -266,7 +270,7 @@ const handler = async ({ force, database }) => {
       updateGraphQLFunction(),
       updateDbAuth(),
       updateApp(),
-      updateApiURLTask("${REDWOOD_API_URL}"),
+      updateApiURLTask("${CEDAR_API_URL}"),
       addToDotEnvDefaultTask(),
       printSetupNotes(notes)
     ],

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

@@ -5,7 +5,7 @@ import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
-import { addFilesTask, updateApiURLTask } from "../helpers/index.js";
+import { addFilesTask } from "../helpers/index.js";
 import {
   POSTGRES_YAML,
   RENDER_HEALTH_CHECK,
@@ -80,7 +80,6 @@ const handler = async ({ force, database }) => {
           return writeFilesTask(files, { overwriteExisting: force });
         }
       },
-      updateApiURLTask("/.redwood/functions"),
       // Add health check api function
       addFilesTask({
         files: additionalFiles,

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

@@ -10,8 +10,8 @@ const flightcontrolConfig = {
       },
       services: [
         {
-          id: "redwood-api",
-          name: "Redwood API",
+          id: "cedar-api",
+          name: "Cedar API",
           type: "web",
           buildType: "nixpacks",
           cpu: 0.5,
@@ -24,14 +24,14 @@ const flightcontrolConfig = {
             type: "ec2"
           },
           envVariables: {
-            REDWOOD_WEB_URL: {
-              fromService: { id: "redwood-web", value: "origin" }
+            CEDAR_WEB_URL: {
+              fromService: { id: "cedar-web", value: "origin" }
             }
           }
         },
         {
-          id: "redwood-web",
-          name: "Redwood Web",
+          id: "cedar-web",
+          name: "Cedar Web",
           type: "static",
           buildType: "nixpacks",
           singlePageApp: true,
@@ -41,8 +41,8 @@ const flightcontrolConfig = {
             type: "ec2"
           },
           envVariables: {
-            REDWOOD_API_URL: {
-              fromService: { id: "redwood-api", value: "origin" }
+            CEDAR_API_URL: {
+              fromService: { id: "cedar-api", value: "origin" }
             }
           }
         }

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

@@ -1,7 +1,9 @@
 import path from "path";
 import { getPaths } from "../../../../lib/index.js";
+import { getUserApiUrl } from "../helpers/index.js";
 const PROJECT_NAME = path.basename(getPaths().base);
 const RENDER_YAML = (database) => {
+  const apiUrl = getUserApiUrl().replace(/\/$/, "");
   return `# Quick links to the docs:
 # - Redwood on Render: https://render.com/docs/deploy-redwood
 # - Render's Blueprint spec: https://render.com/docs/yaml-spec
@@ -19,7 +21,7 @@ services:
 
   routes:
   - type: rewrite
-    source: /.redwood/functions/*
+    source: ${apiUrl}/*
     # Replace \`destination\` here after your first deploy:
     #
     # \`\`\`

package/dist/commands/setup/docker/templates/Dockerfile

@@ -99,7 +99,7 @@ ENV NODE_ENV=production
 # This is important if you intend to configure GraphQL to use Realtime.
 #
 # CMD [ "./api/dist/server.js" ]
-CMD [ "node_modules/.bin/cedarjs-server", "api" ]
+CMD ["node_modules/.bin/cedarjs-server", "api"]
 
 # web serve
 # ---------

package/dist/index.js

@@ -51,7 +51,6 @@ cwd ??= process.env.CEDAR_CWD;
 cwd ??= process.env.RWJS_CWD;
 cwd = getTomlDir(cwd);
 process.env.CEDAR_CWD = cwd;
-process.env.RWJS_CWD = cwd;
 if (process.argv[1]?.endsWith("redwood.js")) {
   const tomlPath = getConfigPath(cwd);
   const toml = fs.readFileSync(tomlPath, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.0+0428bd91ab",
+  "version": "5.0.0-canary.13874+8e13ad8024",
   "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": "5.0.0-canary.1",
-    "@cedarjs/cli-helpers": "5.0.0-canary.1",
-    "@cedarjs/fastify-web": "5.0.0-canary.1",
-    "@cedarjs/internal": "5.0.0-canary.1",
-    "@cedarjs/prerender": "5.0.0-canary.1",
-    "@cedarjs/project-config": "5.0.0-canary.1",
-    "@cedarjs/structure": "5.0.0-canary.1",
-    "@cedarjs/telemetry": "5.0.0-canary.1",
-    "@cedarjs/utils": "5.0.0-canary.1",
-    "@cedarjs/web-server": "5.0.0-canary.1",
+    "@cedarjs/api-server": "5.0.0-canary.13874",
+    "@cedarjs/cli-helpers": "5.0.0-canary.13874",
+    "@cedarjs/fastify-web": "5.0.0-canary.13874",
+    "@cedarjs/internal": "5.0.0-canary.13874",
+    "@cedarjs/prerender": "5.0.0-canary.13874",
+    "@cedarjs/project-config": "5.0.0-canary.13874",
+    "@cedarjs/structure": "5.0.0-canary.13874",
+    "@cedarjs/telemetry": "5.0.0-canary.13874",
+    "@cedarjs/utils": "5.0.0-canary.13874",
+    "@cedarjs/web-server": "5.0.0-canary.13874",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -50,7 +50,7 @@
     "@opentelemetry/resources": "1.30.1",
     "@opentelemetry/sdk-trace-node": "1.30.1",
     "@opentelemetry/semantic-conventions": "1.38.0",
-    "@prisma/internals": "7.7.0",
+    "@prisma/internals": "7.8.0",
     "ansis": "4.2.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
@@ -75,8 +75,8 @@
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
-    "prettier": "3.8.1",
-    "prisma": "7.7.0",
+    "prettier": "3.8.3",
+    "prisma": "7.8.0",
     "prompts": "2.4.2",
     "recast": "0.23.11",
     "rimraf": "6.1.3",
@@ -95,7 +95,7 @@
     "@babel/cli": "7.28.6",
     "@babel/core": "^7.26.10",
     "@types/archiver": "^7.0.0",
-    "memfs": "4.57.1",
+    "memfs": "4.57.2",
     "node-ssh": "13.2.1",
     "ts-dedent": "2.2.0",
     "tsx": "4.21.0",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0428bd91ab99f03f58990e119d30f1ef9db8b8c5"
+  "gitHead": "8e13ad80246a92eda7120fd66b98d3052daae274"
 }