@cedarjs/cli 4.0.0-canary.13709 → 4.0.0-canary.13711

package/dist/commands/build/buildHandler.js

@@ -5,6 +5,11 @@ import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import {
+  formatCedarCommand,
+  formatRunWorkspaceScriptCommand
+} from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { buildApi, cleanApiBuild } from "@cedarjs/internal/dist/build/api";
 import { generate } from "@cedarjs/internal/dist/generate/generate";
 import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
@@ -124,7 +129,9 @@ const handler = async ({
 ${details}
 
 This usually means the package has not been built yet.
-Run ` + c.info("yarn cedar build") + " (without specifying a workspace) to build everything,\nor build the package manually first, e.g. " + c.info(`yarn workspace ${problems[0].pkgName} build`)
+Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspace) to build everything,\nor build the package manually first, e.g. " + c.info(
+            formatRunWorkspaceScriptCommand(problems[0].pkgName, "build")
+          )
         );
       }
     },
@@ -193,9 +200,8 @@ Run ` + c.info("yarn cedar build") + " (without specifying a workspace) to build
       );
       return;
     }
-    await execa("yarn cedar prerender", {
+    await runBin("cedar", ["prerender"], {
       stdio: "inherit",
-      shell: true,
       cwd: cedarPaths.web.base
     });
   };

package/dist/commands/build/buildPackagesTask.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
+import { runScript } from "@cedarjs/cli-helpers/packageManager/exec";
 import { importStatementPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
@@ -28,7 +28,7 @@ async function buildPackagesTask(task, nonApiWebWorkspaces) {
         title: name,
         task: async () => {
           try {
-            await execa("yarn", ["build"], { cwd: workspacePath });
+            await runScript("build", [], { cwd: workspacePath });
           } catch (e) {
             errorTelemetry(
               process.argv,

package/dist/commands/lint.js

@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths, getConfig } from "@cedarjs/project-config";
 function detectLegacyEslintConfig() {
   const projectRoot = getPaths().base;
@@ -93,9 +93,14 @@ const handler = async ({
   }
   try {
     const sbPath = getPaths().web.storybook;
-    const args = ["eslint", fix && "--fix", "--format", format, ...paths];
+    const eslintArgs = [
+      fix && "--fix",
+      "--format",
+      format,
+      ...paths
+    ];
     if (paths.length === 0) {
-      args.push(
+      eslintArgs.push(
         fs.existsSync(getPaths().web.src) && "web/src",
         fs.existsSync(getPaths().web.config) && "web/config",
         fs.existsSync(sbPath) && "web/.storybook",
@@ -103,8 +108,10 @@ const handler = async ({
         fs.existsSync(getPaths().api.src) && "api/src"
       );
     }
-    const filteredArgs = args.filter((arg) => Boolean(arg));
-    const result = await execa("yarn", filteredArgs, {
+    const filteredEslintArgs = eslintArgs.filter(
+      (arg) => Boolean(arg)
+    );
+    const result = await runBin("eslint", filteredEslintArgs, {
       cwd: getPaths().base,
       stdio: "inherit"
     });

package/dist/commands/prerenderHandler.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../lib/colors.js";
@@ -108,7 +109,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
   const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(
-      "You must run `yarn cedar build web` before trying to prerender."
+      `You must run \`${formatCedarCommand(["build", "web"])}\` before trying to prerender.`
     );
     process.exit(1);
   }
@@ -236,7 +237,9 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
   } catch (error) {
     console.log();
     console.log(
-      c.warning("You can use `yarn cedar prerender --dry-run` to debug")
+      c.warning(
+        "You can use `" + formatCedarCommand(["prerender", "--dry-run"]) + "` to debug"
+      )
     );
     console.log();
     const sep = c.info("-".repeat(10));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "4.0.0-canary.13709+a37accbc4",
+  "version": "4.0.0-canary.13711+e6c1fb8ae",
   "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.13709",
-    "@cedarjs/cli-helpers": "4.0.0-canary.13709",
-    "@cedarjs/fastify-web": "4.0.0-canary.13709",
-    "@cedarjs/internal": "4.0.0-canary.13709",
-    "@cedarjs/prerender": "4.0.0-canary.13709",
-    "@cedarjs/project-config": "4.0.0-canary.13709",
-    "@cedarjs/structure": "4.0.0-canary.13709",
-    "@cedarjs/telemetry": "4.0.0-canary.13709",
-    "@cedarjs/utils": "4.0.0-canary.13709",
-    "@cedarjs/web-server": "4.0.0-canary.13709",
+    "@cedarjs/api-server": "4.0.0-canary.13711",
+    "@cedarjs/cli-helpers": "4.0.0-canary.13711",
+    "@cedarjs/fastify-web": "4.0.0-canary.13711",
+    "@cedarjs/internal": "4.0.0-canary.13711",
+    "@cedarjs/prerender": "4.0.0-canary.13711",
+    "@cedarjs/project-config": "4.0.0-canary.13711",
+    "@cedarjs/structure": "4.0.0-canary.13711",
+    "@cedarjs/telemetry": "4.0.0-canary.13711",
+    "@cedarjs/utils": "4.0.0-canary.13711",
+    "@cedarjs/web-server": "4.0.0-canary.13711",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a37accbc4c58ec77abf3e21fcea65b4a65388487"
+  "gitHead": "e6c1fb8aed3772e91a21580fe9007ce3518679d6"
 }