@cedarjs/cli 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -1,11 +1,14 @@
 import fs from "node:fs";
 import path from "node:path";
 import boxen from "boxen";
+import execa from "execa";
 import { Listr } from "listr2";
 import * as toml from "smol-toml";
 import { env as envInterpolation } from "string-env-interpolation";
 import { titleCase } from "title-case";
-import c from "../../../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { getPaths } from "../../../lib/index.js";
 const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
@@ -14,7 +17,7 @@ const LIFECYCLE_HOOKS = ["before", "after"];
 const DEFAULT_SERVER_CONFIG = {
   port: 22,
   branch: "main",
-  packageManagerCommand: "yarn",
+  packageManagerCommand: getPackageManager(),
   monitorCommand: "pm2",
   sides: ["api", "web"],
   keepReleases: 5,
@@ -29,7 +32,7 @@ const throwMissingConfig = (name) => {
 const verifyConfig = (config, yargs) => {
   if (!yargs.environment) {
     throw new Error(
-      "Must specify an environment to deploy to, ex: `yarn cedar deploy baremetal production`"
+      `Must specify an environment to deploy to, ex: \`${formatCedarCommand(["deploy", "baremetal", "production"])}\``
     );
   }
   if (!config[yargs.environment]) {
@@ -47,20 +50,20 @@ const verifyServerConfig = (config) => {
   if (!config.repo) {
     throwMissingConfig("repo");
   }
-  if (!/^\d+$/.test(config.freeSpaceRequired)) {
+  if (!/^\d+$/.test(String(config.freeSpaceRequired))) {
     throw new Error('"freeSpaceRequired" must be an integer >= 0');
   }
   return true;
 };
-const symlinkCurrentCommand = async (dir, ssh, path2) => {
-  return await ssh.exec(path2, "ln", [
+const symlinkCurrentCommand = async (dir, ssh, deployPath) => {
+  return await ssh.exec(deployPath, "ln", [
     SYMLINK_FLAGS,
     dir,
     CURRENT_RELEASE_SYMLINK_NAME
   ]);
 };
-const restartProcessCommand = async (processName, ssh, serverConfig, path2) => {
-  return await ssh.exec(path2, serverConfig.monitorCommand, [
+const restartProcessCommand = async (processName, ssh, serverConfig, deployPath) => {
+  return await ssh.exec(deployPath, serverConfig.monitorCommand, [
     "restart",
     processName
   ]);
@@ -103,7 +106,7 @@ const maintenanceTasks = (status, ssh, serverConfig) => {
     }
   } else if (status === "down") {
     tasks.push({
-      title: `Starting ${serverConfig.processNames.join(", ")} processes...`,
+      title: `Starting ${serverConfig.processNames?.join(", ")} processes...`,
       task: async () => {
         await ssh.exec(serverConfig.path, serverConfig.monitorCommand, [
           "start",
@@ -130,7 +133,7 @@ const maintenanceTasks = (status, ssh, serverConfig) => {
 };
 const rollbackTasks = (count, ssh, serverConfig) => {
   let rollbackCount = 1;
-  if (parseInt(count) === count) {
+  if (parseInt(String(count)) === count) {
     rollbackCount = count;
   }
   const tasks = [
@@ -139,7 +142,7 @@ const rollbackTasks = (count, ssh, serverConfig) => {
       task: async () => {
         const currentLink = (await ssh.exec(serverConfig.path, "readlink", ["-f", "current"])).stdout.split("/").pop();
         const dirs = (await ssh.exec(serverConfig.path, "ls", ["-t"])).stdout.split("\n").filter((dirs2) => !dirs2.match(/current/));
-        const deployedIndex = dirs.indexOf(currentLink);
+        const deployedIndex = dirs.indexOf(currentLink ?? "");
         const rollbackIndex = deployedIndex + rollbackCount;
         if (dirs[rollbackIndex]) {
           console.info("Setting symlink");
@@ -150,7 +153,7 @@ const rollbackTasks = (count, ssh, serverConfig) => {
           );
         } else {
           throw new Error(
-            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - dirs.indexOf(currentLink) - 1} previous release(s) available`
+            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - dirs.indexOf(currentLink ?? "") - 1} previous release(s) available`
           );
         }
       }
@@ -188,19 +191,30 @@ const lifecycleTask = (lifecycle, task, skip, { serverLifecycle, ssh, cmdPath })
     return tasks;
   }
 };
-const commandWithLifecycleEvents = ({ name, config, skip, command }) => {
+const commandWithLifecycleEvents = ({
+  name,
+  config,
+  skip,
+  command
+}) => {
   const tasks = [];
   tasks.push(lifecycleTask("before", name, skip, config));
   tasks.push({ ...command, skip: () => skip });
   tasks.push(lifecycleTask("after", name, skip, config));
-  return tasks.flat().filter((t) => t);
+  return tasks.flat().filter((t) => Boolean(t));
 };
 const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
   const cmdPath = pathJoin(serverConfig.path, yargs.releaseDir);
-  const config = { yargs, ssh, serverConfig, serverLifecycle, cmdPath };
+  const config = {
+    yargs,
+    ssh,
+    serverConfig,
+    serverLifecycle,
+    cmdPath
+  };
   const tasks = [];
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "df",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.df || serverConfig.freeSpaceRequired === 0 || serverConfig.freeSpaceRequired === "0",
@@ -227,7 +241,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
           }
           task.output = `Available disk space: ${dfMb}MB`;
           const freeSpaceRequired = parseInt(
-            serverConfig.freeSpaceRequired ?? 2048,
+            String(serverConfig.freeSpaceRequired ?? 2048),
             10
           );
           if (dfMb < freeSpaceRequired) {
@@ -240,7 +254,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "update",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.update,
@@ -259,7 +273,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "symlinkEnv",
       config,
       skip: !yargs.update,
@@ -272,7 +286,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "install",
       config,
       skip: !yargs.install,
@@ -287,7 +301,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "migrate",
       config,
       skip: !yargs.migrate || serverConfig?.migrate === false,
@@ -295,17 +309,20 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
         title: `DB Migrations...`,
         task: async () => {
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "prisma",
             "migrate",
             "deploy"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "prisma",
             "generate"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "dataMigrate",
             "up"
@@ -316,7 +333,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
   );
   for (const side of serverConfig.sides) {
     tasks.push(
-      commandWithLifecycleEvents({
+      ...commandWithLifecycleEvents({
         name: "build",
         config,
         skip: !yargs.build,
@@ -324,6 +341,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
           title: `Building ${side}...`,
           task: async () => {
             await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+              "exec",
               "cedar",
               "build",
               side
@@ -334,7 +352,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     );
   }
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "symlinkCurrent",
       config,
       skip: !yargs.update,
@@ -351,7 +369,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     for (const processName of serverConfig.processNames) {
       if (yargs.firstRun) {
         tasks.push(
-          commandWithLifecycleEvents({
+          ...commandWithLifecycleEvents({
             name: "restart",
             config,
             skip: !yargs.restart,
@@ -379,7 +397,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
         });
       } else {
         tasks.push(
-          commandWithLifecycleEvents({
+          ...commandWithLifecycleEvents({
             name: "restart",
             config,
             skip: !yargs.restart,
@@ -400,7 +418,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     }
   }
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "cleanup",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.cleanup,
@@ -416,14 +434,15 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
       }
     })
   );
-  return tasks.flat().filter((e) => e);
+  return tasks;
 };
 const mergeLifecycleEvents = (lifecycle, other) => {
-  let lifecycleCopy = JSON.parse(JSON.stringify(lifecycle));
+  const lifecycleCopy = JSON.parse(JSON.stringify(lifecycle));
   for (const hook of LIFECYCLE_HOOKS) {
-    for (const key in other[hook]) {
+    const otherHook = other[hook] ?? {};
+    for (const key in otherHook) {
       lifecycleCopy[hook][key] = (lifecycleCopy[hook][key] || []).concat(
-        other[hook][key]
+        otherHook[key]
       );
     }
   }
@@ -432,26 +451,26 @@ const mergeLifecycleEvents = (lifecycle, other) => {
 const parseConfig = (yargs, rawConfigToml) => {
   const configToml = envInterpolation(rawConfigToml);
   const config = toml.parse(configToml);
-  let envConfig;
-  const emptyLifecycle = {};
+  const emptyLifecycle = { before: {}, after: {} };
   verifyConfig(config, yargs);
-  for (const hook of LIFECYCLE_HOOKS) {
-    emptyLifecycle[hook] = {};
-  }
   let envLifecycle = mergeLifecycleEvents(emptyLifecycle, config);
-  envConfig = config[yargs.environment];
+  const envConfig = config[yargs.environment];
   envLifecycle = mergeLifecycleEvents(envLifecycle, envConfig);
   return { envConfig, envLifecycle };
 };
 const commands = (yargs, ssh) => {
   const deployConfig = fs.readFileSync(pathJoin(getPaths().base, CONFIG_FILENAME)).toString();
-  let { envConfig, envLifecycle } = parseConfig(yargs, deployConfig);
-  let servers = [];
+  const { envConfig, envLifecycle } = parseConfig(yargs, deployConfig);
+  const servers = [];
   let tasks = [];
-  for (const config of envConfig.servers) {
+  const serverList = envConfig.servers ?? [];
+  for (const config of serverList) {
     const serverConfig = serverConfigWithDefaults(config, yargs);
     verifyServerConfig(serverConfig);
-    const serverLifecycle = mergeLifecycleEvents(envLifecycle, serverConfig);
+    const serverLifecycle = mergeLifecycleEvents(
+      envLifecycle,
+      serverConfig
+    );
     tasks.push({
       title: "Connecting...",
       task: () => ssh.connect({
@@ -460,9 +479,10 @@ const commands = (yargs, ssh) => {
         username: serverConfig.username,
         password: serverConfig.password,
         privateKey: serverConfig.privateKey,
+        // @ts-expect-error - node-ssh Config doesn't expose privateKeyPath but it is supported at runtime
         privateKeyPath: serverConfig.privateKeyPath,
         passphrase: serverConfig.passphrase,
-        agent: serverConfig.agentForward && process.env.SSH_AUTH_SOCK,
+        agent: serverConfig.agentForward ? process.env.SSH_AUTH_SOCK : void 0,
         agentForward: serverConfig.agentForward
       })
     });
@@ -481,43 +501,88 @@ const commands = (yargs, ssh) => {
       title: "Disconnecting...",
       task: () => ssh.dispose()
     });
+    const tasksCopy = [...tasks];
     servers.push({
       title: serverConfig.host,
       task: () => {
-        return new Listr(tasks);
+        return new Listr(tasksCopy);
       }
     });
+    tasks = [];
   }
   return servers;
 };
+const warnIfUnpushedCommits = async () => {
+  try {
+    const { stdout } = await execa("git", ["log", "@{u}..", "--oneline"], {
+      cwd: getPaths().base
+    });
+    const unpushedCommits = stdout.trim();
+    if (!unpushedCommits) {
+      return;
+    }
+    console.warn(
+      c.warning("\nWarning: You have local commits that have not been pushed:")
+    );
+    console.warn(
+      unpushedCommits.split("\n").map((line) => `  ${line}`).join("\n")
+    );
+    console.warn(
+      c.warning(
+        "The server will pull from the remote, so these commits will not be deployed.\n"
+      )
+    );
+    const { default: prompts } = await import("prompts");
+    const { confirmed } = await prompts({
+      type: "confirm",
+      name: "confirmed",
+      message: "Deploy anyway?",
+      initial: false
+    });
+    if (!confirmed) {
+      console.log("Aborting deploy. Push your commits and try again.");
+      process.exit(1);
+    }
+  } catch (e) {
+    console.error(
+      c.error("\nCould not check for unpushed commits before deploying.")
+    );
+    throw e;
+  }
+};
 const handler = async (yargs) => {
   const { SshExecutor } = await import("./SshExecutor.js");
   const tomlPath = path.join(getPaths().base, "deploy.toml");
   const ecosystemPath = path.join(getPaths().base, "ecosystem.config.js");
   if (!fs.existsSync(tomlPath) || !fs.existsSync(ecosystemPath)) {
     console.error(
-      c.error("\nError: Baremetal deploy has not been properly setup.\n") + "Please run `yarn cedar setup deploy baremetal` before deploying"
+      c.error("\nError: Baremetal deploy has not been properly setup.\n") + `Please run \`${formatCedarCommand(["setup", "deploy", "baremetal"])}\` before deploying`
     );
     process.exit(1);
   }
-  const ssh = new SshExecutor(yargs.verbose);
+  if (yargs.gitCheck) {
+    await warnIfUnpushedCommits();
+  }
+  const ssh = new SshExecutor(yargs.verbose ?? false);
   try {
-    const tasks = new Listr(commands(yargs, ssh), {
+    const listrTasks = new Listr(commands(yargs, ssh), {
       concurrent: true,
       exitOnError: true,
-      renderer: yargs.verbose && "verbose"
+      renderer: yargs.verbose ? "verbose" : void 0
     });
-    await tasks.run();
+    await listrTasks.run();
   } catch (e) {
     console.error(c.error("\nDeploy failed:"));
+    const errMessage = e instanceof Error && "stderr" in e ? e.stderr ?? e.message : e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;
     console.error(
-      boxen(e.stderr || e.message, {
+      boxen(errMessage, {
         padding: { top: 0, bottom: 0, right: 1, left: 1 },
         margin: 0,
         borderColor: "red"
       })
     );
-    process.exit(e?.exitCode || 1);
+    process.exit(exitCode);
   }
 };
 export {
@@ -533,5 +598,6 @@ export {
   serverConfigWithDefaults,
   throwMissingConfig,
   verifyConfig,
-  verifyServerConfig
+  verifyServerConfig,
+  warnIfUnpushedCommits
 };

package/dist/commands/deploy/baremetal.js

@@ -1,5 +1,6 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 const command = "baremetal [environment]";
 const description = "Deploy to baremetal server(s)";
 const builder = (yargs) => {
@@ -23,7 +24,7 @@ const builder = (yargs) => {
     type: "boolean"
   });
   yargs.option("install", {
-    describe: "Run `yarn install`",
+    describe: `Run \`${getPackageManager()} install\``,
     default: true,
     type: "boolean"
   });
@@ -70,9 +71,14 @@ const builder = (yargs) => {
     default: false,
     type: "boolean"
   });
+  yargs.option("git-check", {
+    describe: "Check for unpushed commits before deploying",
+    default: true,
+    type: "boolean"
+  });
   yargs.epilogue(
     `Also see the ${terminalLink(
-      "Redwood Baremetal Deploy Reference",
+      "Cedar Baremetal Deploy Reference",
       "https://cedarjs.com/docs/cli-commands#deploy"
     )}
 `
@@ -91,7 +97,8 @@ async function handler(yargs) {
     cleanup: yargs.cleanup,
     maintenance: yargs.maintenance,
     rollback: yargs.rollback,
-    verbose: yargs.verbose
+    verbose: yargs.verbose,
+    gitCheck: yargs.gitCheck
   });
   const { handler: baremetalHandler } = await import("./baremetal/baremetalHandler.js");
   return baremetalHandler(yargs);

package/dist/commands/deploy/flightcontrolHandler.js

@@ -1,8 +1,26 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import {
+  runBin,
+  runTransitiveBin,
+  runWithNode
+} from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths } from "@cedarjs/project-config";
+async function runBinWithThrow(bin, args, options) {
+  const result = await runBin(bin, args, options);
+  if (result.failed) {
+    throw new Error(`Command (${bin} ${args.join(" ")}) failed`);
+  }
+  return result;
+}
+async function runTransitiveBinWithThrow(bin, args, options) {
+  const result = await runTransitiveBin(bin, args, options);
+  if (result.failed) {
+    throw new Error(`Command (${bin} ${args.join(" ")}) failed`);
+  }
+  return result;
+}
 const handler = async ({
   side,
   serve,
@@ -22,33 +40,28 @@ const handler = async ({
     shell: true,
     stdio: "inherit"
   };
-  async function runExecaCommand(command) {
-    const result = await execa.command(command, execaConfig);
-    if (result.failed) {
-      throw new Error(`Command (${command}) failed`);
-    }
-    return result;
-  }
   async function runApiCommands() {
     if (!serve) {
       console.log("Building api...");
-      await runExecaCommand("yarn cedar build api --verbose");
+      await runBinWithThrow("cedar", ["build", "api", "--verbose"], execaConfig);
       if (prisma) {
         console.log("Running database migrations...");
-        await runExecaCommand(
-          `node_modules/.bin/prisma migrate deploy --config "${cedarPaths.api.prismaConfig}"`
+        await runTransitiveBinWithThrow(
+          "prisma",
+          ["migrate", "deploy", "--config", cedarPaths.api.prismaConfig],
+          execaConfig
         );
       }
       if (dataMigrate) {
         console.log("Running data migrations...");
-        await runExecaCommand("yarn cedar dataMigrate up");
+        await runBinWithThrow("cedar", ["dataMigrate", "up"], execaConfig);
       }
       return;
     }
     const serverFilePath = path.join(cedarPaths.api.dist, "server.js");
     const hasServerFile = fs.existsSync(serverFilePath);
     if (hasServerFile) {
-      execa(`yarn node ${serverFilePath}`, execaConfig);
+      runWithNode(serverFilePath, execaConfig);
     } else {
       const { handler: handler2 } = await import("@cedarjs/api-server/apiCliConfigHandler");
       handler2();
@@ -56,7 +69,7 @@ const handler = async ({
   }
   async function runWebCommands() {
     console.log("Building web...");
-    await runExecaCommand("yarn cedar build web --verbose");
+    await runBinWithThrow("cedar", ["build", "web", "--verbose"], execaConfig);
   }
   if (side === "api") {
     await runApiCommands();

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

@@ -1,17 +1,22 @@
 import execa from "execa";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths } from "@cedarjs/project-config";
-import c from "../../../lib/colors.js";
-const deployHandler = ({ build, prisma, dm: dataMigrate }) => {
+const deployHandler = ({
+  build,
+  prisma,
+  dm: dataMigrate
+}) => {
   const paths = getPaths();
-  let commandSet = [];
+  const commandSet = [];
   if (build) {
-    commandSet.push("yarn cedar build --verbose");
+    commandSet.push(formatCedarCommand(["build", "--verbose"]));
   }
   if (prisma) {
-    commandSet.push("yarn cedar prisma migrate deploy");
+    commandSet.push(formatCedarCommand(["prisma", "migrate", "deploy"]));
   }
   if (dataMigrate) {
-    commandSet.push("yarn cedar data-migrate up");
+    commandSet.push(formatCedarCommand(["data-migrate", "up"]));
   }
   const joinedCommands = commandSet.join(" && ");
   console.log(c.note("\nRunning:\n") + `${joinedCommands}

package/dist/commands/deploy/netlify.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { deployBuilder } from "./helpers/deployBuilder.js";
 const command = "netlify [...commands]";
 const description = "Build command for Netlify deploy";

package/dist/commands/deploy/packing/nft.js

@@ -52,10 +52,9 @@ async function packageSingleFunction(functionFile) {
     recursive: true,
     force: true
   });
-  return;
 }
 function nftPack() {
-  const filesToBePacked = findApiDistFunctions();
+  const filesToBePacked = findApiDistFunctions({ cwd: getPaths().api.base });
   return Promise.all(filesToBePacked.map(nftPacker.packageSingleFunction));
 }
 export {

package/dist/commands/deploy/render.js

@@ -1,6 +1,6 @@
 import { terminalLink } from "termi-link";
 if (process.argv.slice(2).includes("api")) {
-  process.env.REDWOOD_DISABLE_TELEMETRY = 1;
+  process.env.CEDAR_DISABLE_TELEMETRY = "1";
 }
 const command = "render <side>";
 const description = "Build, migrate, and serve command for Render deploy";

package/dist/commands/deploy/renderHandler.js

@@ -1,9 +1,19 @@
 import fs from "node:fs";
 import path from "path";
-import execa from "execa";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { formatAddRootPackagesCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import {
+  runBinSync,
+  runTransitiveBinSync,
+  runWithNode
+} from "@cedarjs/cli-helpers/packageManager/exec";
+import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths } from "@cedarjs/project-config";
-const handler = async ({ side, prisma, dataMigrate }) => {
+const handler = async ({
+  side,
+  prisma,
+  dataMigrate
+}) => {
   recordTelemetryAttributes({
     command: "deploy render",
     side,
@@ -19,8 +29,9 @@ const handler = async ({ side, prisma, dataMigrate }) => {
   async function runApiCommands() {
     if (prisma) {
       console.log("Running database migrations...");
-      execa.commandSync(
-        `node_modules/.bin/prisma migrate deploy --config "${cedarPaths.api.prismaConfig}"`,
+      runTransitiveBinSync(
+        "prisma",
+        ["migrate", "deploy", "--config", cedarPaths.api.prismaConfig],
         execaConfig
       );
     }
@@ -29,7 +40,7 @@ const handler = async ({ side, prisma, dataMigrate }) => {
       const packageJson = JSON.parse(
         fs.readFileSync(path.join(cedarPaths.base, "package.json"), "utf-8")
       );
-      const hasDataMigratePackage = !!packageJson.devDependencies["@cedarjs/cli-data-migrate"];
+      const hasDataMigratePackage = !!packageJson.devDependencies?.["@cedarjs/cli-data-migrate"];
       if (!hasDataMigratePackage) {
         console.error(
           [
@@ -38,26 +49,26 @@ const handler = async ({ side, prisma, dataMigrate }) => {
             "If you want to run data migrations, add the package to your project's root package.json and deploy again:",
             "",
             "```",
-            "yarn add -D @cedarjs/cli-data-migrate",
+            formatAddRootPackagesCommand(["@cedarjs/cli-data-migrate"], true),
             "```"
           ].join("\n")
         );
       } else {
-        execa.commandSync("yarn cedar dataMigrate up", execaConfig);
+        runBinSync("cedar", ["dataMigrate", "up"], execaConfig);
       }
     }
     const serverFilePath = path.join(cedarPaths.api.dist, "server.js");
     const hasServerFile = fs.existsSync(serverFilePath);
     if (hasServerFile) {
-      execa(`yarn node ${serverFilePath}`, execaConfig);
+      runWithNode(serverFilePath, execaConfig);
     } else {
-      const { handler: handler2 } = await import("@cedarjs/api-server/apiCliConfigHandler");
-      handler2();
+      const { handler: apiHandler } = await import("@cedarjs/api-server/apiCliConfigHandler");
+      apiHandler();
     }
   }
   async function runWebCommands() {
-    execa.commandSync("yarn install", execaConfig);
-    execa.commandSync("yarn cedar build web --verbose", execaConfig);
+    await installPackages(execaConfig);
+    runBinSync("cedar", ["build", "web", "--verbose"], execaConfig);
   }
   if (side === "api") {
     runApiCommands();