@cedarjs/cli 5.0.0-canary.2478 → 5.0.0-canary.2479

package/dist/commands/generate/cell/cellHandler.js

@@ -1,4 +1,5 @@
 import pascalcase from "pascalcase";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { isPlural, singularize } from "@cedarjs/utils/cedarPluralize";
 import { nameVariants, transformTSToJS } from "../../../lib/index.js";
@@ -141,7 +142,7 @@ const handler = createHandler({
             addFunctionToRollback(generateTypes, true);
           } else {
             task.skip(
-              `Skipping type generation: no SDL defined for "${queryFieldName}". To generate types, run 'yarn cedar generate sdl ${queryFieldName}'.`
+              `Skipping type generation: no SDL defined for "${queryFieldName}". To generate types, run '${formatCedarCommand(["generate", "sdl", queryFieldName])}'.`
             );
           }
         }

package/dist/commands/generate/dataMigration/dataMigration.js

@@ -3,6 +3,7 @@ import { paramCase } from "change-case";
 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 { getDataMigrationsPath } from "@cedarjs/project-config";
 import {
   generateTemplate,
@@ -12,14 +13,16 @@ import {
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
 import { getYargsDefaults } from "../yargsCommandHelpers.js";
-const POST_RUN_INSTRUCTIONS = `Next steps...
+function getPostRunInstructions() {
+  const text = c.warning("After writing your migration, you can run it with:");
+  const command2 = formatCedarCommand(["dataMigrate", "up"]);
+  return `Next steps...
 
-   ${c.warning(
-  "After writing your migration, you can run it with:"
-)}
+   ${text}
 
-     yarn cedar dataMigrate up
+   ${command2}
 `;
+}
 const TEMPLATE_PATHS = {
   js: path.resolve(
     import.meta.dirname,
@@ -89,7 +92,7 @@ const handler = async (args) => {
       {
         title: "Next steps...",
         task: (_ctx, task) => {
-          task.title = POST_RUN_INSTRUCTIONS;
+          task.title = getPostRunInstructions();
         }
       }
     ].filter(Boolean),
@@ -111,5 +114,6 @@ export {
   command,
   description,
   files,
+  getPostRunInstructions,
   handler
 };

package/dist/commands/generate/dbAuth/dbAuthHandler.js

@@ -2,10 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { camelCase } from "camel-case";
-import execa from "execa";
 import { Listr } from "listr2";
 import { titleCase } from "title-case";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
   addRoutesToRouterTask,
   addScaffoldImport,
@@ -36,7 +37,11 @@ function getPostInstallMessage(isDbAuthSetup2) {
     "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
     "   and ResetPasswordPage to change where the user redirects to after submitting",
     "   those forms.\n",
-    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn cedar setup auth dbAuth\n",
+    !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
+   app setup by running:
+
+     ${formatCedarCommand(["setup", "auth", "dbAuth"])}
+`,
     "   Happy authenticating!"
   ].filter(Boolean).join("\n");
 }
@@ -55,7 +60,11 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
     "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
     "   and ResetPasswordPage to change where the user redirects to after submitting",
     "   those forms.\n",
