@codemoreira/esad 1.1.3 → 1.2.1

package/bin/esad.js

@@ -8,44 +8,69 @@ const createModuleCommand = require('../src/cli/commands/createModule');
 const createCdnCommand = require('../src/cli/commands/createCdn');
 const deployCommand = require('../src/cli/commands/deploy');
 const devCommand = require('../src/cli/commands/dev');
+const hostCommand = require('../src/cli/commands/host');
 
 program
-  .version('1.1.3')
+  .version('1.2.0')
   .description('esad - Easy Super App Development Toolkit');
 
 // --- COMMMAND: esad init ---
 program
   .command('init <project-name>')
   .description('Scaffold a new ESAD workspace containing the Host App')
-  .action(initCommand);
+  .action(async (name) => {
+     await initCommand(name);
+     process.exit(0);
+  });
 
 // --- COMMAND: esad create-cdn ---
 program
   .command('create-cdn [cdn-name]')
   .description('Scaffold the CDN / Registry backend')
-  .action(createCdnCommand);
+  .action(async (name) => {
+     await createCdnCommand(name);
+     process.exit(0);
+  });
+
+// --- COMMAND: esad host ---
+program
+  .command('host <subcommand>')
+  .description('Manage the Host App (dev, android, ios)')
+  .action(async (sub) => {
+     await hostCommand(sub);
+     process.exit(0);
+  });
 
 // --- COMMAND: esad create-module ---
 program
   .command('create-module <module-name>')
   .description('Scaffold a React Native mini-app automatically configured for Module Federation via ESAD')
-  .action(createModuleCommand);
+  .action(async (name) => {
+     await createModuleCommand(name);
+     process.exit(0);
+  });
 
 // --- COMMAND: esad deploy ---
 program
   .command('deploy')
-  .requiredOption('-v, --version <semver>', 'Version number (e.g., 1.0.0)')
-  .requiredOption('-i, --id <moduleId>', 'The Module ID to deploy')
-  .requiredOption('-e, --entry <entryFileName>', 'The name of the main entry bundle (e.g., index.bundle)')
+  .option('-v, --version <semver>', 'Version number (e.g., 1.0.0)')
+  .option('-i, --id <moduleId>', 'The Module ID to deploy')
+  .option('-e, --entry <entryFileName>', 'The name of the main entry bundle (e.g., index.bundle)', 'index.bundle')
   .description('Zips the local dist directory and uploads it to the configured deployment endpoint')
-  .action(deployCommand);
+  .action(async (options) => {
+     await deployCommand(options);
+     process.exit(0);
+  });
 
 // --- COMMAND: esad dev ---
 program
   .command('dev')
-  .requiredOption('-i, --id <moduleId>', 'The Module ID to run in dev mode')
+  .option('-i, --id <moduleId>', 'The Module ID to run in dev mode')
   .option('-p, --port <port>', 'The port to run the dev server on', '8081')
   .description('Starts the dev server and updates the external registry to bypass CDN')
-  .action(devCommand);
+  .action(async (options) => {
+     await devCommand(options);
+     // Note: dev command has its own shutdown logic with SIGINT/SIGTERM
+  });
 
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "Easy Super App Development - Zero-Config CLI and DevTools for React Native Module Federation",
   "main": "src/plugin/index.js",
   "exports": {
@@ -27,4 +27,4 @@
     "fs-extra": "^11.2.0"
   },
   "devDependencies": {}
-}
+}

package/src/cli/commands/createModule.js

