@zerodeploy/cli 0.1.1 → 0.1.2

package/README.md

@@ -214,6 +214,68 @@ Delete a deploy token.
 zerodeploy token delete 019b1234 --org my-company --site my-website
 ```
 
+### Custom Domains
+
+Connect your own domain to any ZeroDeploy site with automatic SSL.
+
+#### `zerodeploy domain add <domain> --org <org> --site <site>`
+
+Add a custom domain to a site. Returns DNS verification instructions.
+
+```bash
+zerodeploy domain add www.example.com --org my-company --site my-website
+```
+
+#### `zerodeploy domain verify <domain> --org <org> --site <site>`
+
+Verify domain ownership after adding the TXT record to your DNS.
+
+```bash
+zerodeploy domain verify www.example.com --org my-company --site my-website
+```
+
+#### `zerodeploy domain list --org <org> --site <site>`
+
+List all custom domains for a site.
+
+```bash
+zerodeploy domain list --org my-company --site my-website
+```
+
+#### `zerodeploy domain remove <domain> --org <org> --site <site>`
+
+Remove a custom domain from a site.
+
+```bash
+zerodeploy domain remove www.example.com --org my-company --site my-website
+```
+
+#### `zerodeploy domain redirect <domain> --org <org> --site <site> --mode <mode>`
+
+Set redirect mode for a custom domain. This allows automatic redirects between www and apex (non-www) domains.
+
+**Options:**
+- `--mode <mode>` - Redirect mode: `none`, `www_to_apex`, or `apex_to_www`
+
+```bash
+# Redirect www.example.com to example.com
+zerodeploy domain redirect example.com --org my-company --site my-website --mode www_to_apex
+
+# Redirect example.com to www.example.com
+zerodeploy domain redirect www.example.com --org my-company --site my-website --mode apex_to_www
+
+# Disable redirects
+zerodeploy domain redirect example.com --org my-company --site my-website --mode none
+```
+
+**Custom Domain Setup:**
+
+1. Add the domain: `zerodeploy domain add www.example.com --org my-org --site my-site`
+2. Add the TXT record to your DNS (shown in output)
+3. Verify ownership: `zerodeploy domain verify www.example.com --org my-org --site my-site`
+4. Add the CNAME record to your DNS (shown in output)
+5. Your site is now live at `https://www.example.com`
+
 ## Configuration File
 
 Create a `zerodeploy.json` in your project root:

package/dist/cli.js

@@ -3453,7 +3453,7 @@ var domainAddCommand = new Command2("add").description("Add a custom domain to a
     console.log(`   Value: ${data.verification.recordValue}`);
     console.log();
     console.log("After adding the record, run:");
-    console.log(`   zerodeploy domain verify ${data.id} --org ${options.org} --site ${options.site}`);
+    console.log(`   zerodeploy domain verify ${data.domain} --org ${options.org} --site ${options.site}`);
     console.log();
   } catch (err) {
     const message = err instanceof Error ? err.message : "Unknown error";
@@ -3474,6 +3474,16 @@ function formatStatus(status) {
       return status;
   }
 }
