@codemoreira/esad 1.2.3 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Easy Super App Development - Zero-Config CLI and DevTools for React Native Module Federation",
   "main": "src/plugin/index.js",
   "exports": {

package/src/cli/commands/deploy.js

@@ -4,9 +4,36 @@ const AdmZip = require('adm-zip');
 const { getWorkspaceConfig } = require('../utils/config');
 
 module.exports = async (options) => {
-  const pkgPath = path.join(process.cwd(), 'package.json');
+  let cwd = process.cwd();
+  let pkgPath = path.join(cwd, 'package.json');
+  
+  // Try to find workspace config for root-level execution
+  const configObj = getWorkspaceConfig();
+  if (configObj) {
+    const workspaceRoot = path.dirname(configObj.path);
+    const { projectName } = configObj.data;
+    
+    // If ID is provided, try to find that module/host folder
+    if (options.id) {
+       const targetDir = path.join(workspaceRoot, options.id);
+       if (fs.existsSync(targetDir)) {
+         cwd = targetDir;
+         pkgPath = path.join(cwd, 'package.json');
+         console.log(`📂 Auto-detected Project folder: ${path.relative(process.cwd(), targetDir)}`);
+       }
+    } else if (!fs.existsSync(pkgPath)) {
+       // If no ID and no package.json in current dir, assume we want to deploy the host from root
+       const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+       if (fs.existsSync(hostDir)) {
+          cwd = hostDir;
+          pkgPath = path.join(cwd, 'package.json');
+          console.log(`📂 Auto-detected Host App folder: ${path.relative(process.cwd(), hostDir)}`);
+       }
+    }
+  }
+
   if (!fs.existsSync(pkgPath)) {
-    console.error(`❌ Error: package.json not found.`);
+    console.error(`❌ Error: Call this command from inside a Project directory or the Workspace Root.`);
     process.exit(1);
   }
 
@@ -17,14 +44,8 @@ module.exports = async (options) => {
 
   console.log(`\n☁️  Starting ESAD Deploy for ${moduleId} (v${version})\n`);
   
-  const configObj = getWorkspaceConfig();
-  if (!configObj) {
-    console.error(`❌ Error: esad.config.json not found in current directory or parent.`);
-    process.exit(1);
-  }
-
-  const config = configObj.data;
-  if (!config.deployEndpoint) {
+  const config = configObj ? configObj.data : null;
+  if (!config?.deployEndpoint) {
     console.error(`❌ Error: 'deployEndpoint' not configured in esad.config.json.`);
     process.exit(1);
   }
@@ -32,16 +53,16 @@ module.exports = async (options) => {
   const deployUrl = config.deployEndpoint.replace('{{moduleId}}', moduleId);
   console.log(`📡 Deployment Endpoint Resolved: ${deployUrl}`);
   
-  const distPath = path.join(process.cwd(), 'dist');
+  const distPath = path.join(cwd, 'dist');
   if (!fs.existsSync(distPath)) {
-    console.error(`❌ Error: dist/ directory not found. Did you run the build command?`);
+    console.error(`❌ Error: dist/ directory not found in ${cwd}. Did you run the build command?`);
     process.exit(1);
   }
 
   const zip = new AdmZip();
   zip.addLocalFolder(distPath);
   
-  const zipPath = path.join(process.cwd(), `bundle-${moduleId}-${version}.zip`);
+  const zipPath = path.join(cwd, `bundle-${moduleId}-${version}.zip`);
   zip.writeZip(zipPath);
   console.log(`🗜️  Zipped output to ${zipPath}`);
 

package/src/cli/commands/dev.js

@@ -4,12 +4,34 @@ const fs = require('fs-extra');
 const path = require('path');
 
 module.exports = async (options) => {
-  const pkgPath = path.join(process.cwd(), 'package.json');
-  if (!fs.existsSync(pkgPath)) {
-    console.error(`❌ Error: Call this command from inside a Host or Module directory.`);
-    return;
-  }
+  let cwd = process.cwd();
+  let pkgPath = path.join(cwd, 'package.json');
   
+  // Try to find workspace config for root-level execution
+  const configObj = getWorkspaceConfig();
+  if (configObj) {
+    const workspaceRoot = path.dirname(configObj.path);
+    const { projectName } = configObj.data;
+    
+    if (options.id) {
+       // Target a specific module
+       const moduleDir = path.join(workspaceRoot, options.id);
+       if (fs.existsSync(moduleDir)) {
+         cwd = moduleDir;
+         pkgPath = path.join(cwd, 'package.json');
+         console.log(`📂 Auto-detected Module folder: ${path.relative(process.cwd(), moduleDir)}`);
+       }
+    } else {
+       // Target host by default if in root
+       const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+       if (fs.existsSync(hostDir)) {
+          cwd = hostDir;
+          pkgPath = path.join(cwd, 'package.json');
+          console.log(`📂 Auto-detected Host App folder: ${path.relative(process.cwd(), hostDir)}`);
+       }
+    }
+  }
+
   const pkg = fs.readJsonSync(pkgPath);
   const moduleId = options.id || pkg.name;
   const port = options.port || '8081';
@@ -19,13 +41,12 @@ module.exports = async (options) => {
   
   if (isHost && !options.id) {
      console.log(`\n🚀 Starting Host App Dev Server (Re.Pack/Rspack)...\n`);
-     await spawn('npx', ['react-native', 'webpack-start'], { stdio: 'inherit', shell: true });
+     await spawn('npx', ['react-native', 'webpack-start'], { cwd, stdio: 'inherit', shell: true });
      return;
   }
 
   console.log(`\n⚡ Starting ESAD Dev Server for ${moduleId} on port ${port}...\n`);
   
-  const configObj = getWorkspaceConfig();
   const config = configObj ? configObj.data : null;
   let devApiUrl = config?.devModeEndpoint ? config.devModeEndpoint.replace('{{moduleId}}', moduleId) : null;
 
@@ -43,7 +64,7 @@ module.exports = async (options) => {
 
   await setDevMode(true);
 
-  const proc = spawn('npx', ['react-native', 'webpack-start', '--port', port], { stdio: 'inherit', shell: true });
+  const proc = spawn('npx', ['react-native', 'webpack-start', '--port', port], { cwd, stdio: 'inherit', shell: true });
 
   const shutdown = async () => {
     console.log(`\n🛑 Parando ESAD Dev Server e revertendo o registro na CDN...`);

package/src/cli/commands/host.js

@@ -4,6 +4,7 @@ const fs = require('fs-extra');
 const { spawn } = require('cross-spawn');
 const http = require('http');
 const readline = require('readline');
+const { getWorkspaceConfig } = require('../utils/config');
 
 const rl = readline.createInterface({
   input: process.stdin,
@@ -13,11 +14,25 @@ const rl = readline.createInterface({
 const askQuestion = (query) => new Promise((resolve) => rl.question(query, resolve));
 
 module.exports = async (subcommand) => {
-  const cwd = process.cwd();
-  const pkgPath = path.join(cwd, 'package.json');
+  let cwd = process.cwd();
+  let pkgPath = path.join(cwd, 'package.json');
   
+  // Try to find workspace config to resolve host path from root
+  const configObj = getWorkspaceConfig();
+  if (configObj) {
+    const workspaceRoot = path.dirname(configObj.path);
+    const { projectName } = configObj.data;
+    const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+    
+    if (fs.existsSync(hostDir)) {
+      cwd = hostDir;
+      pkgPath = path.join(cwd, 'package.json');
+      console.log(`📂 Auto-detected Host App folder: ${path.relative(process.cwd(), hostDir)}`);
+    }
+  }
+
   if (!fs.existsSync(pkgPath)) {
-    console.error(`❌ Error: Call this command from inside the Host App directory.`);
+    console.error(`❌ Error: Call this command from inside the Host App or the Workspace Root.`);
     return;
   }
 
@@ -85,15 +100,20 @@ module.exports = async (subcommand) => {
     // 4. Start Bundler in a New Window
     console.log(`\n🛠️ Starting Rspack Bundler in a new window...`);
     if (process.platform === 'win32') {
-      // Use CMD /C START to open a new window
-      spawn('cmd', ['/c', 'start', 'npx', 'react-native', 'webpack-start'], { 
+      // Use CMD /C START /D <dir> to open a new window in the correct folder
+      spawn('cmd', ['/c', 'start', '/D', cwd, 'npx', 'react-native', 'webpack-start'], { 
         detached: true, 
         stdio: 'ignore',
         shell: true 
       }).unref();
     } else {
       // For MacOS or Linux
-      spawn('npx', ['react-native', 'webpack-start'], { detached: true, stdio: 'inherit', shell: true }).unref();
+      spawn('npx', ['react-native', 'webpack-start'], { 
+        cwd, 
+        detached: true, 
+        stdio: 'inherit', 
+        shell: true 
+      }).unref();
     }
 
     // 5. Wait for Bundler (Port 8081)