@cedarjs/cli 5.0.0-canary.2446 → 5.0.0-canary.2448

package/dist/commands/build/buildHandler.js

@@ -232,7 +232,8 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           {
             stdio: verbose ? "inherit" : "pipe",
             shell: true,
-            // `cwd` is needed for yarn to find the cedar-vite-build binary
+            // `cwd` is needed for the package manager (e.g. 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/serveApiHandler.js

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

package/dist/commands/serveBothHandler.js

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

package/dist/commands/serveWebHandler.js

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

package/dist/commands/test/testHandler.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
@@ -125,7 +126,7 @@ const handler = async ({
       await warnIfNonStandardDatasourceUrl({ force });
     }
     const runCommand = async () => {
-      await execa("yarn", ["jest", ...jestArgs], {
+      await runBin("jest", jestArgs, {
         cwd: rwjsPaths.base,
         stdio: "inherit",
         env: { ...process.env, DATABASE_URL }

package/dist/commands/test/testHandlerEsm.js

@@ -1,5 +1,5 @@
-import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
@@ -76,7 +76,7 @@ const handler = async ({
       await warnIfNonStandardDatasourceUrl({ force });
     }
     const runCommand = async () => {
-      await execa("yarn", ["vitest", ...vitestArgs], {
+      await runBin("vitest", vitestArgs, {
         cwd: rwjsPaths.base,
         stdio: "inherit",
         env: { ...process.env, DATABASE_URL }

package/dist/commands/type-checkHandler.js

@@ -1,8 +1,9 @@
 import path from "node:path";
 import concurrently from "concurrently";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
 const isConcurrentlyErrorArray = (value) => {
@@ -30,7 +31,7 @@ const handler = async ({
       const projectDir = path.join(getPaths().base, side);
       return {
         cwd: projectDir,
-        command: "yarn tsc --noEmit --skipLibCheck"
+        command: formatRunBinCommand("tsc", ["--noEmit", "--skipLibCheck"])
       };
     });
     const { result } = concurrently(tscForAllSides, {
@@ -55,10 +56,7 @@ const handler = async ({
       [
         {
           title: "Generating types",
-          task: () => execa("yarn cedar-gen", {
-            shell: true,
-            stdio: verbose ? "inherit" : "ignore"
-          })
+          task: () => runBin("cedar-gen", [], { stdio: verbose ? "inherit" : "ignore" })
         }
       ],
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2446",
+  "version": "5.0.0-canary.2448",
   "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.2446",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2446",
-    "@cedarjs/fastify-web": "5.0.0-canary.2446",
-    "@cedarjs/internal": "5.0.0-canary.2446",
-    "@cedarjs/prerender": "5.0.0-canary.2446",
-    "@cedarjs/project-config": "5.0.0-canary.2446",
-    "@cedarjs/structure": "5.0.0-canary.2446",
-    "@cedarjs/telemetry": "5.0.0-canary.2446",
-    "@cedarjs/utils": "5.0.0-canary.2446",
-    "@cedarjs/vite": "5.0.0-canary.2446",
-    "@cedarjs/web-server": "5.0.0-canary.2446",
+    "@cedarjs/api-server": "5.0.0-canary.2448",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2448",
+    "@cedarjs/fastify-web": "5.0.0-canary.2448",
+    "@cedarjs/internal": "5.0.0-canary.2448",
+    "@cedarjs/prerender": "5.0.0-canary.2448",
+    "@cedarjs/project-config": "5.0.0-canary.2448",
+    "@cedarjs/structure": "5.0.0-canary.2448",
+    "@cedarjs/telemetry": "5.0.0-canary.2448",
+    "@cedarjs/utils": "5.0.0-canary.2448",
+    "@cedarjs/vite": "5.0.0-canary.2448",
+    "@cedarjs/web-server": "5.0.0-canary.2448",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",