@solidactions/cli 0.6.3 → 0.7.0

package/dist/commands/deploy.js

@@ -206,14 +206,14 @@ async function deploy(projectName, sourcePath, options = {}) {
             process.exit(1);
         }
     }
-    const zipPath = path_1.default.join(sourceDir, '.steps-deploy.zip');
-    const output = fs_1.default.createWriteStream(zipPath);
-    const archive = (0, archiver_1.default)('zip', { zlib: { level: 9 } });
+    const archivePath = path_1.default.join(sourceDir, '.steps-deploy.tar.gz');
+    const output = fs_1.default.createWriteStream(archivePath);
+    const archive = (0, archiver_1.default)('tar', { gzip: true, gzipOptions: { level: 9 } });
     output.on('close', async () => {
-        console.log(chalk_1.default.gray(`Zipped ${archive.pointer()} total bytes`));
+        console.log(chalk_1.default.gray(`Archived ${archive.pointer()} total bytes`));
         try {
             const form = new form_data_1.default();
-            form.append('source', fs_1.default.createReadStream(zipPath));
+            form.append('source', fs_1.default.createReadStream(archivePath));
             console.log(chalk_1.default.yellow('Uploading...'));
             await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/deploy`, form, {
                 headers: {
@@ -253,7 +253,7 @@ async function deploy(projectName, sourcePath, options = {}) {
                         if (yamlConfig) {
                             await pushYamlDeclarations(config.host, config.apiKey, projectSlug, yamlConfig);
                         }
-                        fs_1.default.unlinkSync(zipPath);
+                        fs_1.default.unlinkSync(archivePath);
                         process.exit(0);
                     }
                     else if (status === 'error') {
@@ -264,13 +264,13 @@ async function deploy(projectName, sourcePath, options = {}) {
                             console.log(chalk_1.default.gray(build_log));
                             console.log(chalk_1.default.yellow('--- End Build Log ---\n'));
                         }
-                        fs_1.default.unlinkSync(zipPath);
+                        fs_1.default.unlinkSync(archivePath);
                         process.exit(1);
                     }
                     else if (attempts >= maxAttempts) {
                         clearInterval(poll);
                         console.error(chalk_1.default.red('\nTimeout waiting for build. It might still finish.'));
-                        fs_1.default.unlinkSync(zipPath);
+                        fs_1.default.unlinkSync(archivePath);
                         process.exit(1);
                     }
                 }
@@ -292,8 +292,8 @@ async function deploy(projectName, sourcePath, options = {}) {
             else {
                 console.error(error.message);
             }
-            if (fs_1.default.existsSync(zipPath))
-                fs_1.default.unlinkSync(zipPath);
+            if (fs_1.default.existsSync(archivePath))
+                fs_1.default.unlinkSync(archivePath);
             process.exit(1);
         }
     });
@@ -302,11 +302,24 @@ async function deploy(projectName, sourcePath, options = {}) {
     });
     archive.pipe(output);
     // Glob patterns to ignore
-    const ignore = ['node_modules/**', '.git/**', '.steps-deploy.zip', 'dist/**', 'vendor/**', '**/node_modules/**'];
+    const ignore = ['node_modules/**', '.git/**', '.steps-deploy.tar.gz', '.steps-deploy.zip', 'dist/**', 'vendor/**', '**/node_modules/**'];
+    // User code goes under tenantcode/ so it never conflicts with our Dockerfile
     archive.glob('**/*', {
         cwd: sourceDir,
         ignore: ignore,
         dot: true
+    }, {
+        prefix: 'tenantcode'
     });
+    // Dockerfile always at archive root, referencing tenantcode/
+    const universalDockerfile = [
+        'FROM node:20-alpine',
+        'WORKDIR /app',
+        'COPY tenantcode/package.json tenantcode/package-lock.json* ./',
+        'RUN npm install',
+        'COPY tenantcode/ .',
+        'RUN npm run build',
+    ].join('\n') + '\n';
+    archive.append(universalDockerfile, { name: 'Dockerfile' });
     await archive.finalize();
 }

package/dist/commands/logs.js

@@ -32,6 +32,13 @@ async function logs(runId, options) {
                 'Accept': 'application/json',
             },
         });
+        const errors = logsResponse.data.errors || [];
+        if (errors.length > 0) {
+            for (const err of errors) {
+                console.log(chalk_1.default.red(`Worker ${err.worker}: ${err.error}`));
+            }
+            console.log(chalk_1.default.gray('---'));
+        }
         const logData = logsResponse.data.logs || '';
         let printed = displayLogs(logData);
         if (options.follow && runData.status === 'running') {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidactions/cli",
-    "version": "0.6.3",
+    "version": "0.7.0",
     "description": "SolidActions CLI - Deploy and manage workflow automation",
     "main": "dist/index.js",
     "bin": {