@cedarjs/cli 5.0.0-canary.2526 → 5.0.0-canary.2528

package/dist/cfw.js

@@ -2,8 +2,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import Configstore from "configstore";
-import execa from "execa";
 import { terminalLink } from "termi-link";
+import { runScriptSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfigPath } from "@cedarjs/project-config";
 const config = new Configstore("@cedarjs/cli");
 const CFW_PATH = process.env.CFW_PATH || config.get("CFW_PATH");
@@ -30,8 +30,10 @@ const helpCommands = ["help", "--help"];
 if (!command.length || command.some((cmd) => helpCommands.includes(cmd))) {
   command = ["run"];
 }
+const script = command[0];
+const args = command.slice(1);
 try {
-  execa.sync("yarn", [...command], {
+  runScriptSync(script, args, {
     stdio: "inherit",
     cwd: absCfwPath,
     // @ts-expect-error - testUtils.d.ts augments ProcessEnv with

package/dist/commands/jobsHandler.js

@@ -1,4 +1,5 @@
 import execa from "execa";
+import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths } from "../lib/index.js";
 const handler = async ({
   _,
@@ -13,11 +14,11 @@ const handler = async ({
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     args.push(String(value));
   }
-  let command = `yarn cedar-jobs ${args.join(" ")}`;
+  let command = formatRunBinCommand("cedar-jobs", args);
   const originalLogLevel = process.env.LOG_LEVEL;
   process.env.LOG_LEVEL = originalLogLevel || "warn";
   if (process.env.NODE_ENV !== "production") {
-    command += " | yarn cedar-log-formatter";
+    command += ` | ${formatRunBinCommand("cedar-log-formatter")}`;
     process.env.LOG_LEVEL = originalLogLevel || "debug";
   }
   execa.commandSync(command, {

package/dist/commands/prismaHandler.js

@@ -1,8 +1,11 @@
 import fs from "node:fs";
-import path from "node:path";
 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 { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../lib/index.js";
 const getErrorMessage = (error) => {
@@ -57,14 +60,12 @@ const handler = async ({
   }
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline(`$ yarn prisma ${args.join(" ")}`));
+  console.log(c.underline(`$ npx prisma ${args.join(" ")}`));
   console.log();
   try {
-    const prismaBin = path.join(cedarPaths.base, "node_modules/.bin/prisma");
-    execa.sync(prismaBin, args, {
+    execa.sync("npx", ["prisma", ...args], {
       cwd: cedarPaths.base,
-      stdio: "inherit",
-      cleanup: true
+      stdio: "inherit"
     });
     if (hasHelpOption || args.length === 0) {
       printWrapInfo();
@@ -81,8 +82,8 @@ const printWrapInfo = () => {
   const message = [
     c.bold("Cedar CLI wraps Prisma CLI"),
     "",
-    "Use `yarn cedar prisma` to automatically pass `--config` and `--preview-feature` options.",
-    "Use `yarn prisma` to skip Cedar's automatic CLI options.",
+    `Use \`${formatCedarCommand(["prisma"])}\` to automatically pass \`--config\` and \`--preview-feature\` options.`,
+    `Use \`${formatRunBinCommand("prisma")}\` to skip Cedar's automatic CLI options.`,
     "",
     "Find more information in our docs:",
     c.underline("https://cedarjs.com/docs/cli-commands#prisma")

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

@@ -1,5 +1,7 @@
-import path from "path";
+import fs from "node:fs";
+import path from "node:path";
 import { Listr } from "listr2";
+import prompts from "prompts";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
@@ -35,6 +37,24 @@ const handler = async ({ force }) => {
     command: "setup deploy baremetal",
     force
   });
+  if (fs.existsSync(path.join(getPaths().base, ".pnp.cjs"))) {
+    console.warn(
+      c.warning(
+        "Your project uses Yarn PnP (Plug'n'Play), which is not officially supported for Baremetal deployments. The generated ecosystem.config.js file uses node_modules/.bin/cedar as the PM2 script path, which will most likely not work under PnP.\n\nYou will need to manually configure the server. See also the packageManagerCommand field in deploy.toml."
+      )
+    );
+    console.log();
+    const { confirmed } = await prompts({
+      type: "confirm",
+      name: "confirmed",
+      message: "Generate the default config anyway? (You can edit it later)"
+    });
+    if (!confirmed) {
+      console.log("Aborting baremetal setup.");
+      return;
+    }
+    console.log();
+  }
   const tasks = new Listr(
     [
       await addPackagesTask({

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

@@ -4,7 +4,7 @@ const ECOSYSTEM = `module.exports = {
     {
       name: 'serve',
       cwd: 'current',
-      script: 'node_modules/.bin/rw',
+      script: 'node_modules/.bin/cedar',
       args: 'serve',
       instances: 'max',
       exec_mode: 'cluster',

package/dist/commands/upgrade/upgradeHandler.js

@@ -194,8 +194,7 @@ const handler = async (upgradeOptions) => {
 };
 async function packageManagerInstall({ verbose }) {
   try {
-    await execa(`${getPackageManager()} ${install()}`, {
-      shell: true,
+    await execa(getPackageManager(), [install()], {
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
     });
@@ -456,8 +455,7 @@ async function dedupeDeps(_task, { verbose }) {
     return;
   }
   try {
-    await execa(`${getPackageManager()} ${dedupeCmd}`, {
-      shell: true,
+    await execa(getPackageManager(), [dedupeCmd], {
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
     });

package/dist/telemetry/exporter.js

@@ -51,7 +51,7 @@ class CustomFileExporter {
     resultCallback({ code: 0 });
   }
   /** Stops the exporter. */
-  shutdown() {
+  async shutdown() {
     if (!this.#isShutdown) {
       fs.truncateSync(
         this.#storageFilePath,

package/dist/telemetry/index.js

@@ -7,6 +7,7 @@ import {
   SamplingDecision
 } from "@opentelemetry/sdk-trace-node";
 import { hideBin } from "yargs/helpers";
+import { getNodeRunnerArgs } from "@cedarjs/cli-helpers/packageManager/exec";
 import { spawnBackgroundProcess } from "../lib/background.js";
 import { CustomFileExporter } from "./exporter.js";
 let traceProvider;
@@ -69,10 +70,10 @@ function shutdownTelemetry() {
       opentelemetry.trace.getActiveSpan()?.end();
     }
     traceExporter?.shutdown();
-    spawnBackgroundProcess("telemetry", "yarn", [
-      "node",
+    const [cmd, args] = getNodeRunnerArgs(
       path.join(import.meta.dirname, "send.js")
-    ]);
+    );
+    spawnBackgroundProcess("telemetry", cmd, args);
   } catch (error) {
     console.error("Telemetry error");
     console.error(error);

package/package.json

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