@cedarjs/cli 3.0.1-next.0 → 3.0.1-next.28

package/dist/commands/build/buildHandler.js

@@ -80,6 +80,7 @@ const handler = async ({
   const cedarConfig = getConfig();
   const useFragments = cedarConfig.graphql?.fragments;
   const useTrustedDocuments = cedarConfig.graphql?.trustedDocuments;
+  const usePackagesWorkspace = cedarConfig.experimental?.packagesWorkspace?.enabled;
   const prismaSchemaExists = fs.existsSync(cedarPaths.api.prismaConfig);
   const prerenderRoutes = prerender && workspace.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (workspace.includes("api") || prerenderRoutes.length > 0);
@@ -104,11 +105,11 @@ const handler = async ({
         });
       }
     },
-    nonApiWebWorkspaces.length > 0 && {
+    nonApiWebWorkspaces.length > 0 && usePackagesWorkspace && {
       title: "Building Packages...",
       task: (_ctx, task) => buildPackagesTask(task, nonApiWebWorkspaces)
     },
-    (workspace.includes("web") || workspace.includes("api")) && {
+    (workspace.includes("web") || workspace.includes("api")) && usePackagesWorkspace && {
       title: "Checking workspace packages...",
       task: () => {
         const problems = checkWorkspacePackageEntryPoints(cedarPaths);

package/dist/commands/deploy/baremetal.js

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

package/dist/commands/dev/apiDebugFlag.js

@@ -1,17 +1,18 @@
 import { argv } from "node:process";
 import { getConfig } from "@cedarjs/project-config";
-const defaultApiDebugPort = 18911;
-function getApiDebugFlag(apiDebugPort) {
+function getApiDebugFlag(apiDebugPort, apiAvailablePort) {
   if (apiDebugPort) {
     return `--debug-port ${apiDebugPort}`;
   } else if (argv.includes("--apiDebugPort")) {
-    return `--debug-port ${defaultApiDebugPort}`;
+    return `--debug-port ${"1" + apiAvailablePort}`;
   }
   const apiDebugPortInConfig = getConfig().api.debugPort;
   if (apiDebugPortInConfig) {
     return `--debug-port ${apiDebugPortInConfig}`;
+  } else if (apiDebugPortInConfig === false) {
+    return "";
   }
-  return "";
+  return `--debug-port ${"1" + apiAvailablePort}`;
 }
 export {
   getApiDebugFlag

package/dist/commands/dev/devHandler.js

@@ -135,7 +135,7 @@ const handler = async ({
         `  --watch "${cedarConfigPath}"`,
         `  --exec "yarn ${serverWatchCommand}`,
         `    --port ${apiAvailablePort}`,
-        `    ${getApiDebugFlag(apiDebugPort)}`,
+        `    ${getApiDebugFlag(apiDebugPort, apiAvailablePort)}`,
         '    | rw-log-formatter"'
       ].join(" ").replace(/\s+/g, " "),
       env: {

package/dist/commands/dev.js

@@ -23,7 +23,7 @@ const builder = (yargs) => {
     description: "Generate artifacts"
   }).option("apiDebugPort", {
     type: "number",
-    description: "Port on which to expose API server debugger. If you supply the flag with no value it defaults to 18911."
+    description: "Port on which to expose API server debugger. If you supply the flag with no value it defaults to 1 prepended to the api port (e.g. api port 8913 -> debug port 18913)."
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

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/generate/package/packageHandler.js

@@ -8,6 +8,7 @@ import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import ts from "typescript";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../lib/colors.js";
@@ -133,7 +134,7 @@ async function addDependencyToPackageJson(task, packageJsonPath, packageName) {
     task.skip("Dependency already exists");
     return;
   }
-  packageJson.dependencies[packageName] = "workspace:*";
+  packageJson.dependencies[packageName] = workspacePackageSpecifier();
   await fs.promises.writeFile(
     packageJsonPath,
     JSON.stringify(packageJson, null, 2)

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,20 +119,19 @@ 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 })
       },
       {
         title: "One more thing..",
         task: (ctx, task) => {
           const version = ctx.versionToUpgradeTo;
+          const upgradeMessage = dryRun ? `\u{1F3C3} Dry run complete. Your project would be upgraded to CedarJS ${version}.` : `\u{1F389} Your project has been upgraded to CedarJS ${version}!`;
           const messageSections = [
             `One more thing...
 
-   ${c.warning(
-              `\u{1F389} Your project has been upgraded to CedarJS ${version}!`
-            )} 
+   ${c.warning(upgradeMessage)} 
 
 `
           ];
@@ -192,17 +193,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 +446,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 +466,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/dist/lib/merge/index.js

@@ -80,11 +80,13 @@ function insertAfterLastImport(expression, program) {
 }
 function prune(path) {
   switch (path.parentPath.type) {
+    // If pruning 'path' would yield an ill-formed parent (e.g, '{foo:}' or 'const x;'), prune it.
     case "ObjectProperty":
     case "VariableDeclarator":
       return path.parentPath.remove();
     default:
       console.log(`Warning: default prune strategy for ${path.parentPath.type}`);
+    // eslint-disable-next-line no-fallthrough
     case "Program":
     case "ArrayExpression":
       return path.remove();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.1-next.0+776a0f168",
+  "version": "3.0.1-next.28+231f40ecc",
   "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": "3.0.1-next.0+776a0f168",
-    "@cedarjs/cli-helpers": "3.0.1-next.0+776a0f168",
-    "@cedarjs/fastify-web": "3.0.1-next.0+776a0f168",
-    "@cedarjs/internal": "3.0.1-next.0+776a0f168",
-    "@cedarjs/prerender": "3.0.1-next.0+776a0f168",
-    "@cedarjs/project-config": "3.0.1-next.0+776a0f168",
-    "@cedarjs/structure": "3.0.1-next.0+776a0f168",
-    "@cedarjs/telemetry": "3.0.1-next.0+776a0f168",
-    "@cedarjs/utils": "3.0.1-next.0+776a0f168",
-    "@cedarjs/web-server": "3.0.1-next.0+776a0f168",
+    "@cedarjs/api-server": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/cli-helpers": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/fastify-web": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/internal": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/prerender": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/project-config": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/structure": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/telemetry": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/utils": "3.0.1-next.28+231f40ecc",
+    "@cedarjs/web-server": "3.0.1-next.28+231f40ecc",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -83,7 +83,7 @@
     "semver": "7.7.4",
     "smol-toml": "1.6.0",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.31.4",
+    "systeminformation": "5.31.5",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
@@ -95,15 +95,18 @@
     "@babel/cli": "7.28.6",
     "@babel/core": "^7.26.10",
     "@types/archiver": "^7.0.0",
-    "memfs": "4.56.11",
+    "memfs": "4.57.1",
     "node-ssh": "13.2.1",
     "ts-dedent": "2.2.0",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "vitest": "3.2.4"
   },
+  "engines": {
+    "node": ">=24"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "776a0f168a2c1aba6f73c068eaec4d4f7029da96"
+  "gitHead": "231f40eccbc8a4b508d2e6faefb1f0d273f6d793"
 }