@cedarjs/cli 5.0.0-canary.2533 → 5.0.0-canary.2535

package/dist/commands/prismaHandler.js

@@ -1,11 +1,11 @@
 import fs from "node:fs";
 import boxen from "boxen";
-import execa from "execa";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   formatCedarCommand,
   formatRunBinCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
+import { runTransitiveBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../lib/index.js";
 const getErrorMessage = (error) => {
@@ -60,10 +60,10 @@ const handler = async ({
   }
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline(`$ npx prisma ${args.join(" ")}`));
+  console.log(c.underline(`$ <pm exec> prisma ${args.join(" ")}`));
   console.log();
   try {
-    execa.sync("npx", ["prisma", ...args], {
+    runTransitiveBinSync("prisma", args, {
       cwd: cedarPaths.base,
       stdio: "inherit"
     });

package/dist/commands/setup/deploy/providers/flightcontrolHandler.js

@@ -4,18 +4,20 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
 import { getUserApiUrl, updateApiURLTask } from "../helpers/index.js";
 import {
-  flightcontrolConfig,
+  getFlightcontrolConfig,
   databaseEnvVariables,
   postgresDatabaseService,
   mysqlDatabaseService
 } from "../templates/flightcontrol.js";
 const { getConfig } = prismaInternals;
 const getFlightcontrolJson = async (database) => {
+  const flightcontrolConfig = getFlightcontrolConfig();
   if (database === "none") {
     return {
       path: path.join(getPaths().base, "flightcontrol.json"),
@@ -69,8 +71,8 @@ const getFlightcontrolJson = async (database) => {
     Prisma datasource provider is detected to be ${detectedDatabase}.
 
     Update your schema.prisma provider to be postgresql or mysql, then run
-    yarn cedar prisma migrate dev
-    yarn cedar setup deploy flightcontrol
+    ${formatCedarCommand(["prisma", "migrate", "dev"])}
+    ${formatCedarCommand(["setup", "deploy", "flightcontrol"])}
     `);
   }
 };

package/dist/commands/setup/deploy/providers/netlifyHandler.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,
@@ -34,7 +35,7 @@ const notes = [
 ];
 const udNotes = [
   "You are ready to deploy to Netlify with Universal Deploy!",
-  "Build with: yarn cedar build --ud",
+  `Build with: ${formatCedarCommand(["build", "--ud"])}`,
   "See: https://cedarjs.com/docs/deploy/netlify"
 ];
 function addNetlifyPluginsToViteConfigTask() {

package/dist/commands/setup/deploy/providers/vercelHandler.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,
@@ -113,32 +114,37 @@ const vercelConfig = {
     }
   }
 };
-const vercelUDConfig = {
-  build: {
-    command: "yarn cedar build --ud --verbose --apiRootPath=/.api/functions",
-    env: {
-      ENABLE_EXPERIMENTAL_COREPACK: "1"
-    }
-  }
-};
 const notes = [
   "You are ready to deploy to Vercel!",
   "See: https://cedarjs.com/docs/deploy#vercel-deploy"
 ];
 const udNotes = [
   "You are ready to deploy to Vercel with Universal Deploy!",
-  "Build with: yarn cedar build --ud",
+  `Build with: ${formatCedarCommand(["build", "--ud"])}`,
   "See: https://cedarjs.com/docs/deploy#vercel-deploy"
 ];
 function writeVercelUDConfigTask({
   overwriteExisting = false
 } = {}) {
+  const config = {
+    build: {
+      command: formatCedarCommand([
+        "build",
+        "--ud",
+        "--verbose",
+        "--apiRootPath=/.api/functions"
+      ]),
+      env: {
+        ENABLE_EXPERIMENTAL_COREPACK: "1"
+      }
+    }
+  };
   return {
     title: "Writing vercel.json for Universal Deploy...",
     task: (_ctx, task) => {
       writeFile(
         path.join(getPaths().base, "vercel.json"),
-        JSON.stringify(vercelUDConfig, null, 2),
+        JSON.stringify(config, null, 2),
         { overwriteExisting },
         task
       );

package/dist/commands/setup/deploy/templates/flightcontrol.js

@@ -1,55 +1,66 @@
-const flightcontrolConfig = {
-  $schema: "https://app.flightcontrol.dev/schema.json",
-  environments: [
-    {
-      id: "development",
-      name: "Development",
-      region: "us-east-1",
-      source: {
-        branch: "main"
-      },
-      services: [
-        {
-          id: "cedar-api",
-          name: "Cedar API",
-          type: "web",
-          buildType: "nixpacks",
-          cpu: 0.5,
-          memory: 1,
-          buildCommand: "yarn cedar deploy flightcontrol api",
-          startCommand: "yarn cedar deploy flightcontrol api --serve",
-          port: 8911,
-          healthCheckPath: "/graphql/health",
-          ci: {
-            type: "ec2"
-          },
-          envVariables: {
-            CEDAR_WEB_URL: {
-              fromService: { id: "cedar-web", value: "origin" }
-            }
-          }
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+function getFlightcontrolConfig() {
+  const apiBuildCommand = formatCedarCommand(["deploy", "flightcontrol", "api"]);
+  const apiStartCommand = formatCedarCommand([
+    "deploy",
+    "flightcontrol",
+    "api",
+    "--serve"
+  ]);
+  const webBuildCommand = formatCedarCommand(["deploy", "flightcontrol", "web"]);
+  return {
+    $schema: "https://app.flightcontrol.dev/schema.json",
+    environments: [
+      {
+        id: "development",
+        name: "Development",
+        region: "us-east-1",
+        source: {
+          branch: "main"
         },
-        {
-          id: "cedar-web",
-          name: "Cedar Web",
-          type: "static",
-          buildType: "nixpacks",
-          singlePageApp: true,
-          buildCommand: "yarn cedar deploy flightcontrol web",
-          outputDirectory: "web/dist",
-          ci: {
-            type: "ec2"
+        services: [
+          {
+            id: "cedar-api",
+            name: "Cedar API",
+            type: "web",
+            buildType: "nixpacks",
+            cpu: 0.5,
+            memory: 1,
+            buildCommand: apiBuildCommand,
+            startCommand: apiStartCommand,
+            port: 8911,
+            healthCheckPath: "/graphql/health",
+            ci: {
+              type: "ec2"
+            },
+            envVariables: {
+              CEDAR_WEB_URL: {
+                fromService: { id: "cedar-web", value: "origin" }
+              }
+            }
           },
-          envVariables: {
-            CEDAR_API_URL: {
-              fromService: { id: "cedar-api", value: "origin" }
+          {
+            id: "cedar-web",
+            name: "Cedar Web",
+            type: "static",
+            buildType: "nixpacks",
+            singlePageApp: true,
+            buildCommand: webBuildCommand,
+            outputDirectory: "web/dist",
+            ci: {
+              type: "ec2"
+            },
+            envVariables: {
+              CEDAR_API_URL: {
+                fromService: { id: "cedar-api", value: "origin" }
+              }
             }
           }
-        }
-      ]
-    }
-  ]
-};
+        ]
+      }
+    ]
+  };
+}
 const postgresDatabaseService = {
   id: "db",
   name: "Database",
@@ -79,7 +90,7 @@ const databaseEnvVariables = {
 };
 export {
   databaseEnvVariables,
-  flightcontrolConfig,
+  getFlightcontrolConfig,
   mysqlDatabaseService,
   postgresDatabaseService
 };

package/dist/commands/setup/deploy/templates/netlify.js

@@ -1,7 +1,8 @@
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getConfig } from "../../../../lib/index.js";
 const config = getConfig();
 const NETLIFY_TOML = `[build]
-  command = "yarn cedar deploy netlify"
+  command = "${formatCedarCommand(["deploy", "netlify"])}"
   publish = "web/dist"
   functions = "api/dist/functions"
 

package/dist/commands/setup/deploy/templates/netlifyUD.js

@@ -1,7 +1,8 @@
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getConfig } from "../../../../lib/index.js";
 const config = getConfig();
 const NETLIFY_UD_TOML = `[build]
-command = "yarn cedar build --ud --apiRootPath=/.api/functions && yarn cedar prisma migrate deploy && yarn cedar data-migrate up"
+command = "${formatCedarCommand(["build", "--ud", "--apiRootPath=/.api/functions"])} && ${formatCedarCommand(["prisma", "migrate", "deploy"])} && ${formatCedarCommand(["data-migrate", "up"])}"
 publish = "web/dist"
 
 [build.environment]

package/package.json

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