servyx-cli 0.1.5 → 0.1.7

package/README.md

@@ -27,9 +27,12 @@ servyx login
 cd my-app
 servyx link
 
-# 3. Deploy
+# 3. Deploy (server .env and .htaccess are preserved by default)
 servyx deploy
 
+# 3b. React/Vite frontends: upload local .env files too
+servyx deploy --with-env
+
 # 4. Check recent deployments
 servyx status
 ```
@@ -38,7 +41,7 @@ servyx status
 
 - Global config: `~/.servyx/config.json` (mode 600)
 - Project config: `servyx.json` in your project root
-- Optional excludes: `.servyxignore` (rsync patterns). Hidden files (`.env`, `.htaccess`, etc.) are not uploaded from your machine; existing server copies are preserved during deploy.
+- Optional excludes: `.servyxignore` (rsync patterns). By default, hidden files (`.env`, `.htaccess`, etc.) are not uploaded and existing server copies are preserved. Use `servyx deploy --with-env` to upload local `.env` / `.env.*` files (useful for React/Vite builds).
 
 Environment variables:
 
@@ -47,8 +50,8 @@ Environment variables:
 ## How it works
 
 1. `servyx deploy` fetches the deploy target (SSH user, host, staging path) from cli-service
-2. Files are rsynced to `<app_root>/.cli-staging` on the server (local hidden files are skipped)
-3. Live dotfiles from `public` (`.env`, `.htaccess`, etc.) are copied into staging so they are not removed on deploy
-4. cli-service calls server-service to queue a CLI deployment
-5. The agent syncs staging → public, runs the pipeline, and reports progress
+2. Files are rsynced to `<app_root>/.cli-staging` on the server (local hidden files are skipped unless `--with-env`)
+3. Live dotfiles from `public` are copied into staging so they are not removed on deploy (`.env` is skipped when using `--with-env`)
+4. cli-service calls server-service to queue a CLI deployment (`with_env` tells the agent to sync uploaded env files)
+5. The agent syncs staging → public, preserving `.htaccess` and (by default) `.env` on the server
 6. The CLI polls until the deployment succeeds or fails

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "servyx-cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Servyx CLI — Upload local projects and deploy via the Servyx platform",
   "type": "module",
   "bin": {

package/src/commands/deploy.js

@@ -58,12 +58,17 @@ export async function runDeploy(options = {}) {
     process.exit(1);
   }
 
+  const withEnv = Boolean(options.withEnv);
   const excludes = [
     ...DEFAULT_RSYNC_EXCLUDES,
     ...(target.rsync_excludes || []),
     ...loadServyxIgnore(root),
   ];
 
+  if (withEnv) {
+    console.log(pc.yellow('Including local .env files in this deploy.'));
+  }
+
   console.log(pc.bold('Syncing files via rsync...'));
   ensureRemoteDir({
     host: target.ssh_host,
@@ -84,6 +89,7 @@ export async function runDeploy(options = {}) {
     user: target.ssh_user,
     remotePath: target.staging_path,
     excludes,
+    withEnv,
   });
 
   const stagingCheck = verifyRemoteStagingDir({
@@ -103,20 +109,25 @@ export async function runDeploy(options = {}) {
   console.log(pc.green('Rsync complete.'));
 
   const publicPath = target.public_path || `${target.root_path}/public`;
-  console.log(pc.bold('Preserving server dotfiles (.env, .htaccess, etc.)...'));
+  if (!withEnv) {
+    console.log(pc.bold('Preserving server dotfiles (.env, .htaccess, etc.)...'));
+  } else {
+    console.log(pc.bold('Preserving server dotfiles (.htaccess, etc.)...'));
+  }
   preserveServerDotfiles({
     host: target.ssh_host,
     port: target.ssh_port || 22,
     user: target.ssh_user,
     publicPath,
     stagingPath: target.staging_path,
+    skipEnv: withEnv,
   });
   console.log(pc.green('Server dotfiles preserved.'));
 
   console.log(pc.bold('Starting deployment...'));
   let startResult;
   try {
-    startResult = await startDeployment(appId, message);
+    startResult = await startDeployment(appId, message, { withEnv });
   } catch (err) {
     if (err.code === 'APP_NOT_FOUND') {
       console.error(pc.red('Application not found by server-service.'));

package/src/commands/link.js

@@ -50,5 +50,5 @@ export async function runLink(options = {}) {
   });
 
   console.log(pc.green(`Linked ${app.name} (${app.system_username})`));
-  console.log(pc.dim(`Wrote servyx.json in ${cwd}`));
+  // console.log(pc.dim(`Wrote servyx.json in ${cwd}`));
 }

package/src/commands/login.js

@@ -63,5 +63,5 @@ export async function runLogin(options = {}) {
 
   setAuth({ token, apiUrl, user });
   console.log(pc.green(`Logged in as ${user?.username || user?.email || username}`));
-  console.log(pc.dim(`API: ${apiUrl}`));
+  // console.log(pc.dim(`API: ${apiUrl}`));
 }

package/src/index.js

@@ -45,9 +45,10 @@ program
   .command('deploy')
   .description('Rsync local files and trigger a deployment')
   .option('-m, --message <message>', 'Deployment message')
+  .option('--with-env', 'Upload local .env files (for React/Vite frontends)')
   .action(async (options) => {
     try {
-      await runDeploy(options);
+      await runDeploy({ ...options, withEnv: Boolean(options.withEnv) });
     } catch (err) {
       console.error(pc.red(err.message || 'Deploy failed'));
       process.exit(1);

package/src/lib/api.js

@@ -54,10 +54,13 @@ export async function getDeployTarget(appId) {
   return unwrap(await client.get(`/apps/${appId}/deploy-target`));
 }
 
-export async function startDeployment(appId, message) {
+export async function startDeployment(appId, message, { withEnv = false } = {}) {
   try {
     const client = createClient();
-    return unwrap(await client.post(`/apps/${appId}/deployments`, { message }));
+    return unwrap(await client.post(`/apps/${appId}/deployments`, {
+      message,
+      with_env: withEnv || undefined,
+    }));
   } catch (err) {
     mapNetworkError(err, 'start deployment');
   }

package/src/lib/rsync.js

@@ -1,9 +1,34 @@
 import { spawnSync } from 'child_process';
 import path from 'path';
 
-/** Local hidden files are not uploaded; server copies are re-seeded into staging before deploy. */
+/** Local hidden files are not uploaded by default; server copies are re-seeded into staging before deploy. */
 export const DEFAULT_RSYNC_EXCLUDES = ['.*'];
 
+/** React/Vite-style env files that can be opted in with --with-env. */
+export const ENV_FILE_PATTERNS = ['.env', '.env.*'];
+
+export function buildRsyncFilters({ withEnv = false, excludes = [] } = {}) {
+  const filters = [];
+  if (withEnv) {
+    for (const pattern of ENV_FILE_PATTERNS) {
+      filters.push('--include', pattern);
+    }
+  }
+  filters.push('--exclude', '.*');
+
+  const filteredExcludes = excludes.filter((pattern) => {
+    if (pattern === '.*') return false;
+    if (withEnv && ENV_FILE_PATTERNS.includes(pattern)) return false;
+    return true;
+  });
+
+  for (const pattern of filteredExcludes) {
+    filters.push('--exclude', pattern);
+  }
+
+  return filters;
+}
+
 function shellQuote(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`;
 }
