bod-cli 0.5.2 → 0.5.5

package/dist/cli.js

@@ -18976,7 +18976,77 @@ async function uploadDeploy(client, appId, branch) {
     console.log(source_default.dim(`Including siblings: ${siblingPaths.join(", ")}`));
   console.log(source_default.dim(`Packing source (excluding: ${allExcludes.join(", ")})...`));
   const tmpFile = `${Bun.env.TMPDIR || "/tmp"}/bod-deploy-${Date.now()}.tar.gz`;
-  const tar = Bun.spawnSync(["tar", "cz", ...excludeFlags, "-f", tmpFile, ".", ...siblingPaths], { stderr: "pipe" });
+  const env3 = { ...process.env, COPYFILE_DISABLE: "1" };
+  const fs = __require("fs");
+  const { resolve, basename, join: join3 } = __require("path");
+  const siblingMap = new Map;
+  const siblingArgs = [];
+  for (const sp of siblingPaths) {
+    const abs = resolve(sp);
+    const name = basename(abs);
+    siblingMap.set(sp, name);
+    siblingArgs.push("-C", abs.slice(0, abs.lastIndexOf("/")), name);
+  }
+  const rewritten = [];
+  const rewritePkg = (pkgPath) => {
+    if (!fs.existsSync(pkgPath))
+      return;
+    const original = fs.readFileSync(pkgPath, "utf8");
+    let content = original;
+    for (const [rel, name] of siblingMap) {
+      content = content.replace(new RegExp(`"file:[^"]*${name}"`, "g"), `"file:./${name}"`);
+    }
+    if (content !== original) {
+      rewritten.push({ path: pkgPath, original });
+      fs.writeFileSync(pkgPath, content);
+    }
+  };
+  rewritePkg(join3(process.cwd(), "package.json"));
+  try {
+    const rootPkg = JSON.parse(fs.readFileSync(join3(process.cwd(), "package.json"), "utf8"));
+    for (const pattern of rootPkg.workspaces ?? []) {
+      const base = join3(process.cwd(), pattern.replace(/\/?\*$/, ""));
+      if (!fs.existsSync(base))
+        continue;
+      for (const sub of fs.readdirSync(base)) {
+        rewritePkg(join3(base, sub, "package.json"));
+      }
+    }
+  } catch {}
+  const includedSiblings = new Set([...siblingMap.values()]);
+  for (const sp of siblingPaths) {
+    const abs = resolve(sp);
+    const sibPkgPath = join3(abs, "package.json");
+    if (!fs.existsSync(sibPkgPath))
+      continue;
+    const original = fs.readFileSync(sibPkgPath, "utf8");
+    const sibPkg = JSON.parse(original);
+    let changed = false;
+    for (const field of ["dependencies", "devDependencies"]) {
+      if (!sibPkg[field])
+        continue;
+      for (const [name, ver] of Object.entries(sibPkg[field])) {
+        if (!ver.startsWith("file:") || !ver.includes(".."))
+          continue;
+        const depName = basename(resolve(abs, ver.slice(5)));
+        if (!includedSiblings.has(depName)) {
+          sibPkg[field][name] = "*";
+          changed = true;
+        }
+      }
+    }
+    if (changed) {
+      rewritten.push({ path: sibPkgPath, original });
+      fs.writeFileSync(sibPkgPath, JSON.stringify(sibPkg, null, 2) + `
+`);
+    }
+  }
+  const tar = Bun.spawnSync(["tar", "czh", ...excludeFlags, "-f", tmpFile, ".", ...siblingArgs], {
+    stderr: "pipe",
+    env: env3
+  });
+  for (const { path, original } of rewritten)
+    fs.writeFileSync(path, original);
   if (tar.exitCode !== 0) {
     const errText = tar.stderr.toString();
     throw new Error(`tar failed: ${errText}`);
@@ -19047,6 +19117,14 @@ async function pollDeploy(client, appId, since, instanceCaps, localConfig) {
         } else {
           displayUrl = `https://${host}`;
         }
+        if (!isPreview) {
+          try {
+            const domains = await client.get(`/apps/${appId}/domains`);
+            const verified = domains?.find((d2) => d2.status === "active" || d2.verified);
+            if (verified)
+              displayUrl = `https://${verified.domain}`;
+          } catch {}
+        }
         console.log(`  → ${displayUrl}`);
         if (isPreview)
           console.log(source_default.yellow(`  ⚠ Preview deployment (branch: ${latest.branch})`));
@@ -19073,7 +19151,7 @@ var deploy_default = defineCommand2({
     const { url, apiKey, name: instanceName, instance } = getResolvedInstance(loadConfig(), readInstanceFromYaml());
     console.log(source_default.dim(`Using instance "${instanceName}"`));
     const client = new BodClient(url, apiKey);
-    const isLocal = url.startsWith("http://localhost");
+    const isLocal = !url.startsWith("https://");
     let localConfig = null;
     if (isLocal) {
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bod-cli",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "type": "module",
   "bin": {
     "bod": "./dist/cli.js"

package/src/commands/deploy.ts

@@ -29,7 +29,83 @@ async function uploadDeploy(client: BodClient, appId: string, branch: string) {
 
   console.log(chalk.dim(`Packing source (excluding: ${allExcludes.join(', ')})...`))
   const tmpFile = `${Bun.env.TMPDIR || '/tmp'}/bod-deploy-${Date.now()}.tar.gz`
-  const tar = Bun.spawnSync(['tar', 'cz', ...excludeFlags, '-f', tmpFile, '.', ...siblingPaths], { stderr: 'pipe' })
+  const env = { ...process.env, COPYFILE_DISABLE: '1' } // suppress macOS ._ resource forks
+  const fs = require('fs')
+  const { resolve, basename, join } = require('path')
+
+  // Siblings use `../` relative paths which GNU tar on the server rejects.
+  // Strategy: pack siblings at root level (no `..`), rewrite file:../X → file:./X in package.jsons.
+  const siblingMap = new Map<string, string>() // originalRelPath → basename
+  const siblingArgs: string[] = []
+  for (const sp of siblingPaths) {
+    const abs = resolve(sp)
+    const name = basename(abs)
+    siblingMap.set(sp, name)
+    siblingArgs.push('-C', abs.slice(0, abs.lastIndexOf('/')), name)
+  }
+
+  // Rewrite file:.. deps in package.json files so the server finds siblings at ./
+  const rewritten: { path: string; original: string }[] = []
+  const rewritePkg = (pkgPath: string) => {
+    if (!fs.existsSync(pkgPath)) return
+    const original = fs.readFileSync(pkgPath, 'utf8')
+    let content = original
+    for (const [rel, name] of siblingMap) {
+      // Rewrite file:../X to file:./X (X is the sibling basename)
+      content = content.replace(new RegExp(`"file:[^"]*${name}"`, 'g'), `"file:./${name}"`)
+    }
+    if (content !== original) {
+      rewritten.push({ path: pkgPath, original })
+      fs.writeFileSync(pkgPath, content)
+    }
+  }
+
+  // Rewrite root + workspace package.jsons (file:../X → file:./X for included siblings)
+  rewritePkg(join(process.cwd(), 'package.json'))
+  try {
+    const rootPkg = JSON.parse(fs.readFileSync(join(process.cwd(), 'package.json'), 'utf8'))
+    for (const pattern of rootPkg.workspaces ?? []) {
+      const base = join(process.cwd(), pattern.replace(/\/?\*$/, ''))
+      if (!fs.existsSync(base)) continue
+      for (const sub of fs.readdirSync(base)) {
+        rewritePkg(join(base, sub, 'package.json'))
+      }
+    }
+  } catch {}
+
+  // Rewrite sibling package.jsons: file:.. deps that aren't included become "*" (npm fallback)
+  const includedSiblings = new Set([...siblingMap.values()])
+  for (const sp of siblingPaths) {
+    const abs = resolve(sp)
+    const sibPkgPath = join(abs, 'package.json')
+    if (!fs.existsSync(sibPkgPath)) continue
+    const original = fs.readFileSync(sibPkgPath, 'utf8')
+    const sibPkg = JSON.parse(original)
+    let changed = false
+    for (const field of ['dependencies', 'devDependencies']) {
+      if (!sibPkg[field]) continue
+      for (const [name, ver] of Object.entries(sibPkg[field]) as [string, string][]) {
+        if (!ver.startsWith('file:') || !ver.includes('..')) continue
+        const depName = basename(resolve(abs, ver.slice(5)))
+        if (!includedSiblings.has(depName)) {
+          sibPkg[field][name] = '*'
+          changed = true
+        }
+      }
+    }
+    if (changed) {
+      rewritten.push({ path: sibPkgPath, original })
+      fs.writeFileSync(sibPkgPath, JSON.stringify(sibPkg, null, 2) + '\n')
+    }
+  }
+
+  const tar = Bun.spawnSync(['tar', 'czh', ...excludeFlags, '-f', tmpFile, '.', ...siblingArgs], {
+    stderr: 'pipe',
+    env,
+  })
+
+  // Restore original package.json files
+  for (const { path, original } of rewritten) fs.writeFileSync(path, original)
   if (tar.exitCode !== 0) {
     const errText = tar.stderr.toString()
     throw new Error(`tar failed: ${errText}`)
@@ -112,6 +188,16 @@ async function pollDeploy(client: BodClient, appId: string, since: number, insta
         } else {
           displayUrl = `https://${host}`
         }
+
+        // Show custom domain if configured (production branch only)
+        if (!isPreview) {
+          try {
+            const domains = await client.get<any[]>(`/apps/${appId}/domains`)
+            const verified = domains?.find((d: any) => d.status === 'active' || d.verified)
+            if (verified) displayUrl = `https://${verified.domain}`
+          } catch {}
+        }
+
         console.log(`  → ${displayUrl}`)
         if (isPreview) console.log(chalk.yellow(`  ⚠ Preview deployment (branch: ${latest.branch})`))
       }
@@ -138,7 +224,7 @@ export default defineCommand({
     console.log(chalk.dim(`Using instance "${instanceName}"`))
     const client = new BodClient(url, apiKey)
     // Fetch local config for URL generation
-    const isLocal = url.startsWith('http://localhost')
+    const isLocal = !url.startsWith('https://')
     let localConfig: { localDomain?: string; caddyPort?: number } | null = null
     if (isLocal) {
       try { localConfig = await client.get<any>('/config/public') } catch {}