@cedarjs/cli 4.2.1-next.0 → 4.2.1-next.269

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

@@ -0,0 +1,31 @@
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { getConfig } from "../../../../lib/index.js";
+const config = getConfig();
+const NETLIFY_UD_TOML = `[build]
+command = "${formatCedarCommand(["build", "--ud", "--apiRootPath=/.api/functions"])} && ${formatCedarCommand(["prisma", "migrate", "deploy"])} && ${formatCedarCommand(["data-migrate", "up"])}"
+publish = "web/dist"
+
+[build.environment]
+NODE_VERSION = "24"
+
+[functions]
+directory = "api/dist/ud"
+
+# To use Netlify Dev, install Netlify's CLI (\`netlify-cli\`) from NPM and use
+# \`netlify link\` to connect your local project to a site on Netlify. Then run
+# \`netlify dev\`.
+#
+# Quick links to the docs:
+# - Netlify Dev https://docs.netlify.com/api-and-cli-guides/cli-guides/local-development
+# - Netlify's CLI https://docs.netlify.com/api-and-cli-guides/cli-guides/get-started-with-cli/
+# - \`netlify link\` https://cli.netlify.com/commands/link/
+[dev]
+framework = "cedarjs"
+# Make sure \`targetPort\` matches \`web.port\` in your cedar.toml file
+targetPort = ${config.web.port}
+# Point your browser to this port to access your app
+port = 8888
+`;
+export {
+  NETLIFY_UD_TOML
+};

package/dist/commands/setup/docker/docker.js