-    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn cedar setup auth dbAuth\n",
+    !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
+   app setup by running:
+
+     ${formatCedarCommand(["setup", "auth", "dbAuth"])}
+`,
     "   Happy authenticating!"
   ].filter(Boolean).join("\n");
 }
@@ -303,7 +312,7 @@ const tasks = ({
       {
         title: "Generate types...",
         task: () => {
-          execa.commandSync("yarn cedar g types");
+          runBinSync("cedar", ["g", "types"]);
         }
       },
       {

package/dist/commands/generate/directive/directiveHandler.js

@@ -1,8 +1,8 @@
 import camelcase from "camelcase";
-import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig } from "@cedarjs/project-config";
 import { writeFilesTask, transformTSToJS } from "../../../lib/index.js";
 import {
@@ -109,9 +109,9 @@ const handler = async (args) => {
         title: "Generating TypeScript definitions and GraphQL schemas ...",
         task: () => {
           addFunctionToRollback(async () => {
-            await execa("yarn", ["cedar-gen"], { stdio: "pipe" });
+            await runBin("cedar-gen", [], { stdio: "pipe" });
           }, true);
-          return execa("yarn", ["cedar-gen"], { stdio: "inherit" });
+          return runBin("cedar-gen", [], { stdio: "inherit" });
         }
       },
       {

package/dist/commands/generate/job/jobHandler.js

@@ -1,9 +1,9 @@
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import * as changeCase from "change-case";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   getPaths,
@@ -100,8 +100,7 @@ const handler = async ({ name, force, ...rest }) => {
       {
         title: "Cleaning up...",
         task: () => {
-          execa.sync("yarn", [
-            "eslint",
+          runBinSync("eslint", [
             "--fix",
             "--config",
             `${getPaths().base}/node_modules/@cedarjs/eslint-config/shared.js`,

package/dist/commands/generate/package/packageHandler.js

@@ -2,13 +2,14 @@ import fs from "node:fs";
 import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { paramCase, camelCase } from "change-case";
-import execa from "execa";
 import { modify, applyEdits } from "jsonc-parser";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import ts from "typescript";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
+import { runScript, runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
@@ -244,8 +245,8 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
 }
 async function installAndBuild(folderName) {
   const packagePath = path.join("packages", folderName);
-  await execa("yarn", ["install"], { stdio: "inherit", cwd: getPaths().base });
-  await execa("yarn", ["build"], { stdio: "inherit", cwd: packagePath });
+  await installPackages({ stdio: "inherit", cwd: getPaths().base });
+  await runScript("build", [], { stdio: "inherit", cwd: packagePath });
 }
 const handler = async ({ name, force, ...rest }) => {
   recordTelemetryAttributes({
@@ -425,8 +426,7 @@ const handler = async ({ name, force, ...rest }) => {
       {
         title: "Cleaning up...",
         task: () => {
-          execa.sync("yarn", [
-            "eslint",
+          runBinSync("eslint", [
             "--fix",
             "--config",
             `${getPaths().base}/node_modules/@cedarjs/eslint-config/index.js`,

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -2,11 +2,14 @@ import fs from "node:fs";
 import path from "path";
 import camelcase from "camelcase";
 import { paramCase } from "change-case";
-import execa from "execa";
 import humanize from "humanize-string";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import {
+  addWorkspacePackages,
+  removeWorkspacePackages
+} from "@cedarjs/cli-helpers/packageManager/packages";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
@@ -500,9 +503,9 @@ const addHelperPackages = async (task) => {
   if (packageJson.default.dependencies["humanize-string"]) {
     return task.skip("Skipping. Already installed");
   }
-  await execa("yarn", ["workspace", "web", "add", "humanize-string@2.1.0"]);
+  await addWorkspacePackages("web", ["humanize-string@2.1.0"]);
   addFunctionToRollback(async () => {
-    await execa("yarn", ["workspace", "web", "remove", "humanize-string"]);
+    await removeWorkspacePackages("web", ["humanize-string"]);
   });
 };
 const addSetImport = (task) => {

package/dist/commands/generate.js

@@ -1,6 +1,6 @@
-import execa from "execa";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import * as generateCell from "./generate/cell/cell.js";
 import * as generateComponent from "./generate/component/component.js";
 import * as generateDataMigration from "./generate/dataMigration/dataMigration.js";
@@ -32,7 +32,7 @@ const getExitCode = (error) => {
 const builder = (yargs) => yargs.command("types", "Generate supplementary code", {}, () => {
   recordTelemetryAttributes({ command: "generate types" });
   try {
-    execa.sync("yarn", ["cedar-gen"], { stdio: "inherit" });
+    runBinSync("cedar-gen", [], { stdio: "inherit" });
   } catch (error) {
     process.exitCode = getExitCode(error) ?? 1;
   }

package/dist/lib/test.js

@@ -76,6 +76,10 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
     }
   };
 });
+vi.mock("@cedarjs/project-config/packageManager", () => ({
+  getPackageManager: vi.fn(() => "yarn"),
+  resetPackageManagerCache: vi.fn()
+}));
 vi.mock("@cedarjs/cli-helpers", async (importOriginal) => {
   const originalCliHelpers = await importOriginal();
   return {

package/package.json

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