d3ployer 0.0.3 → 0.0.5

package/dist/config.js

@@ -39,9 +39,13 @@ export function defineConfig(input) {
         }
     }
     return {
-        packageManager: 'npm',
         rootDir: '',
         ...input,
+        packageManager: {
+            manager: 'npm',
+            productionOnly: true,
+            ...input.packageManager,
+        },
         servers,
         tasks,
         scenarios,

package/dist/def.d.ts

@@ -1,5 +1,10 @@
 import type SSH2Promise from 'ssh2-promise';
 export type AuthMethod = 'key' | 'password' | 'agent';
+export type PackageManager = 'npm' | 'yarn' | 'pnpm';
+export type PackageManagerConfig = {
+    manager: PackageManager;
+    productionOnly?: boolean;
+};
 export interface ServerConfig {
     host: string;
     port: number;
@@ -9,7 +14,7 @@ export interface ServerConfig {
     password?: string;
     agent?: string;
     deployPath: string;
-    packageManager?: string;
+    packageManager?: PackageManagerConfig;
     initCmd?: string;
 }
 export type ServerConfigInput = Partial<ServerConfig> & Pick<ServerConfig, 'host' | 'deployPath'>;
@@ -68,7 +73,7 @@ export type ScenarioInput = string[] | {
 export interface DeployerConfig {
     rootDir: string;
     servers: Record<string, ServerConfig>;
-    packageManager?: string;
+    packageManager?: PackageManagerConfig;
     files?: FilesConfig;
     symlinks?: SymlinkConfig[];
     tasks?: Record<string, TaskDef>;

package/dist/defaultTasks.js

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
-import { spawn } from 'node:child_process';
 import path from 'node:path';
-import { Exception } from './utils/Exception.js';
+import { Exception } from './utils/index.js';
 function buildRsyncCommand(server, source, dest, files) {
     const args = ['rsync', '-avz', '--delete', '--progress=info2'];
     // ssh shell
@@ -29,34 +28,6 @@ function buildRsyncCommand(server, source, dest, files) {
     args.push(source, dest);
     return args.join(' ');
 }
-function execRsync(command) {
-    return new Promise((resolve, reject) => {
-        const child = spawn('sh', ['-c', command], {
-            stdio: ['inherit', 'pipe', 'pipe'],
-        });
-        const stderrChunks = [];
-        child.stdout.on('data', (data) => {
-            process.stdout.write(data);
-        });
-        child.stderr.on('data', (data) => {
-            stderrChunks.push(data.toString());
-            process.stderr.write(data);
-        });
-        child.on('close', (code) => {
-            if (code !== 0) {
-                const details = stderrChunks.length
-                    ? `\n${stderrChunks.join('')}`
-                    : '';
-                reject(new Exception(`rsync exited with code ${code} (cmd: ${command})${details}`, 1774741947570));
-                return;
-            }
-            resolve();
-        });
-        child.on('error', (err) => {
-            reject(new Exception(`rsync failed: ${command}\n${err.message}`, 1774741947571));
-        });
-    });
-}
 const uploadTask = async (ctx, ph) => {
     const files = ctx.config.files;
     if (!files) {
@@ -70,7 +41,7 @@ const uploadTask = async (ctx, ph) => {
     const source = localBase.endsWith('/') ? localBase : localBase + '/';
     await ctx.run(`mkdir -p ${remotePath}`);
     const command = buildRsyncCommand(ctx.server, source, dest, files);
-    await execRsync(command);
+    await ctx.runLocal(command);
 };
 const symlinksTask = async (ctx, ph) => {
     const symlinks = ctx.config.symlinks;
@@ -87,24 +58,44 @@ const symlinksTask = async (ctx, ph) => {
         await ctx.run(`ln -sfn ${target} ${path}`);
     }
 };
-const depInstallTask = async (ctx, ph) => {
-    const pm = ctx.server.packageManager ?? ctx.config.packageManager ?? 'npm';
-    const cmd = `${pm} install`;
+const depInstallTask = async (ctx) => {
+    const config = {
+        manager: 'npm',
+        productionOnly: true,
+        ...ctx.config.packageManager,
+        ...ctx.server.packageManager,
+    };
+    let cmd = `${config.manager} install`;
+    if (config.productionOnly) {
+        if (config.manager === 'npm') {
+            cmd += ' --omit=dev';
+        }
+        else if (config.manager === 'yarn') {
+            cmd += ' --production';
+        }
+        else if (config.manager === 'pnpm') {
+            cmd += ' --prod';
+        }
+        else {
+            throw new Exception(`Unsupported package manager "${config.manager}"`, 1774823752134);
+        }
+    }
     await ctx.run(cmd);
 };
 const printDeploymentTask = async (ctx, ph) => {
+    await ctx.run('date');
     console.log(chalk.cyan('Deployment directory'), ph.deployPath);
     await ctx.run('ls -la .');
     console.log(chalk.cyan('Directory size'));
     await ctx.run('du -hd 1 .');
 };
-const pm2SetupTask = async (ctx, ph) => {
-    const pm2ConfigExists = await ctx.test('test -f pm2.config.js');
+const pm2SetupTask = async (ctx) => {
+    const pm2ConfigExists = await ctx.test('test -f pm2.config.*');
     if (!pm2ConfigExists) {
-        console.log(chalk.yellow('pm2.config.js not found, skipping PM2 setup'));
+        console.log(chalk.yellow('PM2 config not found, skipping setup'));
         return;
     }
-    await ctx.run('pm2 start pm2.config.js --update-env');
+    await ctx.run('pm2 start pm2.config.* --update-env');
     await ctx.run('pm2 save');
 };
 export const defaultTasks = {
@@ -137,6 +128,7 @@ export const defaultScenarios = {
             'symlinks',
             'depInstall',
             'pm2Setup',
+            'printDeployment',
         ],
     },
 };

package/dist/runner.js

@@ -140,7 +140,7 @@ function buildTaskContext(serverName, server, ssh, config) {
             const result = await execRemote(ssh, cmd, {
                 ignoreError: true,
                 printOutput: false,
-                cwd: config.rootDir,
+                cwd: server.deployPath,
                 initCmd: server.initCmd,
             });
             return result.success;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "d3ployer",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "license": "MIT",
     "type": "module",
     "bin": {
@@ -18,11 +18,7 @@
     ],
     "scripts": {
         "build": "tsc -p tsconfig.build.json",
-        "dev": "tsx src/main.ts",
-        "dev:watch": "tsx --watch src/main.ts",
-        "dev:inspect": "tsx --inspect-brk src/main.ts",
-        "script": "tsx src/script.ts",
-        "deploy": "tsx src/cli.ts",
+        "build:watch": "tsc -p tsconfig.build.json --watch",
         "test": "mocha --import=tsx",
         "test:inspect": "mocha --import=tsx --inspect-brk",
         "coverage": "c8 mocha --import=tsx",