@@ -1,6 +1,6 @@
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "docker";
-const description = "Setup the default Redwood Dockerfile";
+const description = "Setup the default Cedar Dockerfile";
 function builder(yargs) {
   yargs.option("force", {
     alias: "f",

package/dist/commands/setup/docker/dockerHandler.js

@@ -4,15 +4,20 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import { writeFile, colors as c } from "@cedarjs/cli-helpers";
+import { dedupe } from "@cedarjs/cli-helpers/packageManager";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { getConfig, getConfigPath, getPaths } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 async function handler({ force }) {
   const TEMPLATE_DIR = path.join(import.meta.dirname, "templates");
+  const pm = getPackageManager();
   let dockerfileTemplateContent = fs.readFileSync(
-    path.resolve(TEMPLATE_DIR, "Dockerfile"),
+    path.resolve(TEMPLATE_DIR, `Dockerfile.${pm}`),
     "utf-8"
   );
-  const dockerComposeDevTemplateContent = fs.readFileSync(
+  let dockerComposeDevTemplateContent = fs.readFileSync(
     path.resolve(TEMPLATE_DIR, "docker-compose.dev.yml"),
     "utf-8"
   );
@@ -36,31 +41,46 @@ async function handler({ force }) {
   const dockerignoreFilePath = path.join(getPaths().base, ".dockerignore");
   const configTomlPath = getConfigPath();
   const configFileName = path.basename(configTomlPath);
+  dockerComposeDevTemplateContent = dockerComposeDevTemplateContent.replace(/'{{DEV_CMD}}'/g, formatCedarCommand(["dev"])).replace(/{{CEDAR_CMD}}/g, formatCedarCommand([]));
   const tasks = new Listr(
     [
-      {
-        title: "Adding the official yarn workspace-tools plugin...",
-        task: async (_ctx, task) => {
-          const { stdout } = await execa.command("yarn plugin runtime --json", {
-            cwd: getPaths().base
-          });
-          const hasWorkspaceToolsPlugin = stdout.trim().split("\n").map(JSON.parse).some(({ name }) => name === "@yarnpkg/plugin-workspace-tools");
-          if (hasWorkspaceToolsPlugin) {
-            task.skip(
-              "The official yarn workspace-tools plugin is already installed"
+      // The yarn workspace-tools plugin only exists for yarn.
+      // For pnpm, pnpm install --prod --filter api is built-in. Workspaces are
+      // a first-class feature with no plugin needed. For npm, there's no
+      // workspace-focus equivalent at all, so npm ci --omit=dev installs
+      // production deps for all workspaces (slightly less optimized but
+      // functionally correct).
+      ...pm === "yarn" ? [
+        {
+          title: "Adding the official yarn workspace-tools plugin...",
+          task: async (_, task) => {
+            const { stdout } = await execa(
+              "yarn",
+              ["plugin", "runtime", "--json"],
+              {
+                cwd: getPaths().base
+              }
             );
-            return;
+            const hasWorkspaceToolsPlugin = stdout.trim().split("\n").map((line) => JSON.parse(line)).some(
+              ({ name }) => name === "@yarnpkg/plugin-workspace-tools"
+            );
+            if (hasWorkspaceToolsPlugin) {
+              task.skip(
+                "The official yarn workspace-tools plugin is already installed"
+              );
+              return;
+            }
+            return execa("yarn", ["plugin", "import", "workspace-tools"], {
+              cwd: getPaths().base
+            }).stdout;
           }
-          return execa.command("yarn plugin import workspace-tools", {
-            cwd: getPaths().base
-          }).stdout;
         }
-      },
+      ] : [],
       {
         title: "Adding @cedarjs/api-server and @cedarjs/web-server...",
         task: async (_ctx, task) => {
           const apiServerPackageName = "@cedarjs/api-server";
-          const { dependencies: apiDependencies } = JSON.parse(
+          const { dependencies: apiDependencies = {} } = JSON.parse(
             fs.readFileSync(
               path.join(getPaths().api.base, "package.json"),
               "utf-8"
@@ -68,7 +88,7 @@ async function handler({ force }) {
           );
           const hasApiServerPackage = Object.keys(apiDependencies).includes(apiServerPackageName);
           const webServerPackageName = "@cedarjs/web-server";
-          const { dependencies: webDependencies } = JSON.parse(
+          const { dependencies: webDependencies = {} } = JSON.parse(
             fs.readFileSync(
               path.join(getPaths().web.base, "package.json"),
               "utf-8"
@@ -83,25 +103,26 @@ async function handler({ force }) {
           }
           if (!hasApiServerPackage) {
             const apiServerPackageVersion = await getVersionOfRedwoodPackageToInstall(apiServerPackageName);
-            await execa.command(
-              `yarn workspace api add ${apiServerPackageName}@${apiServerPackageVersion}`,
-              {
-                cwd: getPaths().base
-              }
+            await addWorkspacePackages(
+              "api",
+              [`${apiServerPackageName}@${apiServerPackageVersion}`],
+              { cwd: getPaths().base }
             );
           }
           if (!hasWebServerPackage) {
             const webServerPackageVersion = await getVersionOfRedwoodPackageToInstall(webServerPackageName);
-            await execa.command(
-              `yarn workspace web add ${webServerPackageName}@${webServerPackageVersion}`,
-              {
-                cwd: getPaths().base
-              }
+            await addWorkspacePackages(
+              "web",
+              [`${webServerPackageName}@${webServerPackageVersion}`],
+              { cwd: getPaths().base }
             );
           }
-          return execa.command(`yarn dedupe`, {
-            cwd: getPaths().base
-          }).stdout;
+          const dedupeCommand = dedupe();
+          if (dedupeCommand) {
+            await execa(getPackageManager(), [dedupeCommand], {
+              cwd: getPaths().base
+            });
+          }
         }
       },
       {
@@ -233,7 +254,7 @@ async function handler({ force }) {
         "Then, connect to the container and migrate your database:",
         "",
         "  docker compose -f ./docker-compose.dev.yml run --rm -it console /bin/bash",
-        "  root@...:/home/node/app# yarn cedar prisma migrate dev",
+        "  root@...:/home/node/app# " + formatCedarCommand(["prisma", "migrate", "dev"]),
         "",
         "We assume you're using Postgres. If you're not, you'll need to make other changes to switch over.",
         "Lastly, ensure you have Docker. If you don't, see https://docs.docker.com/desktop/",
@@ -243,9 +264,11 @@ async function handler({ force }) {
       ].join("\n")
     );
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const msg = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, msg);
+    console.error(c.error(msg));
+    process.exit(exitCode);
   }
 }
 async function getVersionOfRedwoodPackageToInstall(module) {
@@ -253,9 +276,21 @@ async function getVersionOfRedwoodPackageToInstall(module) {
   const packageJsonPath = createdRequire.resolve("@cedarjs/cli/package.json", {
     paths: [getPaths().base]
   });
-  let { version } = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+  let { version = "" } = JSON.parse(
+    fs.readFileSync(packageJsonPath, "utf8")
+  );
   const packumentP = await fetch(`https://registry.npmjs.org/${module}`);
   const packument = await packumentP.json();
+  if (packument.error) {
+    throw new Error(
+      `Couldn't fetch packument for ${module}: ${packument.error}`
+    );
+  }
+  if (!packument.versions || typeof packument.versions !== "object" || Array.isArray(packument.versions)) {
+    throw new Error(
+      `Couldn't fetch packument for ${module}: invalid versions field`
+    );
+  }
   if (version.includes("+")) {
     version = version.split("+")[0];
   }

package/dist/commands/setup/docker/templates/Dockerfile.npm

@@ -0,0 +1,119 @@
+# base
+# ----
+FROM node:24-bookworm-slim as base
+
+RUN npm install --global corepack
+
+# We tried to make the Dockerfile as lean as possible. In some cases, that
+# means we excluded a dependency your project needs.
+# By far the most common is Python. If you're running into build errors
+# because `python3` isn't available, add `python3 make gcc \` before the
+# `openssl \` line below and in other stages as necessary:
+RUN apt-get update && apt-get install -y \
+  openssl \
+  && rm -rf /var/lib/apt/lists/*
+
+USER node
+WORKDIR /home/node/app
+
+COPY --chown=node:node package*.json .
+COPY --chown=node:node api/package.json api/
+COPY --chown=node:node web/package.json web/
+
+RUN --mount=type=cache,target=/home/node/.npm,uid=1000 \
+  npm ci
+
+COPY --chown=node:node cedar.toml* redwood.toml* ./
+COPY --chown=node:node graphql.config.cjs .
+COPY --chown=node:node .env.defaults .env.defaults
+
+# api build
+# ---------
+FROM base as api_build
+
+COPY --chown=node:node api api
+RUN npx --yes cedar build api
+
+# web prerender build
+# -------------------
+FROM api_build as web_build_with_prerender
+
+COPY --chown=node:node web web
+RUN npx --yes cedar build web
+
+# web build
+# ---------
+FROM base as web_build
+
+COPY --chown=node:node web web
+RUN npx --yes cedar build web --no-prerender
+
+# api serve
+# ---------
+FROM node:24-bookworm-slim as api_serve
+
+RUN npm install --global corepack
+
+RUN apt-get update && apt-get install -y \
+  openssl \
+  && rm -rf /var/lib/apt/lists/*
+
+USER node
+WORKDIR /home/node/app
+
+# npm doesn't have a workspace focus command, so we copy all workspace
+# package.json files and install production deps for all workspaces.
+COPY --chown=node:node package*.json .
+COPY --chown=node:node api/package.json api/
+COPY --chown=node:node web/package.json web/
+
+RUN --mount=type=cache,target=/home/node/.npm,uid=1000 \
+  npm ci --omit=dev
+
+COPY --chown=node:node cedar.toml* redwood.toml* ./
+COPY --chown=node:node graphql.config.cjs .
+COPY --chown=node:node .env.defaults .env.defaults
+
+COPY --chown=node:node --from=api_build /home/node/app/api/dist /home/node/app/api/dist
+COPY --chown=node:node --from=api_build /home/node/app/api/db /home/node/app/api/db
+COPY --chown=node:node --from=api_build /home/node/app/node_modules/.prisma /home/node/app/node_modules/.prisma
+
+ENV NODE_ENV=production
+
+CMD ["node_modules/.bin/cedarjs-server", "api"]
+
+# web serve
+# ---------
+FROM node:24-bookworm-slim as web_serve
+
+RUN npm install --global corepack
+
+USER node
+WORKDIR /home/node/app
+
+COPY --chown=node:node package*.json .
+COPY --chown=node:node api/package.json api/
+COPY --chown=node:node web/package.json web/
+
+RUN --mount=type=cache,target=/home/node/.npm,uid=1000 \
+  npm ci --omit=dev
+
+COPY --chown=node:node cedar.toml* redwood.toml* ./
+COPY --chown=node:node graphql.config.cjs .
+COPY --chown=node:node .env.defaults .env.defaults
+
+COPY --chown=node:node --from=web_build /home/node/app/web/dist /home/node/app/web/dist
+
+ENV NODE_ENV=production \
+  API_PROXY_TARGET=http://api:8911
+
+# We use the shell form here for variable expansion.
+CMD node_modules/.bin/cedar-web-server --api-proxy-target $API_PROXY_TARGET
+
+# console
+# -------
+FROM base as console
+
+COPY --chown=node:node api api
+COPY --chown=node:node web web
+COPY --chown=node:node scripts scripts

package/dist/commands/setup/docker/templates/Dockerfile.pnpm

@@ -0,0 +1,112 @@
+# base
+# ----
+FROM node:24-bookworm-slim as base
+
+RUN npm install --global corepack
+
+RUN apt-get update && apt-get install -y \
+  openssl \
+  && rm -rf /var/lib/apt/lists/*
+
+USER node
+WORKDIR /home/node/app
+
+COPY --chown=node:node package.json .
+COPY --chown=node:node pnpm-lock.yaml .
+COPY --chown=node:node pnpm-workspace.yaml .
+COPY --chown=node:node api/package.json api/
+COPY --chown=node:node web/package.json web/
+
+RUN --mount=type=cache,id=pnpm,target=/home/node/.pnpm/store,uid=1000 \
+  pnpm install --frozen-lockfile --store-dir /home/node/.pnpm/store
+
+COPY --chown=node:node cedar.toml* redwood.toml* ./
+COPY --chown=node:node graphql.config.cjs .
+COPY --chown=node:node .env.defaults .env.defaults
+
+# api build
+# ---------
+FROM base as api_build
+
+COPY --chown=node:node api api
+RUN pnpm exec cedar build api
+
+# web prerender build
+# -------------------
+FROM api_build as web_build_with_prerender
+
+COPY --chown=node:node web web
+RUN pnpm exec cedar build web
+
+# web build
+# ---------
+FROM base as web_build
+
+COPY --chown=node:node web web
+RUN pnpm exec cedar build web --no-prerender
+
+# deploy
+# ------
+FROM api_build as deploy
+
+COPY --chown=node:node --from=web_build /home/node/app/web/dist /home/node/app/web/dist
+
+RUN pnpm deploy --filter=api --prod /home/node/app/dist/api
+RUN pnpm deploy --filter=web --prod /home/node/app/dist/web
+
+# api serve
+# ---------
+FROM node:24-bookworm-slim as api_serve
+
+RUN npm install --global corepack
+
+RUN apt-get update && apt-get install -y \
+  openssl \
+  && rm -rf /var/lib/apt/lists/*
+
+USER node
+WORKDIR /home/node/app
+
+COPY --chown=node:node cedar.toml* redwood.toml* ./
+COPY --chown=node:node graphql.config.cjs .
+COPY --chown=node:node .env.defaults .env.defaults
+
+COPY --chown=node:node --from=deploy /home/node/app/dist/api /home/node/app
+
+COPY --chown=node:node --from=api_build /home/node/app/api/dist /home/node/app/api/dist
+COPY --chown=node:node --from=api_build /home/node/app/api/db /home/node/app/api/db
+COPY --chown=node:node --from=api_build /home/node/app/node_modules/.prisma /home/node/app/node_modules/.prisma
+
+ENV NODE_ENV=production
+
+CMD ["node_modules/.bin/cedarjs-server", "api"]
+
+# web serve
+# ---------
+FROM node:24-bookworm-slim as web_serve
+
+RUN npm install --global corepack
+
+USER node
+WORKDIR /home/node/app
+
+COPY --chown=node:node cedar.toml* redwood.toml* ./
+COPY --chown=node:node graphql.config.cjs .
+COPY --chown=node:node .env.defaults .env.defaults
+
+COPY --chown=node:node --from=deploy /home/node/app/dist/web /home/node/app
+
+COPY --chown=node:node --from=web_build /home/node/app/web/dist /home/node/app/web/dist
+
+ENV NODE_ENV=production \
+  API_PROXY_TARGET=http://api:8911
+
+CMD node_modules/.bin/cedar-web-server --api-proxy-target $API_PROXY_TARGET
+
+# console
+# -------
+FROM base as console
+
+COPY --chown=node:node api api
+COPY --chown=node:node web web
+COPY --chown=node:node scripts scripts

package/dist/commands/setup/docker/templates/{Dockerfile → Dockerfile.yarn}

@@ -132,7 +132,7 @@ ENV NODE_ENV=production \
   API_PROXY_TARGET=http://api:8911
 
 # We use the shell form here for variable expansion.
-CMD "node_modules/.bin/rw-web-server" "--api-proxy-target" "$API_PROXY_TARGET"
+CMD node_modules/.bin/cedar-web-server --api-proxy-target $API_PROXY_TARGET
 
 # console
 # -------

package/dist/commands/setup/docker/templates/docker-compose.dev.yml

@@ -4,7 +4,7 @@ services:
       context: .
       dockerfile: ./Dockerfile
       target: base
-    command: yarn cedar dev
+    command: '{{DEV_CMD}}'
     volumes:
       - .:/home/node/app
       - node_modules:/home/node/app/node_modules
@@ -36,7 +36,7 @@ services:
   #
   # ```
   # docker compose -f ./docker-compose.dev.yml run --rm -it console /bin/bash
-  # root@...:/home/node/app# yarn cedar prisma migrate dev
+  # root@...:/home/node/app# {{CEDAR_CMD}} prisma migrate dev
   # ```
   console:
     user: root

package/dist/commands/setup/generator/generatorHandler.js

@@ -36,7 +36,7 @@ const tasks = ({ name, force }) => {
       },
       {
         title: "Destination:",
-        task: (ctx, task) => {
+        task: (_ctx, task) => {
           task.title = `  Wrote templates to ${destination.replace(
             getPaths().base,
             ""
@@ -44,7 +44,7 @@ const tasks = ({ name, force }) => {
         }
       }
     ],
-    { rendererOptions: { collapseSubtasks: false }, errorOnExist: true }
+    { rendererOptions: { collapseSubtasks: false } }
   );
 };
 const handler = async ({ name, force }) => {
@@ -52,7 +52,8 @@ const handler = async ({ name, force }) => {
   try {
     await t.run();
   } catch (e) {
-    console.log(c.error(e.message));
+    const message = e instanceof Error ? e.message : String(e);
+    console.log(c.error(message));
   }
 };
 export {

package/dist/commands/setup/graphql/features/fragments/fragmentsHandler.js

@@ -1,6 +1,5 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { format } from "prettier";
 import {
@@ -8,6 +7,7 @@ import {
   getPrettierOptions,
   setTomlSetting
 } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 const command = "fragments";
@@ -34,7 +34,7 @@ async function handler({ force }) {
       {
         title: "Generate possibleTypes.ts",
         task: () => {
-          execa.commandSync("yarn cedar generate types", { stdio: "ignore" });
+          runBinSync("cedar", ["generate", "types"], { stdio: "ignore" });
         }
       },
       {