@@ -36,7 +61,7 @@ export function sshPreflight({ host, port = 22, user }) {
   };
 }
 
-export function rsyncDeploy({ localDir, host, port = 22, user, remotePath, excludes = [] }) {
+export function rsyncDeploy({ localDir, host, port = 22, user, remotePath, excludes = [], withEnv = false }) {
   requireBinary('rsync');
   const target = `${user}@${host}:${remotePath.replace(/\/$/, '')}/`;
   const args = [
@@ -45,7 +70,7 @@ export function rsyncDeploy({ localDir, host, port = 22, user, remotePath, exclu
     '--human-readable',
     '--progress',
     '-e', `ssh -p ${port} -o StrictHostKeyChecking=accept-new`,
-    ...excludes.flatMap((pattern) => ['--exclude', pattern]),
+    ...buildRsyncFilters({ withEnv, excludes }),
     `${path.resolve(localDir)}/`,
     target,
   ];
@@ -107,14 +132,19 @@ export function verifyRemoteStagingDir({ host, port = 22, user, remotePath }) {
 }
 
 /** Copy live dotfiles from public into staging so the agent's staging→public sync does not delete them. */
-export function preserveServerDotfiles({ host, port = 22, user, publicPath, stagingPath }) {
+export function preserveServerDotfiles({ host, port = 22, user, publicPath, stagingPath, skipEnv = false }) {
   requireBinary('ssh');
   const target = `${user}@${host}`;
+  const skipEnvFlag = skipEnv ? '1' : '0';
   const cmd = [
     `mkdir -p ${shellQuote(stagingPath)}`,
-    `&& find ${shellQuote(publicPath)} -maxdepth 1 -name '.*' -type f`,
-    `-exec cp -a {} ${shellQuote(`${stagingPath.replace(/\/$/, '')}/`)} \\;`,
-    '2>/dev/null || true',
+    `&& SKIP_ENV=${skipEnvFlag}`,
+    `find ${shellQuote(publicPath)} -maxdepth 1 -name '.*' -type f`,
+    `| while IFS= read -r f; do`,
+    `base=$(basename "$f");`,
+    `if [ "$SKIP_ENV" = "1" ]; then case "$base" in .env|.env.*) continue;; esac; fi;`,
+    `cp -a "$f" ${shellQuote(`${stagingPath.replace(/\/$/, '')}/`)};`,
+    `done 2>/dev/null || true`,
   ].join(' ');
 
   const args = [