@cedarjs/cli 4.0.0-canary.13673 → 4.0.0-canary.13675

package/dist/commands/deploy/baremetal.js

@@ -1,5 +1,6 @@
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 const command = "baremetal [environment]";
 const description = "Deploy to baremetal server(s)";
 const builder = (yargs) => {
@@ -23,7 +24,7 @@ const builder = (yargs) => {
     type: "boolean"
   });
   yargs.option("install", {
-    describe: "Run `yarn install`",
+    describe: `Run \`${getPackageManager()} install\``,
     default: true,
     type: "boolean"
   });

package/dist/commands/experimental/setupRscHandler.js

@@ -3,7 +3,9 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import { prettify } from "@cedarjs/cli-helpers";
+import { install } from "@cedarjs/cli-helpers/packageManager";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
@@ -379,9 +381,8 @@ const handler = async ({ force, verbose }) => {
               overwriteExisting: true
             }
           );
-          await execa("yarn", [], {
-            cwd: getPaths().web.base
-          });
+          const pm = getPackageManager();
+          await execa(pm, [install()], { cwd: getPaths().web.base });
         }
       },
       {

package/dist/commands/upgrade/upgrade.js

@@ -1,4 +1,5 @@
 import { terminalLink } from "termi-link";
+import { dedupeIsSupported } from "@cedarjs/cli-helpers/packageManager";
 import c from "../../lib/colors.js";
 import { isValidCedarJSTag } from "./tags.js";
 const SEMVER_REGEX = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/i;
@@ -40,7 +41,8 @@ const builder = (yargs) => {
   }).option("dedupe", {
     description: "Skip dedupe check with --no-dedupe",
     type: "boolean",
-    default: true
+    default: true,
+    hidden: !dedupeIsSupported()
   }).option("yes", {
     alias: "y",
     describe: "Skip prompts and use defaults",

package/dist/commands/upgrade/upgradeHandler.js

@@ -6,27 +6,29 @@ import latestVersion from "latest-version";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import {
+  dedupe,
+  dedupeIsSupported,
+  install,
+  installationErrorMessage,
+  prettyPrintCedarCommand
+} from "@cedarjs/cli-helpers/packageManager";
 import { getConfig } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import c from "../../lib/colors.js";
 import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
 import { getPaths } from "../../lib/index.js";
 import { PLUGIN_CACHE_FILENAME } from "../../lib/plugin.js";
 import { runPreUpgradeScripts } from "./preUpgradeScripts.js";
 import { isValidCedarJSTag } from "./tags.js";
-const handler = async ({
-  dryRun,
-  tag,
-  verbose,
-  dedupe,
-  yes,
-  force
-}) => {
+const handler = async (upgradeOptions) => {
+  const { dryRun, tag, verbose, dedupe: dedupe2, yes, force } = upgradeOptions;
   recordTelemetryAttributes({
     command: "upgrade",
     dryRun: !!dryRun,
     tag: tag ?? "latest",
     verbose: !!verbose,
-    dedupe: !!dedupe,
+    dedupe: !!dedupe2,
     yes: !!yes,
     force: !!force
   });
@@ -104,8 +106,8 @@ const handler = async ({
         enabled: (ctx) => !ctx.preUpgradeError
       },
       {
-        title: "Running yarn install",
-        task: () => yarnInstall({ verbose }),
+        title: `Running ${getPackageManager()} ${install()}`,
+        task: () => packageManagerInstall({ verbose }),
         enabled: (ctx) => !ctx.preUpgradeError,
         skip: () => !!dryRun
       },
@@ -117,8 +119,8 @@ const handler = async ({
       },
       {
         title: "De-duplicating dependencies",
-        skip: () => !!dryRun || !dedupe,
-        enabled: (ctx) => !ctx.preUpgradeError,
+        skip: () => !!dryRun || !dedupe2,
+        enabled: (ctx) => dedupeIsSupported() && !ctx.preUpgradeError,
         task: (_ctx, task) => dedupeDeps(task, { verbose })
       },
       {
@@ -192,17 +194,15 @@ const handler = async ({
     console.log("  " + preUpgradeMessage.replace(/\n/g, "\n  "));
   }
 };
-async function yarnInstall({ verbose }) {
+async function packageManagerInstall({ verbose }) {
   try {
-    await execa("yarn install", {
+    await execa(`${getPackageManager()} ${install()}`, {
       shell: true,
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
     });
   } catch {
-    throw new Error(
-      "Could not finish installation. Please run `yarn install` and then `yarn dedupe`, before continuing"
-    );
+    throw new Error(installationErrorMessage());
   }
 }
 async function removeCliCache({
@@ -447,14 +447,18 @@ async function refreshPrismaClient(task, { verbose }) {
     const message = e instanceof Error ? e.message : String(e);
     task.skip("Refreshing the Prisma client caused an Error.");
     console.log(
-      "You may need to update your prisma client manually: $ yarn cedar prisma generate"
+      "You may need to update your prisma client manually: $ " + prettyPrintCedarCommand(["prisma", "generate"])
     );
     console.log(c.error(message));
   }
 }
-const dedupeDeps = async (_task, { verbose }) => {
+async function dedupeDeps(_task, { verbose }) {
+  const dedupeCmd = dedupe();
+  if (!dedupeCmd) {
+    return;
+  }
   try {
-    await execa("yarn dedupe", {
+    await execa(`${getPackageManager()} ${dedupeCmd}`, {
       shell: true,
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
@@ -463,11 +467,11 @@ const dedupeDeps = async (_task, { verbose }) => {
     const message = e instanceof Error ? e.message : String(e);
     console.log(c.error(message));
     throw new Error(
-      "Could not finish de-duplication. Please run `yarn dedupe` before continuing"
+      `Could not finish de-duplication. Please run \`${getPackageManager()} ${dedupeCmd}\` before continuing`
     );
   }
-  await yarnInstall({ verbose });
-};
+  await packageManagerInstall({ verbose });
+}
 export {
   handler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "4.0.0-canary.13673+dcde8831a",
+  "version": "4.0.0-canary.13675+8262a8b2b",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,16 +33,16 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "4.0.0-canary.13673",
-    "@cedarjs/cli-helpers": "4.0.0-canary.13673",
-    "@cedarjs/fastify-web": "4.0.0-canary.13673",
-    "@cedarjs/internal": "4.0.0-canary.13673",
-    "@cedarjs/prerender": "4.0.0-canary.13673",
-    "@cedarjs/project-config": "4.0.0-canary.13673",
-    "@cedarjs/structure": "4.0.0-canary.13673",
-    "@cedarjs/telemetry": "4.0.0-canary.13673",
-    "@cedarjs/utils": "4.0.0-canary.13673",
-    "@cedarjs/web-server": "4.0.0-canary.13673",
+    "@cedarjs/api-server": "4.0.0-canary.13675",
+    "@cedarjs/cli-helpers": "4.0.0-canary.13675",
+    "@cedarjs/fastify-web": "4.0.0-canary.13675",
+    "@cedarjs/internal": "4.0.0-canary.13675",
+    "@cedarjs/prerender": "4.0.0-canary.13675",
+    "@cedarjs/project-config": "4.0.0-canary.13675",
+    "@cedarjs/structure": "4.0.0-canary.13675",
+    "@cedarjs/telemetry": "4.0.0-canary.13675",
+    "@cedarjs/utils": "4.0.0-canary.13675",
+    "@cedarjs/web-server": "4.0.0-canary.13675",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -102,8 +102,11 @@
     "typescript": "5.9.3",
     "vitest": "3.2.4"
   },
+  "engines": {
+    "node": ">=24"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dcde8831a217305e62b1cfa418fa7448a23c0a28"
+  "gitHead": "8262a8b2baf0be63592cde7f6198d234cfd5698b"
 }