@@ -29,6 +29,17 @@ module.exports = async (moduleName) => {
     fs.writeFileSync(path.join(targetDir, 'rspack.config.mjs'), rspackContent);
     console.log(`✅ Injected withESAD wrapper into rspack.config.mjs`);
 
+    // Update package.json scripts
+    const modPkgPath = path.join(targetDir, 'package.json');
+    const modPkg = fs.readJsonSync(modPkgPath);
+    modPkg.scripts = {
+      ...modPkg.scripts,
+      "start": "esad dev",
+      "deploy": "esad deploy"
+    };
+    fs.writeJsonSync(modPkgPath, modPkg, { spaces: 2 });
+    console.log(`✅ Abstracted module scripts to use ESAD CLI.`);
+
     console.log(`\n🎉 Module ${finalModuleName} is ready!`);
   } catch (err) {
     console.error(`❌ Failed to scaffold module`, err.message);

package/src/cli/commands/deploy.js

@@ -4,7 +4,18 @@ const AdmZip = require('adm-zip');
 const { getWorkspaceConfig } = require('../utils/config');
 
 module.exports = async (options) => {
-  console.log(`\n☁️  Starting ESAD Deploy for ${options.id} (v${options.version})\n`);
+  const pkgPath = path.join(process.cwd(), 'package.json');
+  if (!fs.existsSync(pkgPath)) {
+    console.error(`❌ Error: package.json not found.`);
+    process.exit(1);
+  }
+
+  const pkg = fs.readJsonSync(pkgPath);
+  const moduleId = options.id || pkg.name;
+  const version = options.version || pkg.version;
+  const entry = options.entry || 'index.bundle';
+
+  console.log(`\n☁️  Starting ESAD Deploy for ${moduleId} (v${version})\n`);
   
   const configObj = getWorkspaceConfig();
   if (!configObj) {
@@ -18,7 +29,7 @@ module.exports = async (options) => {
     process.exit(1);
   }
   
-  const deployUrl = config.deployEndpoint.replace('{{moduleId}}', options.id);
+  const deployUrl = config.deployEndpoint.replace('{{moduleId}}', moduleId);
   console.log(`📡 Deployment Endpoint Resolved: ${deployUrl}`);
   
   const distPath = path.join(process.cwd(), 'dist');
@@ -30,12 +41,12 @@ module.exports = async (options) => {
   const zip = new AdmZip();
   zip.addLocalFolder(distPath);
   
-  const zipPath = path.join(process.cwd(), `bundle-${options.id}-${options.version}.zip`);
+  const zipPath = path.join(process.cwd(), `bundle-${moduleId}-${version}.zip`);
   zip.writeZip(zipPath);
   console.log(`🗜️  Zipped output to ${zipPath}`);
 
   console.log(`🚀 Uploading to CDN via multipart POST...`);
-  // Example fetch upload would go here
+  // Note: Here we would use form-data + fetch or axios to upload to Simple CDN
   
   console.log(`✅ [SIMULATED] Successfully uploaded to ${deployUrl}`);
   fs.unlinkSync(zipPath);

package/src/cli/commands/dev.js

@@ -1,28 +1,49 @@
 const { spawn } = require('cross-spawn');
 const { getWorkspaceConfig } = require('../utils/config');
+const fs = require('fs-extra');
+const path = require('path');
 
 module.exports = async (options) => {
-  console.log(`\n⚡ Starting ESAD Dev Server for ${options.id} on port ${options.port}...\n`);
+  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;
+  }
+  
+  const pkg = fs.readJsonSync(pkgPath);
+  const moduleId = options.id || pkg.name;
+  const port = options.port || '8081';
+
+  // Determine if it's a Host or Module
+  const isHost = pkg.name.endsWith('-host') || pkg.dependencies?.['@callstack/repack'];
+  
+  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 });
+     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}}', options.id) : null;
+  let devApiUrl = config?.devModeEndpoint ? config.devModeEndpoint.replace('{{moduleId}}', moduleId) : null;
 
   const setDevMode = async (isActive) => {
     if (!devApiUrl) return;
     try {
       const body = { 
         is_dev_mode: isActive, 
-        ...(isActive && { dev_url: `http://localhost:${options.port}/index.bundle` }) 
+        ...(isActive && { dev_url: `http://localhost:${port}/index.bundle` }) 
       };
       const res = await fetch(devApiUrl, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
-      if (res.ok) console.log(`📡 Registry Sync: Dev Override is ${isActive ? 'ON' : 'OFF'} para o modulo Host`);
+      if (res.ok) console.log(`📡 Registry Sync: Dev Override is ${isActive ? 'ON' : 'OFF'} para o modulo ${moduleId}`);
     } catch(e) { /* ignore */ }
   };
 
   await setDevMode(true);
 
-  const proc = spawn('npx', ['react-native', 'webpack-start', '--port', options.port], { stdio: 'inherit', shell: true });
+  const proc = spawn('npx', ['react-native', 'webpack-start', '--port', port], { 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

@@ -0,0 +1,150 @@
+const { runProcess } = require('../utils/process');
+const path = require('path');
+const fs = require('fs-extra');
+const { spawn } = require('cross-spawn');
+const http = require('http');
+const readline = require('readline');
+
+const rl = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout
+});
+
+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');
+  
+  if (!fs.existsSync(pkgPath)) {
+    console.error(`❌ Error: Call this command from inside the Host App directory.`);
+    return;
+  }
+
+  const pkg = fs.readJsonSync(pkgPath);
+
+  // 1. Initial Checks & Prebuild
+  if (subcommand === 'dev' || subcommand === 'start') {
+    if (!fs.existsSync(path.join(cwd, 'android')) && !fs.existsSync(path.join(cwd, 'ios'))) {
+      console.log(`📦 Native folders not found. Running expo prebuild...`);
+      await runProcess('npx', ['expo', 'prebuild'], cwd);
+    }
+
+    // 2. Patch Native Files
+    console.log(`🔧 Patching native files for Re.Pack compatibility...`);
+    const patchFiles = async () => {
+      // Android
+      const androidMainApp = path.join(cwd, 'android/app/src/main/java');
+      if (fs.existsSync(androidMainApp)) {
+        const files = await fs.readdir(androidMainApp, { recursive: true });
+        for (const file of files) {
+          if (file.endsWith('MainApplication.kt') || file.endsWith('MainApplication.java')) {
+            const filePath = path.join(androidMainApp, file);
+            let content = await fs.readFile(filePath, 'utf8');
+            if (content.includes('.expo/.virtual-metro-entry')) {
+              content = content.replace(/.expo\/.virtual-metro-entry/g, 'index');
+              await fs.writeFile(filePath, content);
+            }
+          }
+        }
+      }
+      // iOS
+      const iosDir = path.join(cwd, 'ios');
+      if (fs.existsSync(iosDir)) {
+        const iosFiles = await fs.readdir(iosDir, { recursive: true });
+        for (const file of iosFiles) {
+          if (file.match(/AppDelegate\.(m|mm|swift)/)) {
+            const filePath = path.join(iosDir, file);
+            let content = await fs.readFile(filePath, 'utf8');
+            if (content.includes('.expo/.virtual-metro-entry')) {
+              content = content.replace(/.expo\/.virtual-metro-entry/g, 'index');
+              await fs.writeFile(filePath, content);
+            }
+          }
+        }
+      }
+    };
+    await patchFiles();
+
+    // 3. Platform Selection
+    console.log(`\nESAD Host Dev Manager`);
+    console.log(`---------------------`);
+    console.log(`[a] Run on Android`);
+    console.log(`[i] Run on iOS`);
+    console.log(`[b] Bundler Only`);
+    console.log(`[c] Cancel`);
+    
+    const choice = (await askQuestion(`\nSelect platform: `)).toLowerCase();
+    
+    if (choice === 'c') {
+      console.log(`\n❌ Cancelled.`);
+      rl.close();
+      return;
+    }
+
+    // 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'], { 
+        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();
+    }
+
+    // 5. Wait for Bundler (Port 8081)
+    console.log(`⏳ Waiting for Rspack Bundler to initialize on port 8081...`);
+    const waitForBundler = async () => {
+      for (let i = 0; i < 30; i++) {
+        try {
+          await new Promise((resolve, reject) => {
+            const req = http.get('http://localhost:8081', (res) => resolve(res));
+            req.on('error', reject);
+            req.end();
+          });
+          return true;
+        } catch (e) {
+          await new Promise(r => setTimeout(r, 2000));
+        }
+      }
+      return false;
+    };
+
+    const isReady = await waitForBundler();
+    if (!isReady) {
+      console.error(`\n❌ Timeout: Bundler did not respond after 60 seconds.`);
+      rl.close();
+      return;
+    }
+    console.log(`✅ Bundler stable and ready to use!`);
+
+    // 6. Launch Native App
+    if (choice === 'a') {
+      console.log(`🤖 Compiling and sending to Android...`);
+      await runProcess('npx', ['expo', 'run:android', '--no-bundler'], cwd);
+    } else if (choice === 'i') {
+      console.log(`🍎 Compiling and sending to iOS...`);
+      await runProcess('npx', ['expo', 'run:ios', '--no-bundler'], cwd);
+    } else if (choice === 'b') {
+      console.log(`✨ Bundler is running. You can open the app manually.`);
+    }
+
+    rl.close();
+  } else {
+    // Other subcommands (android, ios directly)
+    try {
+      if (subcommand === 'android') {
+        await runProcess('npx', ['expo', 'run:android', '--no-bundler'], cwd);
+      } else if (subcommand === 'ios') {
+        await runProcess('npx', ['expo', 'run:ios', '--no-bundler'], cwd);
+      }
+    } catch (err) {
+      console.error(`❌ Error running host command: ${err.message}`);
+    }
+    rl.close();
+  }
+};

