@magentrix-corp/magentrix-cli 1.3.6 → 1.3.8

package/README.md

@@ -505,7 +505,9 @@ magentrix vue-build-stage
 1. Select from linked projects or enter path manually
 2. Run `npm run build` in the Vue project
 3. Validate the build output
-4. Copy to workspace `src/iris-apps/<app-slug>/`
+4. Copy to workspace `src/iris-apps/<app-slug>/` (excludes index.html, favicon.ico)
+5. Check sync status and prompt to pull if needed (required before publishing)
+6. Prompt to publish to Magentrix
 
 #### Vue Development Server
 ```bash
@@ -678,6 +680,19 @@ When running from a Vue project, the command looks for registered workspaces in
 
 **Note**: Existing workspaces are auto-registered when you run any command from them.
 
+#### "Publishing Iris apps from an out-of-sync workspace is not allowed"
+When running `vue-build-stage` from a Vue project, the CLI checks if the target workspace is in sync with the server. If there are pending remote changes, you must pull first.
+
+**Why this is required:**
+- Prevents deployment conflicts
+- Ensures your app is deployed alongside the latest server state
+- Avoids overwriting changes made by other team members
+
+**To resolve:**
+1. Navigate to the workspace: `cd /path/to/workspace`
+2. Pull latest changes: `magentrix pull`
+3. Re-run `vue-build-stage` from your Vue project
+
 #### "Missing required field in config.ts: slug (appPath)"
 Your Vue project's `config.ts` is missing the app identifier. Add an `appPath` or `slug` field.
 

package/actions/iris/buildStage.js

@@ -398,28 +398,9 @@ async function buildFromVueProject(options) {
         console.log(chalk.green('\u2713 Build output validated'));
     }
 
-    // Stage to selected workspace
+    // Check if workspace might be out of sync and offer to pull first (BEFORE staging)
+    // This ensures pull doesn't overwrite our staged files
     console.log();
-    console.log(chalk.blue(`Staging to workspace: ${workspacePath}`));
-
-    const stageResult = stageToWorkspace(distPath, slug, workspacePath);
-
-    if (!stageResult.success) {
-        console.log(chalk.red(`Failed to stage: ${stageResult.error}`));
-        return;
-    }
-
-    console.log(chalk.green(`\u2713 Staged ${stageResult.fileCount} files to ${stageResult.stagedPath}`));
-
-    // Summary
-    console.log();
-    console.log(chalk.green('─'.repeat(48)));
-    console.log(chalk.green.bold('\u2713 Build & Stage Complete!'));
-    console.log();
-    console.log(chalk.gray(`Staged to: ${stageResult.stagedPath}`));
-    console.log();
-
-    // Check if workspace might be out of sync and offer to pull first
     console.log(chalk.gray('Checking workspace sync status...'));
     const syncStatus = await checkWorkspaceSyncStatus(workspacePath);
 
@@ -444,7 +425,7 @@ async function buildFromVueProject(options) {
                 console.log(chalk.yellow('Pull encountered issues. You may want to resolve them manually.'));
 
                 const continueAnyway = await confirm({
-                    message: 'Do you still want to continue with publishing?',
+                    message: 'Do you still want to continue with staging and publishing?',
                     default: false
                 });
 
@@ -453,16 +434,49 @@ async function buildFromVueProject(options) {
                     console.log(chalk.cyan('To continue manually:'));
                     console.log(chalk.white(`  1. Navigate to workspace: ${chalk.yellow(`cd "${workspacePath}"`)}`));
                     console.log(chalk.white(`  2. Run ${chalk.yellow('magentrix pull')} to resolve conflicts`));
-                    console.log(chalk.white(`  3. Run ${chalk.yellow('magentrix publish')} to deploy`));
+                    console.log(chalk.white(`  3. Run ${chalk.yellow('magentrix vue-build-stage --skip-build')} to stage`));
+                    console.log(chalk.white(`  4. Run ${chalk.yellow('magentrix publish')} to deploy`));
                     return;
                 }
             }
             console.log();
+        } else {
+            // User declined to pull - block publishing from out-of-sync workspace
+            console.log();
+            console.log(chalk.red('Publishing Iris apps from an out-of-sync workspace is not allowed.'));
+            console.log(chalk.gray('This prevents conflicts and ensures your deployment is based on the latest server state.'));
+            console.log();
+            console.log(chalk.cyan('To continue:'));
+            console.log(chalk.white(`  1. Navigate to workspace: ${chalk.yellow(`cd "${workspacePath}"`)}`));
+            console.log(chalk.white(`  2. Run ${chalk.yellow('magentrix pull')} to sync with server`));
+            console.log(chalk.white(`  3. Run ${chalk.yellow('magentrix publish')} to deploy`));
+            return;
         }
     } else if (syncStatus.checked) {
         console.log(chalk.green('✓ Workspace is in sync'));
     }
 
+    // Stage to selected workspace (AFTER pull to avoid overwriting)
+    console.log();
+    console.log(chalk.blue(`Staging to workspace: ${workspacePath}`));
+
+    const stageResult = stageToWorkspace(distPath, slug, workspacePath);
+
+    if (!stageResult.success) {
+        console.log(chalk.red(`Failed to stage: ${stageResult.error}`));
+        return;
+    }
+
+    console.log(chalk.green(`\u2713 Staged ${stageResult.fileCount} files to ${stageResult.stagedPath}`));
+
+    // Summary
+    console.log();
+    console.log(chalk.green('─'.repeat(48)));
+    console.log(chalk.green.bold('\u2713 Build & Stage Complete!'));
+    console.log();
+    console.log(chalk.gray(`Staged to: ${stageResult.stagedPath}`));
+    console.log();
+
     // Ask if they want to publish now
     const shouldPublish = await confirm({
         message: 'Do you want to publish to Magentrix now?',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magentrix-corp/magentrix-cli",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "CLI tool for synchronizing local files with Magentrix cloud platform",
   "main": "index.js",
   "type": "module",

package/utils/iris/builder.js

@@ -1,10 +1,13 @@
 import { spawn } from 'node:child_process';
 import { existsSync, mkdirSync, cpSync, rmSync, readdirSync } from 'node:fs';
-import { join, resolve } from 'node:path';
+import { join, resolve, basename } from 'node:path';
 import { validateIrisBuild } from './validator.js';
 import { updateLastBuild } from './linker.js';
 import { EXPORT_ROOT, IRIS_APPS_DIR } from '../../vars/global.js';
 
+// Files to exclude when staging Iris apps (not needed on server)
+const EXCLUDED_FILES = new Set(['index.html', 'favicon.ico']);
+
 /**
  * Build a Vue project using npm run build.
  *
@@ -176,16 +179,18 @@ export function stageToWorkspace(distPath, slug, workspacePath = process.cwd())
         rmSync(targetDir, { recursive: true, force: true });
     }
 
-    // Files to exclude from staging (not needed for Iris apps)
-    const excludeFiles = new Set(['index.html', 'favicon.ico']);
-
     // Copy dist contents to target, excluding unnecessary files
     try {
         cpSync(resolvedDistPath, targetDir, {
             recursive: true,
             filter: (src) => {
-                const filename = src.split(/[/\\]/).pop();
-                return !excludeFiles.has(filename);
+                // Use basename for reliable cross-platform filename extraction
+                const filename = basename(src);
+                // Only exclude specific files, not directories
+                if (EXCLUDED_FILES.has(filename)) {
+                    return false;
+                }
+                return true;
             }
         });
     } catch (err) {