@cedarjs/cli 8.0.0-canary.3630 → 8.0.0-canary.3633

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

@@ -888,43 +888,55 @@ const commands = (yargs, ssh) => {
   }
   return servers;
 };
-const warnIfUnpushedCommits = async () => {
+const warnIfUnpushedCommits = async (yes = false) => {
+  let unpushedCommits;
   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);
-    }
+    unpushedCommits = stdout.trim();
   } catch (e) {
     console.error(
       c.error("\nCould not check for unpushed commits before deploying.")
     );
     throw e;
   }
+  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"
+    )
+  );
+  console.warn(c.warning("To skip this check, rerun with --no-git-check.\n"));
+  if (yes) {
+    return;
+  }
+  if (process.stdin.isTTY !== true) {
+    throw new Error(
+      "Cannot ask whether to deploy anyway without a terminal. Push your commits, rerun with --no-git-check to skip this check, or rerun with --yes to deploy anyway."
+    );
+  }
+  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, or rerun with --no-git-check."
+    );
+    process.exit(1);
+  }
 };
 const handler = async (yargs) => {
   const { SshExecutor } = await import("./SshExecutor.js");
@@ -936,7 +948,7 @@ const handler = async (yargs) => {
     process.exit(1);
   }
   if (yargs.gitCheck) {
-    await warnIfUnpushedCommits();
+    await warnIfUnpushedCommits(yargs.yes);
   }
   const ssh = new SshExecutor(yargs.verbose ?? false);
   try {

package/dist/commands/deploy/baremetal.js

@@ -81,6 +81,12 @@ const builder = (yargs) => {
     default: true,
     type: "boolean"
   });
+  yargs.option("yes", {
+    alias: "y",
+    describe: "Deploy despite unpushed commits, without prompting",
+    default: false,
+    type: "boolean"
+  });
   yargs.epilogue(
     `Also see the ${terminalLink(
       "Cedar Baremetal Deploy Reference",
@@ -104,7 +110,8 @@ async function handler(yargs) {
     maintenance: yargs.maintenance,
     rollback: yargs.rollback,
     verbose: yargs.verbose,
-    gitCheck: yargs.gitCheck
+    gitCheck: yargs.gitCheck,
+    yes: yargs.yes
   });
   const { handler: baremetalHandler } = await import("./baremetal/baremetalHandler.js");
   return baremetalHandler(yargs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3630",
+  "version": "8.0.0-canary.3633",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -35,17 +35,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.12",
     "@babel/types": "7.29.11",
-    "@cedarjs/api-server": "8.0.0-canary.3630",
-    "@cedarjs/babel-config": "8.0.0-canary.3630",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3630",
-    "@cedarjs/internal": "8.0.0-canary.3630",
-    "@cedarjs/prerender": "8.0.0-canary.3630",
-    "@cedarjs/project-config": "8.0.0-canary.3630",
-    "@cedarjs/structure": "8.0.0-canary.3630",
-    "@cedarjs/telemetry": "8.0.0-canary.3630",
-    "@cedarjs/utils": "8.0.0-canary.3630",
-    "@cedarjs/vite": "8.0.0-canary.3630",
-    "@cedarjs/web-server": "8.0.0-canary.3630",
+    "@cedarjs/api-server": "8.0.0-canary.3633",
+    "@cedarjs/babel-config": "8.0.0-canary.3633",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3633",
+    "@cedarjs/internal": "8.0.0-canary.3633",
+    "@cedarjs/prerender": "8.0.0-canary.3633",
+    "@cedarjs/project-config": "8.0.0-canary.3633",
+    "@cedarjs/structure": "8.0.0-canary.3633",
+    "@cedarjs/telemetry": "8.0.0-canary.3633",
+    "@cedarjs/utils": "8.0.0-canary.3633",
+    "@cedarjs/vite": "8.0.0-canary.3633",
+    "@cedarjs/web-server": "8.0.0-canary.3633",
     "@listr2/prompt-adapter-enquirer": "4.4.3",
     "@prisma/internals": "7.10.1",
     "ansis": "4.5.0",
@@ -86,7 +86,7 @@
     "yargs": "18.2.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3630",
+    "@cedarjs/framework-tools": "8.0.0-canary.3633",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",