@cedarjs/cli 5.0.0-canary.2455 → 5.0.0-canary.2457

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/package.json

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