@cedarjs/cli 0.0.5 → 1.0.0-canary.12246

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

@@ -5,10 +5,8 @@ import { Listr } from "listr2";
 import * as toml from "smol-toml";
 import { env as envInterpolation } from "string-env-interpolation";
 import { titleCase } from "title-case";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import c from "../../../lib/colors.js";
 import { getPaths } from "../../../lib/index.js";
-import { SshExecutor } from "./SshExecutor.js";
 const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
 const CURRENT_RELEASE_SYMLINK_NAME = "current";
@@ -19,7 +17,8 @@ const DEFAULT_SERVER_CONFIG = {
   packageManagerCommand: "yarn",
   monitorCommand: "pm2",
   sides: ["api", "web"],
-  keepReleases: 5
+  keepReleases: 5,
+  freeSpaceRequired: 2048
 };
 const pathJoin = path.posix.join;
 const throwMissingConfig = (name) => {
@@ -48,7 +47,7 @@ const verifyServerConfig = (config) => {
   if (!config.repo) {
     throwMissingConfig("repo");
   }
-  if (config.freeSpaceRequired && !/^\d+$/.test(config.freeSpaceRequired)) {
+  if (!/^\d+$/.test(config.freeSpaceRequired)) {
     throw new Error('"freeSpaceRequired" must be an integer >= 0');
   }
   return true;
@@ -232,15 +231,8 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
             10
           );
           if (dfMb < freeSpaceRequired) {
-            if (typeof serverConfig.freeSpaceRequired === "undefined") {
-              return task.skip(
-                c.warning(
-                  `Warning: Your server is running low on disk space. (${Math.round(dfMb)}MB available)`
-                )
-              );
-            }
             throw new Error(
-              `Not enough disk space. You need at least ${freeSpaceRequired}MB free space to continue.`
+              `Not enough disk space. You need at least ${freeSpaceRequired}MB free space to continue. (Currently ${Math.round(dfMb)}MB available)`
             );
           }
         }
@@ -499,20 +491,7 @@ const commands = (yargs, ssh) => {
   return servers;
 };
 const handler = async (yargs) => {
-  recordTelemetryAttributes({
-    command: "deploy baremetal",
-    firstRun: yargs.firstRun,
-    df: yargs.df,
-    update: yargs.update,
-    install: yargs.install,
-    migrate: yargs.migrate,
-    build: yargs.build,
-    restart: yargs.restart,
-    cleanup: yargs.cleanup,
-    maintenance: yargs.maintenance,
-    rollback: yargs.rollback,
-    verbose: yargs.verbose
-  });
+  const { SshExecutor } = await import("./SshExecutor.js");
   const tomlPath = path.join(getPaths().base, "deploy.toml");
   const ecosystemPath = path.join(getPaths().base, "ecosystem.config.js");
   if (!fs.existsSync(tomlPath) || !fs.existsSync(ecosystemPath)) {

package/dist/commands/deploy/baremetal.js

@@ -1,4 +1,5 @@
 import terminalLink from "terminal-link";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "baremetal [environment]";
 const description = "Deploy to baremetal server(s)";
 const builder = (yargs) => {
@@ -78,8 +79,22 @@ const builder = (yargs) => {
   );
 };
 async function handler(yargs) {
-  const { handler: importedHandler } = await import("./baremetal/baremetalHandler.js");
-  return importedHandler(yargs);
+  recordTelemetryAttributes({
+    command: "deploy baremetal",
+    firstRun: yargs.firstRun,
+    df: yargs.df,
+    update: yargs.update,
+    install: yargs.install,
+    migrate: yargs.migrate,
+    build: yargs.build,
+    restart: yargs.restart,
+    cleanup: yargs.cleanup,
+    maintenance: yargs.maintenance,
+    rollback: yargs.rollback,
+    verbose: yargs.verbose
+  });
+  const { handler: baremetalHandler } = await import("./baremetal/baremetalHandler.js");
+  return baremetalHandler(yargs);
 }
 export {
   builder,

package/dist/commands/deploy/flightcontrol.js

@@ -26,6 +26,7 @@ const builder = (yargs) => {
       "https://redwoodjs.com/docs/cli-commands#deploy"
     )}`
   );
+  return yargs;
 };
 async function handler(yargs) {
   const { handler: importedHandler } = await import("./flightcontrolHandler.js");

package/dist/commands/deploy/flightcontrolHandler.js

@@ -3,7 +3,12 @@ import execa from "execa";
 import fs from "fs-extra";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getPaths } from "@cedarjs/project-config";
-const handler = async ({ side, serve, prisma, dm: dataMigrate }) => {
+const handler = async ({
+  side,
+  serve,
+  prisma,
+  dm: dataMigrate
+}) => {
   recordTelemetryAttributes({
     command: "deploy flightcontrol",
     side,
@@ -17,20 +22,26 @@ const handler = async ({ side, serve, prisma, dm: dataMigrate }) => {
     shell: true,
     stdio: "inherit"
   };
+  async function runExecaCommand(command) {
+    const result = await execa.command(command, execaConfig);
+    if (result.failed) {
+      throw new Error(`Command (${command}) failed`);
+    }
+    return result;
+  }
   async function runApiCommands() {
     if (!serve) {
       console.log("Building api...");
-      execa.commandSync("yarn rw build api --verbose", execaConfig);
+      await runExecaCommand("yarn rw build api --verbose");
       if (prisma) {
         console.log("Running database migrations...");
-        execa.commandSync(
-          `node_modules/.bin/prisma migrate deploy --schema "${rwjsPaths.api.dbSchema}"`,
-          execaConfig
+        await runExecaCommand(
+          `node_modules/.bin/prisma migrate deploy --schema "${rwjsPaths.api.dbSchema}"`
         );
       }
       if (dataMigrate) {
         console.log("Running data migrations...");
-        execa.commandSync("yarn rw dataMigrate up", execaConfig);
+        await runExecaCommand("yarn rw dataMigrate up");
       }
       return;
     }
@@ -45,12 +56,12 @@ const handler = async ({ side, serve, prisma, dm: dataMigrate }) => {
   }
   async function runWebCommands() {
     console.log("Building web...");
-    execa.commandSync("yarn rw build web --verbose", execaConfig);
+    await runExecaCommand("yarn rw build web --verbose");
   }
   if (side === "api") {
-    runApiCommands();
+    await runApiCommands();
   } else if (side === "web") {
-    runWebCommands();
+    await runWebCommands();
   }
 };
 export {

package/dist/commands/execHandler.js

@@ -45,6 +45,11 @@ const handler = async (args) => {
     printAvailableScriptsToConsole();
     return;
   }
+  scriptArgs._ = scriptArgs._.slice(1);
+  delete scriptArgs.$0;
+  delete scriptArgs.l;
+  delete scriptArgs.s;
+  delete scriptArgs.silent;
   const {
     overrides: _overrides,
     plugins: webPlugins,

package/dist/commands/upgrade.js

@@ -1,4 +1,5 @@
 import path from "path";
+import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import fs from "fs-extra";
 import latestVersion from "latest-version";
@@ -35,6 +36,11 @@ const builder = (yargs) => {
     description: "Skip dedupe check with --no-dedupe",
     type: "boolean",
     default: true
+  }).option("yes", {
+    alias: "y",
+    describe: "Skip prompts and use defaults",
+    default: false,
+    type: "boolean"
   }).epilogue(
     `Also see the ${terminalLink(
       "Cedar CLI Reference for the upgrade command",
@@ -64,16 +70,43 @@ const validateTag = (tag) => {
   }
   return tag;
 };
-const handler = async ({ dryRun, tag, verbose, dedupe }) => {
+const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
   recordTelemetryAttributes({
     command: "upgrade",
     dryRun,
     tag,
     verbose,
-    dedupe
+    dedupe,
+    yes
   });
   const tasks = new Listr(
     [
+      {
+        title: "Confirm upgrade",
+        task: async (ctx, task) => {
+          if (yes) {
+            task.skip("Skipping confirmation prompt because of --yes flag.");
+            return;
+          }
+          const prompt = task.prompt(ListrEnquirerPromptAdapter);
+          const proceed = await prompt.run({
+            type: "Confirm",
+            message: "This will upgrade your Cedar project to the latest version. Do you want to proceed?",
+            initial: "Y",
+            default: "(Yes/no)",
+            format: function(value) {
+              if (this.state.submitted) {
+                return this.isTrue(value) ? "yes" : "no";
+              }
+              return "Yes";
+            }
+          });
+          if (!proceed) {
+            task.skip("Upgrade cancelled by user.");
+            process.exit(0);
+          }
+        }
+      },
       {
         title: "Checking latest version",
         task: async (ctx) => setLatestVersionToContext(ctx, tag)
@@ -162,7 +195,7 @@ const handler = async ({ dryRun, tag, verbose, dedupe }) => {
       }
     ],
     {
-      renderer: verbose && "verbose",
+      renderer: verbose ? "verbose" : "default",
       rendererOptions: { collapseSubtasks: false }
     }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "0.0.5",
+  "version": "1.0.0-canary.12246+0f1d1e1f9",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   ],
   "scripts": {
     "build": "tsx ./build.mts",
-    "build:pack": "yarn pack -o cedar-cli.tgz",
+    "build:pack": "yarn pack -o cedarjs-cli.tgz",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
     "dev": "RWJS_CWD=../../__fixtures__/example-todo-main node dist/index.js",
     "fix:permissions": "chmod +x dist/index.js dist/rwfw.js",
@@ -29,15 +29,15 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.26.10",
-    "@cedarjs/api-server": "0.0.5",
-    "@cedarjs/cli-helpers": "0.0.5",
-    "@cedarjs/fastify-web": "0.0.5",
-    "@cedarjs/internal": "0.0.5",
-    "@cedarjs/prerender": "0.0.5",
-    "@cedarjs/project-config": "0.0.5",
-    "@cedarjs/structure": "0.0.5",
-    "@cedarjs/telemetry": "0.0.5",
-    "@cedarjs/web-server": "0.0.5",
+    "@cedarjs/api-server": "1.0.0-canary.12246",
+    "@cedarjs/cli-helpers": "1.0.0-canary.12246",
+    "@cedarjs/fastify-web": "1.0.0-canary.12246",
+    "@cedarjs/internal": "1.0.0-canary.12246",
+    "@cedarjs/prerender": "1.0.0-canary.12246",
+    "@cedarjs/project-config": "1.0.0-canary.12246",
+    "@cedarjs/structure": "1.0.0-canary.12246",
+    "@cedarjs/telemetry": "1.0.0-canary.12246",
+    "@cedarjs/web-server": "1.0.0-canary.12246",
     "@listr2/prompt-adapter-enquirer": "2.0.12",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -95,8 +95,5 @@
     "typescript": "5.6.2",
     "vitest": "2.1.9"
   },
-  "publishConfig": {
-    "access": "public"
-  },
-  "gitHead": "f30c8374515a740c7fc7a09530f28abfd777035c"
+  "gitHead": "0f1d1e1f96a616945f54222de4147d9f99b0f883"
 }