@cedarjs/cli 5.0.0-canary.2491 → 5.0.0-canary.2492

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -8,6 +8,7 @@ import { env as envInterpolation } from "string-env-interpolation";
 import { titleCase } from "title-case";
 import { colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { getPaths } from "../../../lib/index.js";
 const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
@@ -16,7 +17,7 @@ const LIFECYCLE_HOOKS = ["before", "after"];
 const DEFAULT_SERVER_CONFIG = {
   port: 22,
   branch: "main",
-  packageManagerCommand: "yarn",
+  packageManagerCommand: getPackageManager(),
   monitorCommand: "pm2",
   sides: ["api", "web"],
   keepReleases: 5,
@@ -297,17 +298,20 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
         title: `DB Migrations...`,
         task: async () => {
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "prisma",
             "migrate",
             "deploy"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "prisma",
             "generate"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "dataMigrate",
             "up"
@@ -326,6 +330,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
           title: `Building ${side}...`,
           task: async () => {
             await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+              "exec",
               "cedar",
               "build",
               side

package/dist/commands/experimental/live-queries/liveQueriesHandler.js

@@ -6,6 +6,7 @@ import {
   addWebPackages,
   colors as c
 } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import {
   getConfigPath,
   getMigrationsPath,
@@ -265,7 +266,7 @@ async function handler({ force, verbose }) {
         task: () => {
           if (!hasRealtimeDependency) {
             throw new Error(
-              `@cedarjs/realtime is not installed in your api workspace. Please run ${c.highlight("yarn cedar setup realtime")} first.`
+              `@cedarjs/realtime is not installed in your api workspace. Please run ${c.highlight(formatCedarCommand(["setup", "realtime"]))} first.`
             );
           }
         }
@@ -408,7 +409,9 @@ async function handler({ force, verbose }) {
           ${c.success("\nLive query notifications configured!\n")}
 
           Apply the migration to activate Postgres notifications:
-          ${c.highlight("\n\xA0\xA0yarn cedar prisma migrate dev\n")}
+          ${c.highlight(`
+\xA0\xA0${formatCedarCommand(["prisma", "migrate", "dev"])}
+`)}
 
           You're then ready to use @live queries to get real-time updates as
           soon as something in your database changes.

package/dist/commands/experimental/setupInngestHandler.js

@@ -1,6 +1,7 @@
-import execa from "execa";
 import { Listr } from "listr2";
 import { colors as c } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import { addRootPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
 import { command, description, EXPERIMENTAL_TOPIC_ID } from "./setupInngest.js";
@@ -10,18 +11,16 @@ const handler = async ({ force }) => {
     {
       title: `Adding Inngest setup packages for RedwoodJS ...`,
       task: async () => {
-        await execa("yarn", ["add", "-D", "inngest-setup-redwoodjs"], {
-          cwd: getPaths().base
+        await addRootPackages(["inngest-setup-redwoodjs"], {
+          cwd: getPaths().base,
+          dev: true
         });
       }
     },
     {
       task: async () => {
-        const pluginCommands = ["inngest-setup-redwoodjs", "plugin"];
-        if (force) {
-          pluginCommands.push("--force");
-        }
-        await execa("yarn", [...pluginCommands], {
+        const pluginArgs = force ? ["--force"] : [];
+        await runBin("inngest-setup-redwoodjs", ["plugin", ...pluginArgs], {
           stdout: "inherit",
           cwd: getPaths().base
         });

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
-import execa from "execa";
 import { Listr } from "listr2";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
   getConfigPath,
   resolveFile,
@@ -170,9 +170,8 @@ const handler = async ({ force, verbose }) => {
     {
       title: "Regenerate the Prisma client...",
       task: (_ctx, _task) => {
-        return execa(`yarn cedar prisma generate`, {
+        return runBin("cedar", ["prisma", "generate"], {
           stdio: "inherit",
-          shell: true,
           cwd: getPaths().web.base
         });
       }

package/dist/commands/experimental/setupReactCompilerHandler.js

@@ -1,9 +1,12 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import semver from "semver";
 import { colors as c } from "@cedarjs/cli-helpers";
+import {
+  addRootPackages,
+  addWorkspacePackages
+} from "@cedarjs/cli-helpers/packageManager/packages";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFile } from "../../lib/index.js";
@@ -81,26 +84,25 @@ const handler = async (options) => {
           }
         }
       },
-      // We are using two different yarn commands here which is fine because
-      // they're operating on different workspaces - web and the root
+      // We are using two different package manager commands here which is
+      // fine because they're operating on different workspaces - web and the
+      // root
       {
         title: "Installing eslint-plugin-react-compiler",
         task: async () => {
-          await execa("yarn", ["add", "-D", "eslint-plugin-react-compiler"], {
-            cwd: getPaths().base
+          await addRootPackages(["eslint-plugin-react-compiler"], {
+            cwd: getPaths().base,
+            dev: true
           });
         }
       },
       {
         title: "Installing babel-plugin-react-compiler",
         task: async () => {
-          await execa(
-            "yarn",
-            ["web/", "add", "-D", "babel-plugin-react-compiler"],
-            {
-              cwd: getPaths().base
-            }
-          );
+          await addWorkspacePackages("web", ["babel-plugin-react-compiler"], {
+            cwd: getPaths().base,
+            dev: true
+          });
         }
       },
       {

package/dist/commands/experimental/util.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import ansis from "ansis";
 import { terminalLink } from "termi-link";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths } from "../../lib/index.js";
 import { isTypeScriptProject, serverFileExists } from "../../lib/project.js";
 function link(topicId, isTerminal = false) {
@@ -41,7 +42,7 @@ function printTaskEpilogue(command, description, topicId) {
 const isServerFileSetup = () => {
   if (!serverFileExists()) {
     throw new Error(
-      "CedarJS Realtime requires a serverful environment. Please run `yarn cedarjs setup server-file` first."
+      `CedarJS Realtime requires a serverful environment. Please run \`${formatCedarCommand(["setup", "server-file"])}\` first.`
     );
   }
   return true;
@@ -56,7 +57,7 @@ const realtimeExists = () => {
 const isRealtimeSetup = () => {
   if (!realtimeExists()) {
     throw new Error(
-      "Adding realtime events requires that CedarJS Realtime is setup. Please run `yarn cedar setup realtime` first."
+      `Adding realtime events requires that CedarJS Realtime is setup. Please run \`${formatCedarCommand(["setup", "realtime"])}\` first.`
     );
   }
   return true;

package/dist/commands/setup/auth/auth.js

@@ -1,11 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { terminalLink } from "termi-link";
 import {
   recordTelemetryAttributes,
   standardAuthBuilder
 } from "@cedarjs/cli-helpers";
+import { addRootPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { getPaths } from "../../../lib/index.js";
 const command = "auth <provider>";
 const description = "Set up an auth configuration";
@@ -225,7 +225,8 @@ async function getAuthSetupHandler(module) {
     if (!versionIsPublished) {
       version = "canary";
     }
-    await execa.command(`yarn add -D ${module}@${version}`, {
+    await addRootPackages([`${module}@${version}`], {
+      dev: true,
       stdio: "inherit",
       cwd: getPaths().base
     });

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

@@ -8,6 +8,10 @@ import {
   isTypeScriptProject,
   getConfigPath
 } from "@cedarjs/cli-helpers";
+import {
+  formatCedarCommand,
+  formatRunBinCommand
+} from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
@@ -74,20 +78,34 @@ async function getCoherenceConfigFileContent() {
   if (db === "postgresql") {
     db = "postgres";
   }
-  const apiProdCommand = ["yarn", "cedar", "build", "api", "&&"];
+  const apiProdCommandSegments = [formatCedarCommand(["build", "api"]), "&&"];
   if (serverFileExists()) {
-    apiProdCommand.push(
-      "yarn",
-      "node",
-      "api/dist/server.js",
-      "--apiRootPath=/api"
+    apiProdCommandSegments.push(
+      formatRunBinCommand("node", ["api/dist/server.js", "--apiRootPath=/api"])
     );
   } else {
-    apiProdCommand.push("yarn", "cedar", "serve", "api", "--apiRootPath=/api");
+    apiProdCommandSegments.push(
+      formatCedarCommand(["serve", "api", "--apiRootPath=/api"])
+    );
   }
+  const apiDevCommandSegments = [
+    formatCedarCommand(["build", "api"]),
+    "&&",
+    formatCedarCommand(["dev", "api", "--apiRootPath=/api"])
+  ];
+  const migrationCommandSegments = [
+    formatCedarCommand(["prisma", "migrate", "deploy"]),
+    "&&",
+    formatCedarCommand(["data-migrate", "up"])
+  ];
   return coherenceFiles.yamlTemplate({
     db,
-    apiProdCommand: `[${apiProdCommand.map((cmd) => `"${cmd}"`).join(", ")}]`
+    apiProdCommand: `[${apiProdCommandSegments.map((cmd) => `"${cmd}"`).join(", ")}]`,
+    apiDevCommand: `[${apiDevCommandSegments.map((cmd) => `"${cmd}"`).join(", ")}]`,
+    migrationCommand: `[${migrationCommandSegments.map((cmd) => `"${cmd}"`).join(", ")}]`,
+    webProdCommand: `["${formatCedarCommand(["serve", "web"])}"]`,
+    webDevCommand: `["${formatCedarCommand(["dev", "web", '--fwd=\\"--allowed-hosts all\\"'])}"]`,
+    webBuildCommand: `["${formatCedarCommand(["build", "web", "--no-prerender"])}"]`
   });
 }
 const SUPPORTED_DATABASES = ["mysql", "postgresql"];
@@ -145,14 +163,22 @@ const HOST_REGEXP = /host(\s*)=(\s*)\".+\"/g;
 const API_URL_REGEXP = /apiUrl(\s*)=(\s*)\".+\"/;
 const PORT_REGEXP = /port(\s*)=(\s*)(?<port>\d{4})/g;
 const coherenceFiles = {
-  yamlTemplate({ db, apiProdCommand }) {
+  yamlTemplate({
+    db,
+    apiProdCommand,
+    apiDevCommand,
+    migrationCommand,
+    webProdCommand,
+    webDevCommand,
+    webBuildCommand
+  }) {
     return `api:
   type: backend
   url_path: "/api"
   prod:
     command: ${apiProdCommand}
   dev:
-    command: ["yarn", "cedar", "build", "api", "&&", "yarn", "cedar", "dev", "api", "--apiRootPath=/api"]
+    command: ${apiDevCommand}
   local_packages: ["node_modules"]
 
   system:
@@ -168,20 +194,20 @@ const coherenceFiles = {
       ${db === "postgres" ? "adapter: postgresql" : ""}
 
   # If you use data migrations, use the following instead:
-  # migration: ["yarn", "cedar", "prisma", "migrate", "deploy", "&&", "yarn", "cedar", "data-migrate", "up"]
-  migration: ["yarn", "cedar", "prisma", "migrate", "deploy"]
+  # migration: ["${formatCedarCommand(["prisma", "migrate", "deploy"])}", "&&", "${formatCedarCommand(["data-migrate", "up"])}"]
+  migration: ${migrationCommand}
 
 web:
   type: frontend
   assets_path: "web/dist"
   prod:
-    command: ["yarn", "cedar", "serve", "web"]
+    command: ${webProdCommand}
   dev:
-    command: ["yarn", "cedar", "dev", "web", "--fwd=\\"--allowed-hosts all\\""]
+    command: ${webDevCommand}
 
   # Heads up: Redwood's prerender doesn't work with Coherence yet.
   # For current status and updates, see https://github.com/redwoodjs/redwood/issues/8333.
-  build: ["yarn", "cedar", "build", "web", "--no-prerender"]
+  build: ${webBuildCommand}
   local_packages: ["node_modules"]
 
   system:

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

@@ -1,3 +1,4 @@
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 const ECOSYSTEM = `module.exports = {
   apps: [
     {
@@ -32,7 +33,7 @@ host = "server.com"
 username = "user"
 agentForward = true
 sides = ["api","web"]
-packageManagerCommand = "yarn"
+packageManagerCommand = "${getPackageManager()}"
 monitorCommand = "pm2"
 path = "/var/www/app"
 processNames = ["serve"]

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

@@ -4,7 +4,10 @@ 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 { 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");
@@ -40,10 +43,17 @@ async function handler({ force }) {
     [
       {
         title: "Adding the official yarn workspace-tools plugin...",
+        // The `yarn plugin` commands only exist in yarn. Docker setup is a
+        // yarn-specific workflow (workspace-tools plugin has no npm/pnpm
+        // equivalent), so we invoke yarn directly here.
         task: async (_ctx, task) => {
-          const { stdout } = await execa.command("yarn plugin runtime --json", {
-            cwd: getPaths().base
-          });
+          const { stdout } = await execa(
+            "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(
@@ -51,7 +61,7 @@ async function handler({ force }) {
             );
             return;
           }
-          return execa.command("yarn plugin import workspace-tools", {
+          return execa("yarn", ["plugin", "import", "workspace-tools"], {
             cwd: getPaths().base
           }).stdout;
         }
@@ -83,25 +93,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
+            });
+          }
         }
       },
       {

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" });
         }
       },
       {

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { format } from "prettier";
 import { getPrettierOptions, setTomlSetting } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 async function handler({ force }) {
@@ -28,7 +28,7 @@ async function handler({ force }) {
       {
         title: "Generating Trusted Documents store ...",
         task: () => {
-          execa.commandSync("yarn cedar generate types", { stdio: "ignore" });
+          runBinSync("cedar", ["generate", "types"], { stdio: "ignore" });
         }
       },
       {

package/dist/commands/setup/i18n/i18nHandler.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { colors as c } from "@cedarjs/cli-helpers";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import extendStorybookConfiguration from "../../../lib/configureStorybook.js";
 import { fileIncludes } from "../../../lib/extendFile.js";
@@ -39,14 +39,15 @@ const handler = async ({ force }) => {
               {
                 title: "Install i18next, react-i18next and i18next-browser-languagedetector",
                 task: async () => {
-                  await execa("yarn", [
-                    "workspace",
+                  await addWorkspacePackages(
                     "web",
-                    "add",
-                    "i18next",
-                    "react-i18next",
-                    "i18next-browser-languagedetector"
-                  ]);
+                    [
+                      "i18next",
+                      "react-i18next",
+                      "i18next-browser-languagedetector"
+                    ],
+                    { cwd: rwPaths.base }
+                  );
                 }
               }
             ],

package/dist/commands/setup/jobs/jobsHandler.js

@@ -4,6 +4,7 @@ import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getSchemaPath, getPrismaSchemas } from "@cedarjs/project-config";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
@@ -97,10 +98,13 @@ const tasks = async ({ force }) => {
           ${c.success("\nBackground jobs configured!\n")}
 
           ${!modelExists ? "Migrate your database to finish setting up jobs:\n" : ""}
-          ${!modelExists ? c.highlight("\n\xA0\xA0yarn cedar prisma migrate dev\n") : ""}
+          ${!modelExists ? c.highlight(`
+\xA0\xA0${formatCedarCommand(["prisma", "migrate", "dev"])}
+`) : ""}
 
-          Generate jobs with: ${c.highlight("yarn cedar g job <name>")}
-          Execute jobs with:  ${c.highlight("yarn cedar jobs work\n")}
+          Generate jobs with: ${c.highlight(formatCedarCommand(["g", "job", "<name>"]))}
+          Execute jobs with:  ${c.highlight(`${formatCedarCommand(["jobs", "work"])}
+`)}
 
           Check out the docs for more info:
           ${terminalLink("", "https://cedarjs.com/docs/background-jobs")}

package/dist/commands/setup/package/packageHandler.js

@@ -1,7 +1,7 @@
 import enq from "enquirer";
-import execa from "execa";
 import semver from "semver";
 import { getCompatibilityData } from "@cedarjs/cli-helpers";
+import { dlx } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths } from "@cedarjs/project-config";
 async function handler({ npmPackage, force, _: _args }) {
   const isScoped = npmPackage.startsWith("@");
@@ -106,7 +106,7 @@ async function runPackage(packageName, version, options = []) {
   const versionString = version === void 0 ? "" : `@${version}`;
   console.log(`Running ${packageName}${versionString}...`);
   try {
-    await execa("yarn", ["dlx", `${packageName}${versionString}`, ...options], {
+    await dlx(`${packageName}${versionString}`, options, {
       stdio: "inherit",
       cwd: getPaths().base
     });

package/dist/commands/setup/realtime/realtimeHandler.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
 import path from "path";
-import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
 import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
@@ -333,9 +333,9 @@ async function handler(args) {
             getPaths().api.functions,
             `graphql.${isTypeScriptProject() ? "ts" : "js"}`
           );
-          execa.sync(
-            "yarn",
-            ["cedar", "lint", "--fix", graphqlHandlerPath, realtimeLibFilePath],
+          runBinSync(
+            "cedar",
+            ["lint", "--fix", graphqlHandlerPath, realtimeLibFilePath],
             {
               cwd: getPaths().base,
               // Silently ignore errors

package/dist/commands/setup/ui/libraries/chakra-uiHandler.js

@@ -1,7 +1,7 @@
 import path from "path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.js";
@@ -34,7 +34,9 @@ async function handler({ force, install }) {
               {
                 title: `Install ${packages.join(", ")}`,
                 task: async () => {
-                  await execa("yarn", ["workspace", "web", "add", ...packages]);
+                  await addWorkspacePackages("web", packages, {
+                    cwd: rwPaths.base
+                  });
                 }
               }
             ],

package/dist/commands/setup/ui/libraries/mantineHandler.js

@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.js";
@@ -51,14 +51,14 @@ async function handler({ force, install, packages }) {
               {
                 title: `Install ${installPackages.join(", ")}`,
                 task: async () => {
-                  await execa("yarn", [
-                    "workspace",
-                    "web",
-                    "add",
-                    "-D",
-                    "@emotion/react",
-                    ...installPackages
-                  ]);
+                  await addWorkspacePackages("web", installPackages, {
+                    cwd: cedarPaths.base,
+                    dev: true
+                  });
+                  await addWorkspacePackages("web", ["@emotion/react"], {
+                    cwd: cedarPaths.base,
+                    dev: true
+                  });
                 }
               }
             ],

package/dist/commands/setup/ui/libraries/tailwindcssHandler.js

@@ -5,6 +5,12 @@ import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import {
+  addRootPackages,
+  addWorkspacePackages
+} from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, usingVSCode } from "../../../../lib/index.js";
 const tailwindDirectives = [
@@ -19,7 +25,7 @@ const tailwindImportsAndNotes = [
   "/**",
   " * START --- SETUP TAILWINDCSS EDIT",
   " *",
-  " * `yarn cedar setup ui tailwindcss` placed these directives here",
+  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed these directives here`,
   " * to inject Tailwind's styles into your CSS.",
   " * For more information, see: https://tailwindcss.com/docs/installation",
   " */",
@@ -93,8 +99,9 @@ const handler = async ({ force, install }) => {
               {
                 title: `Install ${projectPackages.join(", ")}`,
                 task: async () => {
-                  await execa("yarn", ["add", "-D", ...projectPackages], {
-                    cwd: rwPaths.base
+                  await addRootPackages(projectPackages, {
+                    cwd: rwPaths.base,
+                    dev: true
                   });
                 }
               }
@@ -112,19 +119,16 @@ const handler = async ({ force, install }) => {
               {
                 title: `Install ${webWorkspacePackages.join(", ")}`,
                 task: async () => {
-                  await execa(
-                    "yarn",
-                    ["workspace", "web", "add", "-D", ...webWorkspacePackages],
-                    {
-                      cwd: rwPaths.base,
-                      env: {
-                        // For some reason yarn started installing deprecated
-                        // typescript types when installing tailwind. This
-                        // prevents it from happening.
-                        YARN_TS_ENABLE_AUTO_TYPES: "false"
-                      }
-                    }
-                  );
+                  await addWorkspacePackages("web", webWorkspacePackages, {
+                    cwd: rwPaths.base,
+                    env: {
+                      // For some reason yarn started installing deprecated
+                      // typescript types when installing tailwind. This
+                      // prevents it from happening. (yarn-only env var.)
+                      YARN_TS_ENABLE_AUTO_TYPES: "false"
+                    },
+                    dev: true
+                  });
                 }
               }
             ],
@@ -169,7 +173,7 @@ const handler = async ({ force, install }) => {
               );
             }
           }
-          await execa("yarn", ["tailwindcss", "init", tailwindConfigPath], {
+          await runBin("tailwindcss", ["init", tailwindConfigPath], {
             cwd: rwPaths.web.base
           });
           const tailwindConfig = fs.readFileSync(tailwindConfigPath, "utf-8");

package/dist/commands/setup/uploads/uploadsHandler.js

@@ -8,6 +8,7 @@ import {
   getPrettierOptions,
   colors as c
 } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
@@ -124,7 +125,7 @@ const handler = async ({ force }) => {
 
           ${c.success("\nUploads and storage configured!\n")}
 
-          Remember to add UPLOADS_SECRET to your .env file. You can generate one with ${c.highlight("yarn cedar generate secret")}
+          Remember to add UPLOADS_SECRET to your .env file. You can generate one with ${c.highlight(formatCedarCommand(["generate", "secret"]))}
 
           Check out the docs for more info:
           ${terminalLink("", "https://cedarjs.com/docs/uploads")}

package/dist/lib/packages.js

@@ -2,6 +2,9 @@ import fs from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import execa from "execa";
+import { dedupe } from "@cedarjs/cli-helpers/packageManager";
+import { addRootPackages } from "@cedarjs/cli-helpers/packageManager/packages";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { getPaths } from "./index.js";
 async function installModule(name, version = void 0) {
   if (isModuleInstalled(name)) {
@@ -10,7 +13,8 @@ async function installModule(name, version = void 0) {
   if (version === void 0) {
     return installCedarModule(name);
   } else {
-    await execa.command(`yarn add -D ${name}@${version}`, {
+    await addRootPackages([`${name}@${version}`], {
+      dev: true,
       stdio: "inherit",
       cwd: getPaths().base
     });
@@ -44,14 +48,18 @@ async function installCedarModule(module) {
     if (!versionIsPublished) {
       version = "canary";
     }
-    await execa.command(`yarn add -D ${module}@${version}`, {
-      stdio: "inherit",
-      cwd: getPaths().base
-    });
-    await execa.command(`yarn dedupe`, {
+    await addRootPackages([`${module}@${version}`], {
+      dev: true,
       stdio: "inherit",
       cwd: getPaths().base
     });
+    const dedupeCommand = dedupe();
+    if (dedupeCommand) {
+      await execa(getPackageManager(), [dedupeCommand], {
+        stdio: "inherit",
+        cwd: getPaths().base
+      });
+    }
     return true;
   }
   return false;

package/package.json

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