@cedarjs/cli 5.0.0-canary.2473 → 5.0.0-canary.2474

package/dist/commands/dev/devHandler.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { Writable } from "node:stream";
 import concurrently from "concurrently";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+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";
@@ -29,20 +30,16 @@ const handler = async ({
   const cedarPaths = getPaths();
   const serverFile = serverFileExists();
   const apiPreferredPort = parseInt(String(getConfig().api.port));
-  let apiAvailablePort;
+  let apiAvailablePort = apiPreferredPort;
   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;
+  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;
   }
   let webPreferredPort = parseInt(
     String(getConfig().web.port)
@@ -117,6 +114,11 @@ const handler = async ({
       }
     }
     if (!ud && !serverFile) {
+      if (typeof apiAvailablePort === "undefined" || apiAvailablePort === -1) {
+        exitWithError(void 0, {
+          message: `Could not determine a free port for the api server`
+        });
+      }
       try {
         await shutdownPort(apiAvailablePort);
       } catch (e) {
@@ -171,7 +173,7 @@ const handler = async ({
       return null;
     }
     return [
-      `yarn cross-env NODE_ENV=development cedar-unified-dev`,
+      `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-unified-dev"])}`,
       `  --port ${webAvailablePort}`,
       `  --apiPort ${apiAvailablePort}`,
       getApiDebugFlag(apiDebugPort, apiAvailablePort),
@@ -212,15 +214,11 @@ const handler = async ({
       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, " "),
+        command: formatRunBinCommand("nodemon", [
+          "--quiet",
+          `--watch "${cedarConfigPath}"`,
+          `--exec "${formatRunBinCommand(serverWatchCommand)} --port ${apiAvailablePort} ${getApiDebugFlag(apiDebugPort, apiAvailablePort)} | ${formatRunBinCommand("cedar-log-formatter")}"`
+        ]),
         env: {
           NODE_ENV: "development",
           NODE_OPTIONS: getDevNodeOptions()
@@ -230,9 +228,9 @@ const handler = async ({
       });
     }
     if (workspace.includes("web")) {
-      let webCommand = `yarn cross-env NODE_ENV=development cedar-vite-dev ${forward}`;
+      let webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-vite-dev"])} ${forward}`;
       if (streamingSsrEnabled) {
-        webCommand = `yarn cross-env NODE_ENV=development cedar-dev-fe ${forward}`;
+        webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-dev-fe"])} ${forward}`;
       }
       jobs.push({
         name: "web",
@@ -246,7 +244,7 @@ const handler = async ({
   if (generate) {
     jobs.push({
       name: "gen",
-      command: "yarn cedar-gen-watch",
+      command: formatRunBinCommand("cedar-gen-watch"),
       prefixColor: "green"
     });
   }

package/package.json

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