@cedarjs/cli 5.0.0-canary.2456 → 5.0.0-canary.2458

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

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import boxen from "boxen";
+import execa from "execa";
 import { Listr } from "listr2";
 import * as toml from "smol-toml";
 import { env as envInterpolation } from "string-env-interpolation";
@@ -490,6 +491,44 @@ const commands = (yargs, ssh) => {
   }
   return servers;
 };
+const warnIfUnpushedCommits = async () => {
+  try {
+    const { stdout } = await execa("git", ["log", "@{u}..", "--oneline"], {
+      cwd: getPaths().base
+    });
+    const unpushedCommits = stdout.trim();
+    if (!unpushedCommits) {
+      return;
+    }
+    console.warn(
+      c.warning("\nWarning: You have local commits that have not been pushed:")
+    );
+    console.warn(
+      unpushedCommits.split("\n").map((line) => `  ${line}`).join("\n")
+    );
+    console.warn(
+      c.warning(
+        "The server will pull from the remote, so these commits will not be deployed.\n"
+      )
+    );
+    const { default: prompts } = await import("prompts");
+    const { confirmed } = await prompts({
+      type: "confirm",
+      name: "confirmed",
+      message: "Deploy anyway?",
+      initial: false
+    });
+    if (!confirmed) {
+      console.log("Aborting deploy. Push your commits and try again.");
+      process.exit(1);
+    }
+  } catch (e) {
+    console.error(
+      c.error("\nCould not check for unpushed commits before deploying.")
+    );
+    throw e;
+  }
+};
 const handler = async (yargs) => {
   const { SshExecutor } = await import("./SshExecutor.js");
   const tomlPath = path.join(getPaths().base, "deploy.toml");
@@ -500,6 +539,9 @@ const handler = async (yargs) => {
     );
     process.exit(1);
   }
