@cedarjs/cli 5.0.6 → 5.0.7-next.219

package/README.md

@@ -238,12 +238,9 @@ export const builder = (yargs) => {
 
     ...
 
-    .option('stats', {
-      default: false,
-      description: `Use ${terminalLink(
-        'Webpack Bundle Analyzer',
-        'https://github.com/webpack-contrib/webpack-bundle-analyzer'
-      )}`,
+    .option('prerender', {
+      default: true,
+      description: 'Prerender after building web',
       type: 'boolean',
     })
     .option('verbose', {
@@ -258,11 +255,11 @@ export const builder = (yargs) => {
 }
 ```
 
-These two calls to `options` configure this command to have options `--stats` and `--verbose`:
+These two calls to `options` configure this command to have options `--prerender` and `--verbose`:
 
 ```terminal
-yarn rw build --stats
-yarn rw build --verbose
+yarn cedar build --no-prerender
+yarn cedar build --verbose
 ```
 
 For the full list of what properties you can use to compose the options object, see [options(key, [opt])](https://yargs.js.org/docs/#api-optionskey-opt).
@@ -280,8 +277,8 @@ While `build`'s `handler` is too long to reproduce here in full, to get the poin
 
 export const handler = async ({
   side = ['api', 'web'],
+  prerender = true,
   verbose = false,
-  stats = false,
 }) => {
 
   ...

package/dist/cfw.js

@@ -40,6 +40,8 @@ try {
     // CEDAR_DISABLE_TELEMETRY
     env: { CEDAR_CWD: projectPath }
   });
-} catch {
+} catch (e) {
   console.log();
+  const exitCode = e && typeof e === "object" && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+  process.exit(exitCode);
 }

package/dist/commands/build/buildHandler.js

@@ -181,10 +181,14 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           "@cedarjs/vite/bins/cedar-vite-build.mjs"
         );
         await execa(
-          `node ${buildBinPath} --webDir="${cedarPaths.web.base}" --verbose=${verbose}`,
+          "node",
+          [
+            buildBinPath,
+            `--webDir=${cedarPaths.web.base}`,
+            `--verbose=${verbose}`
+          ],
           {
             stdio: verbose ? "inherit" : "pipe",
-            shell: true,
             cwd: cedarPaths.web.base
           }
         );
@@ -223,12 +227,16 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           "@cedarjs/vite/bins/cedar-vite-build.mjs"
         );
         await execa(
-          `node ${buildBinPath} --webDir="${cedarPaths.web.base}" --verbose=${verbose}`,
+          "node",
+          [
+            buildBinPath,
+            `--webDir=${cedarPaths.web.base}`,
+            `--verbose=${verbose}`
+          ],
           {
             stdio: verbose ? "inherit" : "pipe",
-            shell: true,
-            // `cwd` is needed for the package manager (e.g. yarn) to find the
-            // cedar-vite-build binary
+            // `cwd` makes postcss/tailwind config resolution work (see the
+            // @NOTE above)
             // It won't change process.cwd for anything else here, in this
             // process
             cwd: cedarPaths.web.base

package/dist/commands/console.js

@@ -1,9 +1,11 @@
 const command = "console";
 const aliases = ["c"];
-const description = "Launch an interactive Redwood shell (experimental)";
+const description = "Launch an interactive Cedar shell";
 const handler = async () => {
-  const { handler: handler2 } = await import("./consoleHandler.js");
-  return handler2();
+  console.log(
+    "`cedar console` has been removed from the Cedar CLI.\nRun it as a standalone tool instead:\n\n  yarn dlx @cedarjs/console\n  npx @cedarjs/console\n  pnpm dlx @cedarjs/console\n"
+  );
+  process.exit(1);
 };
 export {
   aliases,

package/dist/commands/dev/devHandler.js

@@ -1,4 +1,5 @@
 import fs from "node:fs";
+import { createRequire } from "node:module";
 import path from "node:path";
 import { Writable } from "node:stream";
 import concurrently from "concurrently";
@@ -7,6 +8,7 @@ import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display
 import { shutdownPort } from "@cedarjs/internal/dist/dev";
 import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { exitWithError } from "../../lib/exit.js";
 import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
@@ -15,13 +17,38 @@ import { getFreePort } from "../../lib/ports.js";
 import { serverFileExists } from "../../lib/project.js";
 import { getApiDebugFlag } from "./apiDebugFlag.js";
 import { getPackageWatchCommands } from "./packageWatchCommands.js";
+const createdRequire = createRequire(import.meta.url);
+function formatViteDevBinCommand(binName, extraNodeArgs = "") {
+  let vitePackageJsonPath;
+  let vitePackageJson;
+  try {
+    vitePackageJsonPath = createdRequire.resolve("@cedarjs/vite/package.json");
+    vitePackageJson = createdRequire("@cedarjs/vite/package.json");
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new Error(
+      `Could not resolve @cedarjs/vite, which the dev server needs to run. Is it installed? (${message})`
+    );
+  }
+  const binRelativePath = vitePackageJson.bin?.[binName];
+  if (!binRelativePath) {
+    throw new Error(
+      `@cedarjs/vite does not declare a "${binName}" bin. This is a bug in CedarJS.`
+    );
+  }
+  const binPath = path.join(path.dirname(vitePackageJsonPath), binRelativePath);
+  const nodeLauncher = getPackageManager() === "yarn" ? "yarn node" : "node";
+  const flags = extraNodeArgs ? `${extraNodeArgs} ` : "";
+  return `${nodeLauncher} ${flags}"${binPath}"`;
+}
 const handler = async ({
   workspace = ["api", "web", "packages/*"],
   forward = "",
   generate = true,
   apiDebugPort,
   debugBrk,
-  ud = false
+  ud = false,
+  nodeArgs = ""
 }) => {
   recordTelemetryAttributes({
     command: "dev",
@@ -174,7 +201,7 @@ const handler = async ({
       return null;
     }
     return [
-      `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-unified-dev"])}`,
+      formatViteDevBinCommand("cedar-unified-dev", nodeArgs),
       `  --port ${webAvailablePort}`,
       `  --apiPort ${apiAvailablePort}`,
       getApiDebugFlag(apiDebugPort, apiAvailablePort),
@@ -230,13 +257,16 @@ const handler = async ({
       });
     }
     if (workspace.includes("web")) {
-      let webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-vite-dev"])} ${forward}`;
+      let webCommand = `${formatViteDevBinCommand("cedar-vite-dev", nodeArgs)} ${forward}`;
       if (streamingSsrEnabled) {
-        webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-dev-fe"])} ${forward}`;
+        webCommand = `${formatViteDevBinCommand("cedar-dev-fe", nodeArgs)} ${forward}`;
       }
       jobs.push({
         name: "web",
         command: webCommand,
+        env: {
+          NODE_ENV: "development"
+        },
         prefixColor: "blue",
         cwd: cedarPaths.web.base,
         runWhen: () => fs.existsSync(cedarPaths.web.src)

package/dist/commands/dev.js

@@ -31,6 +31,9 @@ const builder = (yargs) => {
     type: "boolean",
     default: false,
     description: "Use the unified Vite dev server that handles both web and API in a single process (experimental)."
+  }).option("nodeArgs", {
+    type: "string",
+    description: 'CLI args to pass to the node process running the web dev server, for example: `--node-args="--inspect --max-old-space-size=8192"`.'
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -114,7 +114,7 @@ const handler = async ({
       },
       task: (_ctx, task) => {
         task.output = [
-          "Please add the following to your 'redwoodFastifyGraphQLServer' plugin options to enable OTel for your graphql",
+          "Please add the following to your 'cedarFastifyGraphQLServer' plugin options to enable OTel for your graphql",
           "openTelemetryOptions: {",
           "  resolvers: true,",
           "  result: true,",

package/dist/commands/generate/job/jobHandler.js

@@ -97,13 +97,11 @@ const handler = async ({
       {
         title: "Cleaning up...",
         task: () => {
-          runBinSync("eslint", [
-            "--fix",
-            "--config",
-            `${getPaths().base}/node_modules/@cedarjs/eslint-config/shared.js`,
-            `${getPaths().api.jobsConfig}`,
-            ...Object.keys(jobFiles)
-          ]);
+          runBinSync(
+            "eslint",
+            ["--fix", `${getPaths().api.jobsConfig}`, ...Object.keys(jobFiles)],
+            { cwd: getPaths().base }
+          );
         }
       }
     ],

package/dist/commands/generate/package/packageHandler.js

@@ -407,12 +407,9 @@ const handler = async ({
       {
         title: "Cleaning up...",
         task: () => {
-          runBinSync("eslint", [
-            "--fix",
-            "--config",
-            `${getPaths().base}/node_modules/@cedarjs/eslint-config/index.js`,
-            ...Object.keys(packageFiles)
-          ]);
+          runBinSync("eslint", ["--fix", ...Object.keys(packageFiles)], {
+            cwd: getPaths().base
+          });
         }
       }
     ],

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -42,6 +42,7 @@ import { files as serviceFiles } from "../service/serviceHandler.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
 const SKIPPABLE_ASSETS = ["scaffold.css"];
 const PACKAGE_SET = "Set";
+const PACKAGE_PRIVATE_SET = "PrivateSet";
 const getIdType = (model) => {
   return model.fields.find((field) => field.isId)?.type;
 };
@@ -512,6 +513,65 @@ const addHelperPackages = async (task) => {
     await removeWorkspacePackages("web", ["humanize-string"]);
   });
 };
+const isAuthSetup = () => {
+  const extensions = ["ts", "js", "tsx", "jsx"];
+  return extensions.some(
+    (ext) => fs.existsSync(path.join(getPaths().web.src, "auth." + ext))
+  );
+};
+const ROUTE_TAG_RE = /<Route\s+([^>]*?)\/?>/g;
+const extractRouteAttr = (tagAttrs, attrName) => tagAttrs.match(new RegExp(`\\b${attrName}=["']([^"']+)["']`))?.[1];
+const getRoutesFileContent = () => {
+  const routesPath = getPaths().web.routes;
+  if (!fs.existsSync(routesPath)) {
+    return void 0;
+  }
+  return readFile(routesPath).toString();
+};
+const hasLoginRoute = () => {
+  const content = getRoutesFileContent();
+  if (!content) {
+    return false;
+  }
+  return Array.from(content.matchAll(ROUTE_TAG_RE)).some(
+    ([, attrs]) => extractRouteAttr(attrs, "name") === "login"
+  );
+};
+const findUnprotectedLandingPageRouteName = () => {
+  const content = getRoutesFileContent();
+  if (!content) {
+    return void 0;
+  }
+  const privateSetRanges = Array.from(
+    content.matchAll(/<PrivateSet\b[^>]*>([\s\S]*?)<\/PrivateSet>/g)
+  ).map((match) => ({
+    start: match.index ?? 0,
+    end: (match.index ?? 0) + match[0].length
+  }));
+  for (const match of content.matchAll(ROUTE_TAG_RE)) {
+    const [, attrs] = match;
+    if (extractRouteAttr(attrs, "path") !== "/") {
+      continue;
+    }
+    const tagStart = match.index ?? 0;
+    const isProtected = privateSetRanges.some(
+      (range) => tagStart >= range.start && tagStart < range.end
+    );
+    if (!isProtected) {
+      return extractRouteAttr(attrs, "name");
+    }
+  }
+  return void 0;
+};
+const getUnauthenticatedRedirectRoute = () => {
+  if (!isAuthSetup()) {
+    return void 0;
+  }
+  if (hasLoginRoute()) {
+    return "login";
+  }
+  return findUnprotectedLandingPageRouteName();
+};
 const addSetImport = (task) => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
@@ -525,15 +585,19 @@ const addSetImport = (task) => {
     return void 0;
   }
   const routerImports = importContent.replace(/\s/g, "").split(",");
-  if (routerImports.includes(PACKAGE_SET)) {
+  const namesToImport = [
+    PACKAGE_SET,
+    ...getUnauthenticatedRedirectRoute() ? [PACKAGE_PRIVATE_SET] : []
+  ].filter((name) => !routerImports.includes(name));
+  if (!namesToImport.length) {
     return "Skipping Set import";
   }
   const newRoutesContent = routesContent.replace(
     cedarRouterImport,
-    importStart + spacing + PACKAGE_SET + `,` + spacing + importContent + importEnd
+    importStart + spacing + namesToImport.join("," + spacing) + `,` + spacing + importContent + importEnd
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
-  return "Added Set import to Routes.{jsx,tsx}";
+  return `Added ${namesToImport.join(", ")} import to Routes.{jsx,tsx}`;
 };
 const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const templateNames = getTemplateStrings(model, scaffoldPath);
@@ -542,10 +606,12 @@ const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const titleTo = templateNames.pluralRouteName;
   const buttonLabel = `New ${nameVars.singularPascalName}`;
   const buttonTo = templateNames.newRouteName;
+  const unauthenticatedRoute = getUnauthenticatedRedirectRoute();
   return addRoutesToRouterTask(
     await routes({ model, path: scaffoldPath }),
     "ScaffoldLayout",
-    { title, titleTo, buttonLabel, buttonTo }
+    { title, titleTo, buttonLabel, buttonTo },
+    unauthenticatedRoute ? { unauthenticated: unauthenticatedRoute } : void 0
   );
 };
 const tasks = ({
@@ -664,7 +730,10 @@ const splitPathAndModel = (pathSlashModel) => {
 };
 export {
   files,
+  getUnauthenticatedRedirectRoute,
   handler,
+  hasLoginRoute,
+  isAuthSetup,
   routes,
   shouldUseTailwindCSS,
   splitPathAndModel,

package/dist/commands/generate/sdl/sdlHandler.js

@@ -46,15 +46,8 @@ const addFieldGraphQLComment = (field, str) => {
 const modelFieldToSDL = ({
   field,
   required = true,
-  types = {},
   docs = false
 }) => {
-  if (Object.entries(types).length && field.kind === "object") {
-    const resolvedType = idType(types[field.type]);
-    if (typeof resolvedType === "string") {
-      field.type = resolvedType;
-    }
-  }
   const prismaTypeToGraphqlType = {
     Json: "JSON",
     Decimal: "Float",
@@ -73,7 +66,7 @@ const modelFieldToSDL = ({
 const querySDL = (model, docs = false) => {
   return model.fields.map((field) => modelFieldToSDL({ field, docs }));
 };
-const inputSDL = (model, required, types = {}, docs = false) => {
+const inputSDL = (model, required, docs = false) => {
   const ignoredFields = DEFAULT_IGNORE_FIELDS_FOR_INPUT;
   return model.fields.filter((field) => {
     const idField = model.fields.find((field2) => field2.isId);
@@ -81,21 +74,19 @@ const inputSDL = (model, required, types = {}, docs = false) => {
       ignoredFields.push(idField.name);
     }
     return !ignoredFields.includes(field.name) && field.kind !== "object";
-  }).map((field) => modelFieldToSDL({ field, required, types, docs }));
+  }).map((field) => modelFieldToSDL({ field, required, docs }));
 };
 function idInputSDL(idType2, docs) {
   if (!Array.isArray(idType2)) {
     return [];
   }
-  return idType2.map(
-    (field) => modelFieldToSDL({ field, required: true, types: {}, docs })
-  );
+  return idType2.map((field) => modelFieldToSDL({ field, required: true, docs }));
 }
-const createInputSDL = (model, types = {}, docs = false) => {
-  return inputSDL(model, true, types, docs);
+const createInputSDL = (model, docs = false) => {
+  return inputSDL(model, true, docs);
 };
-const updateInputSDL = (model, types = {}, docs = false) => {
-  return inputSDL(model, false, types, docs);
+const updateInputSDL = (model, docs = false) => {
+  return inputSDL(model, false, docs);
 };
 function idType(model, crud) {
   if (!crud || !model) {
@@ -131,21 +122,6 @@ const sdlFromSchemaModel = async (name, crud, docs = false) => {
     );
   }
   const model = schemaResult;
-  const resolvedTypes = await Promise.all(
-    model.fields.filter((field) => field.kind === "object").map(async (field) => {
-      const fieldModel = await getSchema(field.type);
-      return fieldModel && "fields" in fieldModel ? fieldModel : void 0;
-    })
-  );
-  const types = resolvedTypes.reduce(
-    (acc, cur) => {
-      if (!cur) {
-        return acc;
-      }
-      return { ...acc, [cur.name]: cur };
-    },
-    {}
-  );
   const enums = (await Promise.all(
     model.fields.filter((field) => field.kind === "enum").map(async (field) => {
       const enumDef = await getEnum(field.type);
@@ -159,8 +135,8 @@ const sdlFromSchemaModel = async (name, crud, docs = false) => {
     modelName,
     modelDescription,
     query: querySDL(model, docs).join("\n    "),
-    createInput: createInputSDL(model, types, docs).join("\n    "),
-    updateInput: updateInputSDL(model, types, docs).join("\n    "),
+    createInput: createInputSDL(model, docs).join("\n    "),
+    updateInput: updateInputSDL(model, docs).join("\n    "),
     idInput: idInputSDL(idTypeRes, docs).join("\n    "),
     idType: idType(model, crud),
     idName: idName(model, crud),

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -30,14 +30,8 @@ const customOrDefaultTemplatePath = ({
     generator,
     templatePath
   );
-  const deprecatedCustomPath = getPaths()[side].generators ? path.join(getPaths()[side].generators, generator, templatePath) : void 0;
   if (fs.existsSync(customPath)) {
     return customPath;
-  } else if (deprecatedCustomPath && fs.existsSync(deprecatedCustomPath)) {
-    console.log(
-      `Having generator templates in ${getPaths()[side].generators} has been deprecated. Please move them to ${getPaths().generatorTemplates}.`
-    );
-    return deprecatedCustomPath;
   } else {
     return defaultPath;
   }

package/dist/commands/lint.js

@@ -1,63 +1,8 @@
 import fs from "node:fs";
-import path from "node:path";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getPaths, getConfig } from "@cedarjs/project-config";
-function detectLegacyEslintConfig() {
-  const projectRoot = getPaths().base;
-  const legacyConfigFiles = [
-    ".eslintrc.js",
-    ".eslintrc.cjs",
-    ".eslintrc.json",
-    ".eslintrc.yaml",
-    ".eslintrc.yml"
-  ];
-  const foundLegacyFiles = [];
-  for (const configFile of legacyConfigFiles) {
-    if (fs.existsSync(path.join(projectRoot, configFile))) {
-      foundLegacyFiles.push(configFile);
-    }
-  }
-  const packageJsonPath = path.join(projectRoot, "package.json");
-  if (fs.existsSync(packageJsonPath)) {
-    try {
-      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-      if (packageJson.eslintConfig) {
-        foundLegacyFiles.push("package.json (eslintConfig field)");
-      }
-      if (packageJson.eslint) {
-        foundLegacyFiles.push("package.json (eslint field)");
-      }
-    } catch {
-    }
-  }
-  return foundLegacyFiles;
-}
-function showLegacyEslintDeprecationWarning(legacyFiles) {
-  console.warn("");
-  console.warn("\u26A0\uFE0F  DEPRECATION WARNING: Legacy ESLint Configuration Detected");
-  console.warn("");
-  console.warn("   The following legacy ESLint configuration files were found:");
-  legacyFiles.forEach((file) => {
-    console.warn(`   - ${file}`);
-  });
-  console.warn("");
-  console.warn(
-    "   Cedar has migrated to ESLint flat config format. Legacy configurations"
-  );
-  console.warn(
-    "   still work but are deprecated and will be removed in a future version."
-  );
-  console.warn("");
-  console.warn("   To migrate to the new format:");
-  console.warn("   1. Remove the legacy config file(s) listed above");
-  console.warn("   2. Create an eslint.config.mjs");
-  console.warn("   3. Use the flat config format with @cedarjs/eslint-config");
-  console.warn("");
-  console.warn("   See more here: https://github.com/cedarjs/cedar/pull/629");
-  console.warn("");
-}
+import { getPaths } from "@cedarjs/project-config";
 const command = "lint [paths..]";
 const description = "Lint your files";
 const builder = (yargs) => {
@@ -86,11 +31,6 @@ const handler = async ({
   format = "stylish"
 }) => {
   recordTelemetryAttributes({ command: "lint", fix, format });
-  const config = getConfig();
-  const legacyConfigFiles = detectLegacyEslintConfig();
-  if (legacyConfigFiles.length > 0 && config instanceof Object && "eslintLegacyConfigWarning" in config && config.eslintLegacyConfigWarning) {
-    showLegacyEslintDeprecationWarning(legacyConfigFiles);
-  }
   try {
     const sbPath = getPaths().web.storybook;
     const eslintArgs = [

package/dist/commands/prismaHandler.js

@@ -49,18 +49,15 @@ const handler = async ({
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     if (typeof value === "string") {
-      if (value.split(" ").length > 1) {
-        args.push(`"${value}"`);
-      } else {
-        args.push(value);
-      }
+      args.push(value);
     } else if (typeof value === "number") {
       args.push(String(value));
     }
   }
+  const displayCommand = args.map((arg) => arg.includes(" ") ? `"${arg}"` : arg).join(" ");
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline(`$ <pm exec> prisma ${args.join(" ")}`));
+  console.log(c.underline(`$ <pm exec> prisma ${displayCommand}`));
   console.log();
   try {
     runTransitiveBinSync("prisma", args, {

package/dist/commands/serve.js

@@ -6,11 +6,18 @@ import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
-import { projectIsEsm } from "@cedarjs/project-config";
 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 refuseServerFileUnderUD() {
+  console.error(
+    c.error(
+      "\n api/src/server.ts was detected, but a custom server file is not supported with --ud. It is a Fastify concept \u2014 anything registered there (Realtime, custom plugins, custom middleware) would silently be skipped if serving continued.\n"
+    )
+  );
+  process.exit(1);
+}
 function resolveUDEntryPath() {
   const base = path.join(getPaths().api.dist, "ud", "index");
   for (const ext of [".mjs", ".js"]) {
@@ -91,17 +98,13 @@ const builder = async (yargs) => {
           process.exit(1);
         }
         if (serverFileExists()) {
-          console.warn(
-            c.warning(
-              "\n Note: api/src/server.ts was detected. This file is a Fastify concept and will be ignored when using --ud. You are testing the experimental UD support, so the behavior will not match your production Fastify setup.\n"
-            )
-          );
+          refuseServerFileUnderUD();
         }
         const { getAPIHost, getAPIPort, getWebHost, getWebPort } = await import("@cedarjs/api-server/cliHelpers");
         const apiPort = argv.apiPort ?? getAPIPort();
         const apiHost = argv.apiHost ?? getAPIHost();
-        const webPort = argv.webPort ?? getWebPort();
-        const webHost = argv.webHost ?? getWebHost();
+        const webPort = argv.webPort ?? getWebPort({ isPublicSide: true });
+        const webHost = argv.webHost ?? getWebHost({ isPublicSide: true });
         const apiRootPath = argv.apiRootPath ?? "/";
         const apiTarget = `http://${apiHost.includes(":") ? `[${apiHost}]` : apiHost}:${apiPort}`;
         const { serveStatic } = await import("srvx/static");
@@ -162,12 +165,7 @@ const builder = async (yargs) => {
         const serveBothHandlers = await import("./serveBothHandler.js");
         await serveBothHandlers.bothSsrRscServerHandler(argv, rscEnabled);
       } else {
-        if (!projectIsEsm()) {
-          const { handler } = await import("@cedarjs/api-server/cjs/bothCliConfigHandler");
-          await handler(argv);
-        } else {
-          await bothServerCLIConfig.handler(argv);
-        }
+        await bothServerCLIConfig.handler(argv);
       }
     }
   }).command({
@@ -193,7 +191,15 @@ const builder = async (yargs) => {
         socket: argv.socket,
         apiRootPath: argv.apiRootPath
       });
+      const { getAPIHost, getAPIPort } = await import("@cedarjs/api-server/cliHelpers");
+      const apiPort = argv.port ?? getAPIPort({ isPublicSide: true });
+      const apiHost = argv.host ?? getAPIHost({ isPublicSide: true });
+      argv.port = apiPort;
+      argv.host = apiHost;
       if (argv.ud) {
+        if (serverFileExists()) {
+          refuseServerFileUnderUD();
+        }
         const udEntryPath = resolveUDEntryPath();
         if (!udEntryPath) {
           console.error(
@@ -203,8 +209,6 @@ const builder = async (yargs) => {
           );
           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}...`
         );
@@ -219,12 +223,7 @@ const builder = async (yargs) => {
         const { apiServerFileHandler } = await import("./serveApiHandler.js");
         await apiServerFileHandler(argv);
       } else {
-        if (!projectIsEsm()) {
-          const { handler } = await import("@cedarjs/api-server/cjs/apiCliConfigHandler");
-          await handler(argv);
-        } else {
-          await apiServerCLIConfig.handler(argv);
-        }
+        await apiServerCLIConfig.handler(argv);
       }
     }
   }).command({