@codemoreira/esad 1.4.6-4 → 1.4.6-6

package/bin/esad.js

@@ -16,7 +16,7 @@ program
   .version(pkg.version)
   .description('esad - Easy Super App Development Toolkit');
 
-// --- COMMMAND: esad init ---
+// --- COMMAND: esad init ---
 program
   .command('init <project-name>')
   .description('Scaffold a new ESAD workspace containing the Host App')
@@ -34,15 +34,52 @@ program
      process.exit(0);
   });
 
-// --- COMMAND: esad host ---
+// --- COMMAND: esad dev ---
+program
+  .command('dev [platform]')
+  .description('Start the development environment for the Host App (platform: android, ios)')
+  .action(async (platform) => {
+     await hostCommand(platform);
+     process.exit(0);
+  });
+
+// --- COMMAND: esad android ---
 program
-  .command('host <subcommand>')
-  .description('Manage the Host App (Auto-Syncs config, runs android/ios)')
-  .action(async (sub) => {
-     await hostCommand(sub);
+  .command('android')
+  .description('Run Host on Android (alias for esad dev android)')
+  .action(async () => {
+     await hostCommand('android');
      process.exit(0);
   });
 
+// --- COMMAND: esad ios ---
+program
+  .command('ios')
+  .description('Run Host on iOS (alias for esad dev ios)')
+  .action(async () => {
+     await hostCommand('ios');
+     process.exit(0);
+  });
+
+// --- COMMAND: esad start ---
+program
+  .command('start')
+  .description('Alias for esad dev')
+  .action(async () => {
+     await hostCommand('dev');
+     process.exit(0);
+  });
+
+// --- COMMAND: esad push ---
+program
+  .command('push')
+  .option('-i, --id <moduleId>', 'The Module ID to sync to Dev-Cloud')
+  .option('-p, --platform <platform>', 'Platform (android, ios)', 'android')
+  .description('Build and Push the module bundle to the Dev-Cloud for global previewing')
+  .action(async (options) => {
+     await devCommand(options);
+  });
+
 // --- COMMAND: esad create-module ---
 program
   .command('create-module <module-name>')
@@ -75,15 +112,4 @@ program
      process.exit(0);
   });
 
-// --- COMMAND: esad dev ---
-program
-  .command('dev')
-  .option('-i, --id <moduleId>', 'The Module ID to sync to Dev-Cloud')
-  .option('-p, --platform <platform>', 'Platform (android, ios)', 'android')
-  .description('Build and Push the module bundle to the Dev-Cloud for global previewing')
-  .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.4.6-4",
+  "version": "1.4.6-6",
   "description": "Easy Super App Development - Zero-Config CLI and DevTools for React Native Module Federation",
   "main": "src/plugin/index.js",
   "types": "./src/plugin/index.d.ts",
@@ -16,7 +16,8 @@
     "./client": {
       "types": "./src/client/index.d.ts",
       "default": "./src/client/index.js"
-    }
+    },
+    "./config-plugin": "./src/plugin/config-plugin.js"
   },
   "bin": {
     "esad": "./bin/esad.js"

package/src/cli/commands/build.js

@@ -52,7 +52,8 @@ module.exports = async (options) => {
       '--platform', platform, 
       '--dev', 'false',
       '--bundle-output', bundleOutput,
-      '--assets-dest', path.dirname(bundleOutput)
+      '--assets-dest', path.dirname(bundleOutput),
+      '--reset-cache'
     ], cwd);
     
     console.log(chalk.green(`\n✅ Build complete! Assets generated in build/ directory.`));

package/src/cli/commands/dev.js