+  if (yargs.gitCheck) {
+    await warnIfUnpushedCommits();
+  }
   const ssh = new SshExecutor(yargs.verbose);
   try {
     const tasks = new Listr(commands(yargs, ssh), {
@@ -533,5 +575,6 @@ export {
   serverConfigWithDefaults,
   throwMissingConfig,
   verifyConfig,
-  verifyServerConfig
+  verifyServerConfig,
+  warnIfUnpushedCommits
 };

package/dist/commands/deploy/baremetal.js

@@ -71,6 +71,11 @@ const builder = (yargs) => {
     default: false,
     type: "boolean"
   });
+  yargs.option("git-check", {
+    describe: "Check for unpushed commits before deploying",
+    default: true,
+    type: "boolean"
+  });
   yargs.epilogue(
     `Also see the ${terminalLink(
       "Redwood Baremetal Deploy Reference",
@@ -92,7 +97,8 @@ async function handler(yargs) {
     cleanup: yargs.cleanup,
     maintenance: yargs.maintenance,
     rollback: yargs.rollback,
-    verbose: yargs.verbose
+    verbose: yargs.verbose,
+    gitCheck: yargs.gitCheck
   });
   const { handler: baremetalHandler } = await import("./baremetal/baremetalHandler.js");
   return baremetalHandler(yargs);

package/dist/commands/generate/ogImage/ogImageHandler.js

@@ -13,7 +13,10 @@ import {
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
-const files = async ({ pagePath, typescript = false }) => {
+const files = async ({
+  pagePath,
+  typescript = false
+}) => {
   const extension = typescript ? ".tsx" : ".jsx";
   const componentOutputPath = path.join(
     getPaths().web.pages,
@@ -73,6 +76,10 @@ const handler = async (options) => {
   const extension = options.typescript ? "tsx" : "jsx";
   try {
     await validatePath(normalizedPagePath, extension);
+    const listrOptions = {
+      exitOnError: true,
+      ...options.verbose ? { renderer: "verbose" } : { rendererOptions: { collapseSubtasks: false } }
+    };
     const tasks = new Listr(
       [
         {
@@ -86,22 +93,22 @@ const handler = async (options) => {
           }
         }
       ],
-      {
-        rendererOptions: { collapseSubtasks: false },
-        exitOnError: true,
-        renderer: options.verbose && "verbose"
-      }
+      listrOptions
     );
     if (options.rollback && !options.force) {
       prepareForRollback(tasks);
     }
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(errorExitCode(e));
   }
 };
+function errorExitCode(e) {
+  return typeof e === "object" && e !== null && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+}
 export {
   files,
   handler,

package/dist/commands/generate/secret/secret.js

@@ -3,13 +3,13 @@ import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const DEFAULT_LENGTH = 32;
 const generateSecret = (length = DEFAULT_LENGTH) => {
-  return crypto.randomBytes(length).toString("base64");
+  return crypto.randomBytes(Math.trunc(length)).toString("base64");
 };
 const command = "secret";
 const description = "Generates a secret key using a cryptographically-secure source of entropy";
 const builder = (yargs) => yargs.option("length", {
   description: "Length of the generated secret",
-  type: "integer",
+  type: "number",
   required: false,
   default: DEFAULT_LENGTH
 }).option("raw", {

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -51,7 +51,11 @@ const templateForFile = async ({
   templatePath,
   templateVars
 }) => {
-  const basePath = sidePathSection ? getPaths()[side][sidePathSection] : getPaths()[side];
+  const sideBase = getPaths()[side];
+  const basePath = sidePathSection ? sideBase[sidePathSection] : sideBase;
+  if (typeof basePath !== "string") {
+    throw new Error(`Invalid path section: "${sidePathSection}"`);
+  }
   const fullOutputPath = path.join(basePath, outputPath);
   const fullTemplatePath = customOrDefaultTemplatePath({
     generator,
@@ -126,6 +130,10 @@ function createHandler({
     validateName(argv.name);
     try {
       argv = await preTasksFn(argv);
+      const listrOptions = {
+        exitOnError: true,
+        ...argv.verbose ? { renderer: "verbose" } : { rendererOptions: { collapseSubtasks: false } }
+      };
       const tasks = new Listr(
         [
           {
@@ -137,28 +145,28 @@ function createHandler({
           },
           ...includeAdditionalTasks(argv)
         ],
-        {
-          rendererOptions: { collapseSubtasks: false },
-          exitOnError: true,
-          renderer: argv.verbose && "verbose"
-        }
+        listrOptions
       );
       if (argv.rollback && !argv.force) {
         prepareForRollback(tasks);
       }
       await tasks.run();
     } catch (e) {
-      errorTelemetry(process.argv, e.message);
-      console.error(c.error(e.message));
-      process.exit(e?.exitCode || 1);
+      const message = e instanceof Error ? e.message : String(e);
+      errorTelemetry(process.argv, message);
+      console.error(c.error(message));
+      process.exit(errorExitCode(e));
     }
   };
 }
+function errorExitCode(e) {
+  return typeof e === "object" && e !== null && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+}
 const createYargsForComponentGeneration = ({
   componentName,
   preTasksFn = (options) => options,
   /** filesFn is not used if generator implements its own `handler` */
-  filesFn = () => ({}),
+  filesFn = async () => ({}),
   optionsObj,
   positionalsObj = {},
   /** function that takes the options object and returns an array of listr tasks */

package/dist/lib/rollback.js

@@ -21,7 +21,7 @@ function addFileToRollback(filePath, atEnd = false) {
     rollback.push(step);
   }
 }
-async function executeRollback(_ = null, task = null) {
+const executeRollback = async (_, task) => {
   if (task) {
     task.title = "Reverting generator actions...";
   }
@@ -53,7 +53,7 @@ async function executeRollback(_ = null, task = null) {
   if (task) {
     task.title = `Reverted because: ${task.task.message?.error ?? "unknown error"}`;
   }
-}
+};
 function resetRollback() {
   rollback.length = 0;
 }

package/dist/middleware/checkNodeVersion.js

@@ -5,6 +5,9 @@ function checkNodeVersion() {
   const pVersion = process.version;
   const pVersionC = semver.clean(pVersion);
   const LOWER_BOUND = "v24.0.0";
+  if (!pVersionC) {
+    return checks;
+  }
   if (semver.gte(pVersionC, LOWER_BOUND)) {
     return checks;
   }

package/package.json

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