@cedarjs/cli 5.0.0-canary.2479 → 5.0.0-canary.2480

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

@@ -7,6 +7,7 @@ import * as toml from "smol-toml";
 import { env as envInterpolation } from "string-env-interpolation";
 import { titleCase } from "title-case";
 import { colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths } from "../../../lib/index.js";
 const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
@@ -30,7 +31,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]) {
@@ -535,7 +536,7 @@ const handler = async (yargs) => {
   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);
   }

package/dist/commands/deploy/flightcontrolHandler.js

@@ -2,7 +2,18 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import {
+  getNodeRunnerArgs,
+  runBin
+} from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths } from "@cedarjs/project-config";
+async function runBinWithError(bin, args, options) {
+  const result = await runBin(bin, args, options);
+  if (result.failed) {
+    throw new Error(`Command (${bin} ${args.join(" ")}) failed`);
+  }
+  return result;
+}
 const handler = async ({
   side,
   serve,
@@ -22,33 +33,27 @@ 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 runBinWithError("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 execa.command(
+          `node_modules/.bin/prisma migrate deploy --config "${cedarPaths.api.prismaConfig}"`,
+          execaConfig
         );
       }
       if (dataMigrate) {
         console.log("Running data migrations...");
-        await runExecaCommand("yarn cedar dataMigrate up");
+        await runBinWithError("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);
+      execa(...getNodeRunnerArgs(serverFilePath), execaConfig);
     } else {
       const { handler: handler2 } = await import("@cedarjs/api-server/apiCliConfigHandler");
       handler2();
@@ -56,7 +61,7 @@ const handler = async ({
   }
   async function runWebCommands() {
     console.log("Building web...");
-    await runExecaCommand("yarn cedar build web --verbose");
+    await runBinWithError("cedar", ["build", "web", "--verbose"], execaConfig);
   }
   if (side === "api") {
     await runApiCommands();

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

@@ -1,17 +1,18 @@
 import execa from "execa";
 import { colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths } from "@cedarjs/project-config";
 const deployHandler = ({ build, prisma, dm: dataMigrate }) => {
   const paths = getPaths();
   let 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/renderHandler.js

@@ -2,6 +2,12 @@ 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 {
+  getNodeRunnerArgs,
+  runBinSync
+} from "@cedarjs/cli-helpers/packageManager/exec";
+import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { getPaths } from "@cedarjs/project-config";
 const handler = async ({ side, prisma, dataMigrate }) => {
   recordTelemetryAttributes({
@@ -38,26 +44,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);
+      execa(...getNodeRunnerArgs(serverFilePath), execaConfig);
     } else {
       const { handler: handler2 } = await import("@cedarjs/api-server/apiCliConfigHandler");
       handler2();
     }
   }
   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();

package/dist/commands/deploy/serverlessHandler.js

@@ -7,22 +7,36 @@ import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import {
+  formatAddRootPackagesCommand,
+  formatRunBinCommand
+} from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths } from "../../lib/index.js";
 const preRequisites = () => [
   {
     title: "Checking if Serverless framework is installed...",
-    command: ["yarn serverless", ["--version"]],
-    errorMessage: [
-      "Looks like Serverless is not installed.",
-      "Please run yarn add -W --dev serverless."
-    ]
+    task: async () => {
+      try {
+        await runBin("serverless", ["--version"], { shell: true });
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        throw new Error(
+          `${msg}
+Looks like Serverless is not installed.
+Please run ${formatAddRootPackagesCommand(["serverless"], true)}.`
+        );
+      }
+    }
   }
 ];
 const buildCommands = ({ sides }) => {
   return [
     {
       title: `Building ${sides.join(" & ")}...`,
-      command: ["yarn", ["cedar", "build", ...sides]]
+      task: async () => {
+        await runBin("cedar", ["build", ...sides], { shell: true });
+      }
     },
     {
       title: "Packing Functions...",
@@ -40,7 +54,7 @@ const deployCommands = ({ stage, sides, firstRun, packOnly }) => {
     return {
       title: `Deploying ${side}....`,
       task: async () => {
-        await execa("yarn", ["serverless", "deploy", ...slsStage], {
+        await runBin("serverless", ["deploy", ...slsStage], {
           cwd: path.join(getPaths().base, side),
           shell: true,
           stdio: "inherit",
@@ -93,8 +107,9 @@ const handler = async (yargs) => {
       const SETUP_MARKER = ansis.bgBlue.black("First Setup ");
       console.log();
       console.log(SETUP_MARKER, c.success("Starting first setup wizard..."));
-      const { stdout: slsInfo } = await execa(
-        `yarn serverless info --verbose --stage=${yargs.stage}`,
+      const { stdout: slsInfo } = await runBin(
+        "serverless",
+        ["info", "--verbose", `--stage=${yargs.stage}`],
         {
           shell: true,
           cwd: getPaths().api.base
@@ -139,8 +154,9 @@ const handler = async (yargs) => {
           }
         );
         await webDeployTasks.run();
-        const { stdout: slsInfo2 } = await execa(
-          `yarn serverless info --verbose --stage=${yargs.stage}`,
+        const { stdout: slsInfo2 } = await runBin(
+          "serverless",
+          ["info", "--verbose", `--stage=${yargs.stage}`],
           {
             shell: true,
             cwd: getPaths().web.base
@@ -153,7 +169,7 @@ const handler = async (yargs) => {
           `View your deployed site at: ${c.success(deployedWebUrl)}`,
           "",
           "You can use serverless.com CI/CD by connecting/creating an app",
-          "To do this run `yarn serverless` on each of the sides, and connect your account",
+          `To do this run \`${formatRunBinCommand("serverless")}\` on each of the sides, and connect your account`,
           "",
           "Find more information in our docs:",
           c.underline("https://cedarjs.com/docs/deploy#serverless")

package/dist/lib/index.js

@@ -13,6 +13,10 @@ import template from "lodash/template.js";
 import pascalcase from "pascalcase";
 import { format } from "prettier";
 import { colors as c } from "@cedarjs/cli-helpers";
+import {
+  addRootPackages,
+  addWorkspacePackages
+} from "@cedarjs/cli-helpers/packageManager/packages";
 import {
   getConfig as getRedwoodConfig,
   getPaths as getRedwoodPaths,
@@ -364,30 +368,18 @@ const addPackagesTask = async ({
       return pkg;
     }
   });
-  let installCommand;
-  if (side !== "project") {
-    installCommand = [
-      "yarn",
-      [
-        "workspace",
-        side,
-        "add",
-        devDependency && "--dev",
-        ...packagesWithSameRWVersion
-      ].filter(Boolean)
-    ];
-  } else {
-    installCommand = [
-      "yarn",
-      ["add", devDependency && "--dev", ...packagesWithSameRWVersion].filter(
-        Boolean
-      )
-    ];
-  }
   return {
     title: `Adding dependencies to ${side}`,
     task: async () => {
-      await execa(...installCommand);
+      if (side !== "project") {
+        await addWorkspacePackages(side, packagesWithSameRWVersion, {
+          dev: devDependency
+        });
+      } else {
+        await addRootPackages(packagesWithSameRWVersion, {
+          dev: devDependency
+        });
+      }
     }
   };
 };

package/dist/lib/updateCheck.js

@@ -4,6 +4,8 @@ import ansis from "ansis";
 import boxen from "boxen";
 import latestVersion from "latest-version";
 import semver from "semver";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { getNodeRunnerArgs } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig } from "@cedarjs/project-config";
 import { spawnBackgroundProcess } from "./background.js";
 import { isLockSet, setLock, unsetLock } from "./locking.js";
@@ -88,7 +90,7 @@ function getUpdateMessage() {
   const data = readUpdateDataFile();
   const localTag = extractTagFromVersion(data.localVersion) || "latest";
   let updateCount = 0;
-  let message = " New updates to Cedar are available via `yarn cedar upgrade#REPLACEME#` ";
+  let message = ` New updates to Cedar are available via \`${formatCedarCommand(["upgrade#REPLACEME#"])}\` `;
   data.remoteVersions.forEach((version, tag) => {
     if (semver.gt(version, data.localVersion)) {
       updateCount += 1;
@@ -182,10 +184,10 @@ function updateCheckMiddleware(argv) {
   }
   if (shouldCheck()) {
     setLock(CHECK_LOCK_IDENTIFIER);
-    spawnBackgroundProcess("updateCheck", "yarn", [
-      "node",
+    const [bgCmd, bgArgs] = getNodeRunnerArgs(
       path.join(import.meta.dirname, "updateCheckExecute.js")
-    ]);
+    );
+    spawnBackgroundProcess("updateCheck", bgCmd, bgArgs);
   } else if (shouldShow()) {
     setLock(SHOW_LOCK_IDENTIFIER);
     process.on("exit", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2479",
+  "version": "5.0.0-canary.2480",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.3",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.2479",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2479",
-    "@cedarjs/fastify-web": "5.0.0-canary.2479",
-    "@cedarjs/internal": "5.0.0-canary.2479",
-    "@cedarjs/prerender": "5.0.0-canary.2479",
-    "@cedarjs/project-config": "5.0.0-canary.2479",
-    "@cedarjs/structure": "5.0.0-canary.2479",
-    "@cedarjs/telemetry": "5.0.0-canary.2479",
-    "@cedarjs/utils": "5.0.0-canary.2479",
-    "@cedarjs/vite": "5.0.0-canary.2479",
-    "@cedarjs/web-server": "5.0.0-canary.2479",
+    "@cedarjs/api-server": "5.0.0-canary.2480",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2480",
+    "@cedarjs/fastify-web": "5.0.0-canary.2480",
+    "@cedarjs/internal": "5.0.0-canary.2480",
+    "@cedarjs/prerender": "5.0.0-canary.2480",
+    "@cedarjs/project-config": "5.0.0-canary.2480",
+    "@cedarjs/structure": "5.0.0-canary.2480",
+    "@cedarjs/telemetry": "5.0.0-canary.2480",
+    "@cedarjs/utils": "5.0.0-canary.2480",
+    "@cedarjs/vite": "5.0.0-canary.2480",
+    "@cedarjs/web-server": "5.0.0-canary.2480",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",