@@ -84,7 +84,8 @@ module.exports = async (options) => {
       '--platform', platform, 
       '--dev', 'false',
       '--bundle-output', bundleOutput,
-      '--assets-dest', path.dirname(bundleOutput)
+      '--assets-dest', path.dirname(bundleOutput),
+      '--reset-cache'
     ], cwd);
   } catch (err) {
     console.error(chalk.red(`❌ Build failed.`));

package/src/cli/commands/host.js

@@ -7,12 +7,7 @@ const readline = require('readline');
 const { getWorkspaceConfig } = require('../utils/config');
 const { prepareNative } = require('../utils/scaffold');
 
-const rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
-
-const askQuestion = (query) => new Promise((resolve) => rl.question(query, resolve));
+const askQuestion = (query, rl) => new Promise((resolve) => rl.question(query, resolve));
 
 /**
  * Check if a port is in use
@@ -28,6 +23,12 @@ const isPortInUse = (port) => new Promise((resolve) => {
 });
 
 module.exports = async (subcommand) => {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  if (!subcommand) subcommand = 'dev';
   let cwd = process.cwd();
   let pkgPath = path.join(cwd, 'package.json');
   
@@ -64,7 +65,7 @@ module.exports = async (subcommand) => {
     console.log(`[b] Bundler Only`);
     console.log(`[c] Cancel`);
     
-    const choice = (await askQuestion(`\nSelect platform: `)).toLowerCase();
+    const choice = (await askQuestion(`\nSelect platform: `, rl)).toLowerCase();
     
     if (choice === 'c') {
       console.log(`\n❌ Cancelled.`);
@@ -86,13 +87,13 @@ module.exports = async (subcommand) => {
     if (shouldStartBundler && choice !== 'c') {
       console.log(`\n🛠️ Starting Rspack Bundler in a new window...`);
       if (process.platform === 'win32') {
-        spawn('cmd', ['/c', 'start', '/D', cwd, 'npx', 'react-native', 'webpack-start'], { 
+        spawn('cmd', ['/c', 'start', '/D', cwd, 'npx', 'react-native', 'start', '--reset-cache'], { 
           detached: true, 
           stdio: 'ignore',
           shell: true 
         }).unref();
       } else {
-        spawn('npx', ['react-native', 'webpack-start'], { 
+        spawn('npx', ['react-native', 'start', '--reset-cache'], { 
           cwd, 
           detached: true, 
           stdio: 'inherit', 
@@ -139,13 +140,16 @@ module.exports = async (subcommand) => {
     // Other subcommands (android, ios directly)
     try {
       if (subcommand === 'android') {
+        console.log(`🤖 Compiling and launching on Android...`);
         await runProcess('npx', ['expo', 'run:android', '--no-bundler'], cwd);
       } else if (subcommand === 'ios') {
+        console.log(`🍎 Compiling and launching on iOS...`);
         await runProcess('npx', ['expo', 'run:ios', '--no-bundler'], cwd);
       }
     } catch (err) {
       console.error(`❌ Error running host command: ${err.message}`);
+    } finally {
+      rl.close();
     }
-    rl.close();
   }
 };

package/src/cli/utils/process.js

@@ -8,8 +8,9 @@ const { spawn } = require('cross-spawn');
  * @returns {Promise<void>}
  */
 const runProcess = (cmd, args, cwd = process.cwd()) => {
+  const executable = (process.platform === 'win32' && cmd === 'npx') ? 'npx.cmd' : cmd;
   return new Promise((resolve, reject) => {
-    const child = spawn(cmd, args, { stdio: 'inherit', cwd, shell: true });
+    const child = spawn(executable, args, { stdio: 'inherit', cwd, shell: true });
     child.on('close', code => {
       if (code !== 0) reject(new Error(`Command ${cmd} ${args.join(' ')} failed`));
       else resolve();

package/src/cli/utils/scaffold.js

@@ -76,7 +76,7 @@ async function prepareNative(cwd, platform = 'android') {
     const appJson = await fs.readJson(appJsonPath);
     if (appJson.expo) {
       const plugins = appJson.expo.plugins || [];
-      const pluginName = '@codemoreira/esad/plugin/config-plugin';
+      const pluginName = '@codemoreira/esad/config-plugin';
       
       if (!plugins.includes(pluginName) && !plugins.some(p => Array.isArray(p) && p[0] === pluginName)) {
         appJson.expo.plugins = [...plugins, pluginName];