package/src/cli/commands/init.js

@@ -44,12 +44,17 @@ module.exports = async (projectName) => {
     console.log(`\n📦 Scaffolding clean Expo project: ${hostName}...`);
     await runProcess('npx', ['create-expo-app', hostName, '--template', 'blank'], workspaceDir);
     
-    console.log(`\n📦 Installing ESAD and UI dependencies into host...`);
-    const hostPkg = fs.readJsonSync(path.join(hostDir, 'package.json'));
+    console.log(`\n📦 Installing ESAD, Re.Pack and UI dependencies into host...`);
+    const hostPkgPath = path.join(hostDir, 'package.json');
+    const hostPkg = fs.readJsonSync(hostPkgPath);
     const reactVersion = hostPkg.dependencies.react;
 
     const deps = [
       '@codemoreira/esad',
+      '@callstack/repack@^5.2.5',
+      '@rspack/core@^1.7.9',
+      '@rspack/plugin-react-refresh@^1.6.1',
+      '@callstack/repack-plugin-expo-modules',
       'nativewind',
       'tailwindcss',
       'postcss',
@@ -63,6 +68,20 @@ module.exports = async (projectName) => {
     ];
     await runProcess('npm', ['install', ...deps], hostDir); 
 
+    // Re-read package.json to get the version after npm install updated it
+    const updatedPkg = fs.readJsonSync(hostPkgPath);
+
+    // Update package.json scripts to delegate to ESAD CLI
+    updatedPkg.scripts = {
+       ...updatedPkg.scripts,
+       "start": "esad host start",
+       "android": "esad host android",
+       "ios": "esad host ios",
+       "dev": "esad host dev"
+    };
+    fs.writeJsonSync(hostPkgPath, updatedPkg, { spaces: 2 });
+    console.log(`✅ Abstracted package.json scripts to use ESAD CLI.`);
+
     console.log(`\n🎨 Configuring NativeWind & Tailwind...`);
     fs.writeFileSync(path.join(hostDir, 'tailwind.config.js'), templates.tailwindConfig);
     fs.writeFileSync(path.join(hostDir, 'babel.config.js'), templates.babelConfig);
@@ -81,6 +100,7 @@ module.exports = async (projectName) => {
     fs.writeFileSync(path.join(hostDir, 'app/login.tsx'), templates.loginPage);
     fs.writeFileSync(path.join(hostDir, 'app/global.css'), templates.globalCss);
     fs.writeFileSync(path.join(hostDir, 'lib/moduleLoader.ts'), templates.moduleLoader);
+    fs.writeFileSync(path.join(hostDir, 'index.js'), templates.indexJs);
     fs.writeFileSync(path.join(hostDir, 'app/(protected)/index.tsx'), templates.dashboard);
     fs.writeFileSync(path.join(hostDir, 'app/(protected)/module/[id].tsx'), templates.modulePage);
 

package/src/cli/templates/host.js

@@ -195,5 +195,7 @@ export default function ModulePage() {
        <Text className="mt-4 text-slate-500">Loading federated module...</Text>
     </View>
   );
-}`
+}`,
+
+  indexJs: `import "expo-router/entry";`
 };