+function formatRedirect(mode) {
+  switch (mode) {
+    case "www_to_apex":
+      return "www→apex";
+    case "apex_to_www":
+      return "apex→www";
+    default:
+      return "";
+  }
+}
 var domainListCommand = new Command2("list").description("List custom domains for a site").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (options) => {
   const token = loadToken();
   if (!token) {
@@ -3501,7 +3511,9 @@ var domainListCommand = new Command2("list").description("List custom domains fo
     console.log("Custom Domains:");
     console.log();
     for (const d of domains) {
-      console.log(`  ${d.domain.padEnd(30)} ${formatStatus(d.verification_status).padEnd(15)} ${d.id}`);
+      const redirect = formatRedirect(d.redirect_mode);
+      const redirectStr = redirect ? ` [${redirect}]` : "";
+      console.log(`  ${d.domain.padEnd(30)} ${formatStatus(d.verification_status).padEnd(15)}${redirectStr}`);
     }
     console.log();
   } catch (err) {
@@ -3511,14 +3523,33 @@ var domainListCommand = new Command2("list").description("List custom domains fo
 });
 
 // src/commands/domain/verify.ts
-var domainVerifyCommand = new Command2("verify").description("Verify ownership of a custom domain").argument("<domainId>", "Domain ID to verify").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (domainId, options) => {
+var domainVerifyCommand = new Command2("verify").description("Verify ownership of a custom domain").argument("<domain>", "Domain to verify (e.g., www.example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (domainName, options) => {
   const token = loadToken();
   if (!token) {
     console.log("Not logged in. Run: zerodeploy login");
     return;
   }
   try {
-    const res = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains/${domainId}/verify`, {
+    const listRes = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains`, {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!listRes.ok) {
+      const error = await listRes.json();
+      throw new Error(error.error || `API Error ${listRes.status}`);
+    }
+    const domains = await listRes.json();
+    const domain = domains.find((d) => d.domain === domainName);
+    if (!domain) {
+      console.error(`
+❌ Domain not found: ${domainName}`);
+      console.log();
+      console.log("Add it first with:");
+      console.log(`  zerodeploy domain add ${domainName} --org ${options.org} --site ${options.site}`);
+      return;
+    }
+    const res = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains/${domain.id}/verify`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -3528,7 +3559,7 @@ var domainVerifyCommand = new Command2("verify").description("Verify ownership o
     const data = await res.json();
     if (!res.ok) {
       console.error(`
-❌ Verification failed for domain`);
+❌ Verification failed for ${domainName}`);
       if (data.message) {
         console.log();
         console.log(data.message);
@@ -3536,7 +3567,7 @@ var domainVerifyCommand = new Command2("verify").description("Verify ownership o
       console.log();
       console.log("Tips:");
       console.log("  • DNS changes can take up to 48 hours to propagate");
-      console.log("  • Verify the TXT record is set correctly using: dig TXT _zerodeploy.<domain>");
+      console.log(`  • Verify the TXT record is set correctly using: dig TXT _zerodeploy.${domainName}`);
       console.log("  • Try again in a few minutes");
       return;
     }
@@ -3587,14 +3618,33 @@ var domainVerifyCommand = new Command2("verify").description("Verify ownership o
 });
 
 // src/commands/domain/remove.ts
-var domainRemoveCommand = new Command2("remove").description("Remove a custom domain from a site").argument("<domainId>", "Domain ID to remove").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (domainId, options) => {
+var domainRemoveCommand = new Command2("remove").description("Remove a custom domain from a site").argument("<domain>", "Domain to remove (e.g., www.example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (domainName, options) => {
   const token = loadToken();
   if (!token) {
     console.log("Not logged in. Run: zerodeploy login");
     return;
   }
   try {
-    const res = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains/${domainId}`, {
+    const listRes = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains`, {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!listRes.ok) {
+      const error = await listRes.json();
+      throw new Error(error.error || `API Error ${listRes.status}`);
+    }
+    const domains = await listRes.json();
+    const domain = domains.find((d) => d.domain === domainName);
+    if (!domain) {
+      console.error(`
+❌ Domain not found: ${domainName}`);
+      console.log();
+      console.log("List domains with:");
+      console.log(`  zerodeploy domain list --org ${options.org} --site ${options.site}`);
+      return;
+    }
+    const res = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains/${domain.id}`, {
       method: "DELETE",
       headers: {
         Authorization: `Bearer ${token}`
@@ -3612,12 +3662,77 @@ var domainRemoveCommand = new Command2("remove").description("Remove a custom do
   }
 });
 
+// src/commands/domain/redirect.ts
+function formatRedirectMode(mode) {
+  switch (mode) {
+    case "none":
+      return "No redirect";
+    case "www_to_apex":
+      return "www → apex (e.g., www.example.com → example.com)";
+    case "apex_to_www":
+      return "apex → www (e.g., example.com → www.example.com)";
+    default:
+      return mode;
+  }
+}
+var domainRedirectCommand = new Command2("redirect").description("Set redirect mode for a custom domain").argument("<domain>", "Domain name (e.g., example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").requiredOption("--mode <mode>", "Redirect mode: none, www_to_apex, or apex_to_www").action(async (domain, options) => {
+  const token = loadToken();
+  if (!token) {
+    console.log("Not logged in. Run: zerodeploy login");
+    return;
+  }
+  const validModes = ["none", "www_to_apex", "apex_to_www"];
+  if (!validModes.includes(options.mode)) {
+    console.error(`Invalid mode: ${options.mode}`);
+    console.error("Valid modes: none, www_to_apex, apex_to_www");
+    return;
+  }
+  try {
+    const listRes = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains`, {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!listRes.ok) {
+      const error = await listRes.json();
+      throw new Error(error.error || `API Error ${listRes.status}`);
+    }
+    const domains = await listRes.json();
+    const targetDomain = domains.find((d) => d.domain === domain.toLowerCase());
+    if (!targetDomain) {
+      console.error(`Domain not found: ${domain}`);
+      console.error(`Run 'zerodeploy domain list --org ${options.org} --site ${options.site}' to see configured domains.`);
+      return;
+    }
+    const res = await fetch(`${API_URL}/orgs/${options.org}/sites/${options.site}/domains/${targetDomain.id}/redirect`, {
+      method: "PATCH",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ redirectMode: options.mode })
+    });
+    if (!res.ok) {
+      const error = await res.json();
+      throw new Error(error.error || `API Error ${res.status}`);
+    }
+    const data = await res.json();
+    console.log(`
+✅ Redirect mode updated for ${data.domain}`);
+    console.log(`   Mode: ${formatRedirectMode(data.redirect_mode)}`);
+    console.log();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : "Unknown error";
+    console.error("Failed to update redirect mode:", message);
+  }
+});
+
 // src/commands/domain/index.ts
-var domainCommand = new Command2("domain").description("Manage custom domains").addCommand(domainAddCommand).addCommand(domainListCommand).addCommand(domainVerifyCommand).addCommand(domainRemoveCommand);
+var domainCommand = new Command2("domain").description("Manage custom domains").addCommand(domainAddCommand).addCommand(domainListCommand).addCommand(domainVerifyCommand).addCommand(domainRemoveCommand).addCommand(domainRedirectCommand);
 
 // src/commands/deploy/index.ts
-import { resolve as resolve3 } from "node:path";
-import { stat as stat2 } from "node:fs/promises";
+import { resolve as resolve3, basename } from "node:path";
+import { stat as stat2, writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 
 // src/utils/files.ts
@@ -4335,6 +4450,29 @@ function getConfigPath(cwd = process.cwd()) {
   return resolve2(cwd, CONFIG_FILENAME);
 }
 
+// src/utils/prompt.ts
+import * as readline3 from "node:readline";
+async function confirm(message, defaultValue = true) {
+  const rl = readline3.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const hint = defaultValue ? "[Y/n]" : "[y/N]";
+  return new Promise((resolve3) => {
+    rl.question(`${message} ${hint} `, (answer) => {
+      rl.close();
+      const normalized = answer.trim().toLowerCase();
+      if (normalized === "") {
+        resolve3(defaultValue);
+      } else if (normalized === "y" || normalized === "yes") {
+        resolve3(true);
+      } else {
+        resolve3(false);
+      }
+    });
+  });
+}
+
 // src/commands/deploy/list.ts
 var deployListCommand = new Command2("list").description("List deployments for a site").argument("<siteSlug>", "Site slug").requiredOption("--org <orgSlug>", "Organization slug").option("--limit <number>", "Number of deployments to show", "10").action(async (siteSlug, options) => {
   const token = loadToken();
@@ -4414,7 +4552,37 @@ var deployRollbackCommand = new Command2("rollback").description("Rollback to a
   }
 });
 
+// src/commands/deploy/promote.ts
+var deployPromoteCommand = new Command2("promote").description("Promote a preview deployment to production").argument("<deploymentId>", "Deployment ID (or first 8 chars) to promote").action(async (deploymentId) => {
+  const token = loadToken();
+  if (!token) {
+    console.log("Not logged in. Run: zerodeploy login");
+    return;
+  }
+  try {
+    const client = getClient(token);
+    const res = await client.deployments[":id"].rollback.$post({
+      param: { id: deploymentId }
+    });
+    if (!res.ok) {
+      const error = await res.json();
+      console.error(`Error: ${error.error}`);
+      return;
+    }
+    const result = await res.json();
+    console.log("Deployment promoted to production!");
+    console.log(`   Deployment: ${result.deployment.id}`);
+    console.log(`   URL: ${result.deployment.url}`);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : "Unknown error";
+    console.error("Failed to promote deployment:", message);
+  }
+});
+
 // src/commands/deploy/index.ts
+function slugify(input) {
+  return input.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)+/g, "");
+}
 async function runCommand(command, cwd) {
   return new Promise((promiseResolve) => {
     const [cmd, ...args] = command.split(" ");
@@ -4473,26 +4641,63 @@ async function uploadArchive(token, uploadUrl, archive) {
   });
   return res.ok;
 }
-var deployCommand = new Command2("deploy").description("Deploy a site").argument("[site]", "Site slug").option("--org <org>", "Organization slug").option("--dir <directory>", "Directory to deploy (default: auto-detect)").option("--build", "Run build command before deploying").option("--no-build", "Skip build step").option("--build-command <command>", "Override build command").option("--install", "Run install command before building").option("--pr <number>", "PR number (for GitHub Actions)").option("--pr-title <title>", "PR title").option("--commit <sha>", "Commit SHA").option("--commit-message <message>", "Commit message").option("--branch <branch>", "Branch name").option("--github-output", "Output deployment info in GitHub Actions format").enablePositionalOptions().addCommand(deployListCommand).addCommand(deployRollbackCommand).action(async (siteSlugArg, options) => {
+var deployCommand = new Command2("deploy").description("Deploy a site").argument("[site]", "Site slug").option("--org <org>", "Organization slug").option("--dir <directory>", "Directory to deploy (default: auto-detect)").option("--build", "Run build command before deploying").option("--no-build", "Skip build step").option("--build-command <command>", "Override build command").option("--install", "Run install command before building").option("--preview", "Deploy without setting as current (preview only)").option("--pr <number>", "PR number (for GitHub Actions)").option("--pr-title <title>", "PR title").option("--commit <sha>", "Commit SHA").option("--commit-message <message>", "Commit message").option("--branch <branch>", "Branch name").option("--github-output", "Output deployment info in GitHub Actions format").enablePositionalOptions().addCommand(deployListCommand).addCommand(deployRollbackCommand).addCommand(deployPromoteCommand).action(async (siteSlugArg, options) => {
   const cwd = process.cwd();
-  const config = loadProjectConfig(cwd);
-  const siteSlug = siteSlugArg || config.site;
-  const orgSlug = options.org || config.org;
-  const dirOption = options.dir || config.dir;
-  if (!siteSlug) {
-    console.log("Error: Site is required. Provide as argument or in zerodeploy.json");
-    deployCommand.help();
-    return;
-  }
-  if (!orgSlug) {
-    console.log('Error: --org is required (or set "org" in zerodeploy.json)');
-    return;
-  }
   const token = loadToken();
   if (!token) {
     console.log("Not logged in. Run: zerodeploy login");
     return;
   }
+  const config = loadProjectConfig(cwd);
+  let siteSlug = siteSlugArg || config.site;
+  let orgSlug = options.org || config.org;
+  const dirOption = options.dir || config.dir;
+  if (!siteSlug || !orgSlug) {
+    const client = getClient(token);
+    const meRes = await client.auth.me.$get();
+    if (!meRes.ok) {
+      console.log("Error: Failed to fetch user info");
+      return;
+    }
+    const userInfo = await meRes.json();
+    if (!orgSlug) {
+      if (!userInfo.personalOrg) {
+        console.log("Error: No personal org found. Please create one with: zerodeploy org create <name>");
+        return;
+      }
+      orgSlug = userInfo.personalOrg.slug;
+    }
+    if (!siteSlug) {
+      const folderName = basename(cwd);
+      const suggestedName = slugify(folderName) || "my-site";
+      console.log("");
+      const shouldCreate = await confirm(`No site configured. Create site "${suggestedName}"?`, true);
+      if (!shouldCreate) {
+        console.log("Deploy cancelled. Create a site first with: zerodeploy site create");
+        return;
+      }
+      console.log("");
+      console.log(`Creating site "${suggestedName}"...`);
+      const createRes = await client.orgs[":orgSlug"].sites.$post({
+        param: { orgSlug },
+        json: { name: suggestedName, subdomain: suggestedName }
+      });
+      if (!createRes.ok) {
+        const error = await createRes.json();
+        console.log(`Error: ${error.error || "Failed to create site"}`);
+        return;
+      }
+      const site = await createRes.json();
+      siteSlug = site.slug;
+      console.log(`Created site: ${site.subdomain}.zerodeploy.app`);
+      const configPath = getConfigPath(cwd);
+      const newConfig = { org: orgSlug, site: siteSlug, dir: dirOption || config.dir };
+      await writeFile(configPath, JSON.stringify(newConfig, null, 2) + `
+`);
+      console.log(`Saved config to zerodeploy.json`);
+      console.log("");
+    }
+  }
   const framework = await detectFramework(cwd);
   if (framework) {
     console.log(`Detected: ${framework.name}`);
@@ -4635,16 +4840,24 @@ Error: Build failed`);
         "Content-Type": "application/json",
         Authorization: `Bearer ${token}`
       },
-      body: JSON.stringify({})
+      body: JSON.stringify({ preview: options.preview || false })
     });
     if (!finalizeRes.ok) {
       console.log("Error: Failed to finalize deployment");
       return;
     }
     console.log("");
-    console.log("Deployment successful!");
-    console.log(`URL:     ${deployment.url}`);
-    console.log(`Preview: ${deployment.previewUrl}`);
+    if (options.preview) {
+      console.log("Preview deployment created!");
+      console.log(`Preview: ${deployment.previewUrl}`);
+      console.log("");
+      console.log(`To make this deployment live, run:`);
+      console.log(`  zerodeploy deploy promote ${deployment.id.slice(0, 8)}`);
+    } else {
+      console.log("Deployment successful!");
+      console.log(`URL:     ${deployment.url}`);
+      console.log(`Preview: ${deployment.previewUrl}`);
+    }
     if (options.githubOutput) {
       const githubOutputFile = process.env.GITHUB_OUTPUT;
       if (githubOutputFile) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodeploy/cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "bin": {
     "zerodeploy": "dist/cli.js"