@codemoreira/esad 1.4.4 → 1.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "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",

package/src/cli/commands/build.js

@@ -1,60 +1,64 @@
-const { runProcess } = require('../utils/process');
-const path = require('path');
-const fs = require('fs-extra');
-const chalk = require('chalk');
-const { getWorkspaceConfig, syncHostConfig } = require('../utils/config');
-const { resolveProjectDir, listAvailableModules } = require('../utils/resolution');
-
-module.exports = async (options) => {
-  let cwd = process.cwd();
-  
-  // Enforce Workspace Root
-  const configObj = getWorkspaceConfig();
-  if (!configObj) {
-    console.error(chalk.red(`❌ Error: Call this command from the project root (esad.config.json not found).`));
-    process.exit(1);
-  }
-
-  syncHostConfig(configObj);
-
-  const { projectName } = configObj.data;
-  
-  if (options.id) {
-    const targetDir = resolveProjectDir(options.id, configObj);
-    if (!targetDir) {
-      console.error(chalk.red(`\n❌ Error: Module not found: ${options.id}`));
-      listAvailableModules(configObj);
-      process.exit(1);
-    }
-    cwd = targetDir;
-  } else {
-    // Build host by default if in root
-    const hostDir = path.join(path.dirname(configObj.path), `${projectName}-host`);
-    if (fs.existsSync(hostDir)) cwd = hostDir;
-  }
-
-  const platform = options.platform || 'android';
-  
-  console.log(`\n🏗️  Building production bundle for ${path.basename(cwd)} (${platform})...\n`);
-  
-  try {
-    const bundleOutput = path.join(cwd, 'build', platform, 'index.bundle');
-    fs.ensureDirSync(path.dirname(bundleOutput));
-
-    // Run Re.Pack production build
-    await runProcess('npx', [
-      'react-native', 
-      'webpack-bundle', 
-      '--platform', platform, 
-      '--dev', 'false',
-      '--bundle-output', bundleOutput,
-      '--assets-dest', path.dirname(bundleOutput)
-    ], cwd);
-    
-    console.log(chalk.green(`\n✅ Build complete! Assets generated in build/ directory.`));
-    console.log(`👉 You can now run: esad deploy ${options.id ? `--id ${options.id}` : ''}\n`);
-  } catch (err) {
-    console.error(chalk.red(`\n❌ Build failed: ${err.message}`));
-    process.exit(1);
-  }
-};
+const { runProcess } = require('../utils/process');
+const path = require('path');
+const fs = require('fs-extra');
+const chalk = require('chalk');
+const { getWorkspaceConfig, syncHostConfig } = require('../utils/config');
+const { resolveProjectDir, listAvailableModules } = require('../utils/resolution');
+const { prepareNative } = require('../utils/scaffold');
+
+module.exports = async (options) => {
+  let cwd = process.cwd();
+  
+  // Enforce Workspace Root
+  const configObj = getWorkspaceConfig();
+  if (!configObj) {
+    console.error(chalk.red(`❌ Error: Call this command from the project root (esad.config.json not found).`));
+    process.exit(1);
+  }
+
+  syncHostConfig(configObj);
+
+  const { projectName } = configObj.data;
+  
+  if (options.id) {
+    const targetDir = resolveProjectDir(options.id, configObj);
+    if (!targetDir) {
+      console.error(chalk.red(`\n❌ Error: Module not found: ${options.id}`));
+      listAvailableModules(configObj);
+      process.exit(1);
+    }
+    cwd = targetDir;
+  } else {
+    // Build host by default if in root
+    const hostDir = path.join(path.dirname(configObj.path), `${projectName}-host`);
+    if (fs.existsSync(hostDir)) cwd = hostDir;
+  }
+
+  const platform = options.platform || 'android';
+  
+  // Prepare Native Folders
+  await prepareNative(cwd, platform);
+
+  console.log(`\n🏗️  Building production bundle for ${path.basename(cwd)} (${platform})...\n`);
+  
+  try {
+    const bundleOutput = path.join(cwd, 'build', platform, 'index.bundle');
+    fs.ensureDirSync(path.dirname(bundleOutput));
+
+    // Run Re.Pack production build
+    await runProcess('npx', [
+      'react-native', 
+      'webpack-bundle', 
+      '--platform', platform, 
+      '--dev', 'false',
+      '--bundle-output', bundleOutput,
+      '--assets-dest', path.dirname(bundleOutput)
+    ], cwd);
+    
+    console.log(chalk.green(`\n✅ Build complete! Assets generated in build/ directory.`));
+    console.log(`👉 You can now run: esad deploy ${options.id ? `--id ${options.id}` : ''}\n`);
+  } catch (err) {
+    console.error(chalk.red(`\n❌ Build failed: ${err.message}`));
+    process.exit(1);
+  }
+};

package/src/cli/commands/deploy.js

@@ -4,6 +4,7 @@ const AdmZip = require('adm-zip');
 const chalk = require('chalk');
 const { getWorkspaceConfig, syncHostConfig } = require('../utils/config');
 const { resolveModuleMetadata, listAvailableModules } = require('../utils/resolution');
+const { prepareNative } = require('../utils/scaffold');
 
 module.exports = async (options) => {
   let cwd = process.cwd();
@@ -54,6 +55,9 @@ module.exports = async (options) => {
   const version = options.version || pkg.version;
   const entry = options.entry || 'index.bundle';
 
+  // Ensure Native Folders are present (useful for consistency)
+  await prepareNative(cwd, 'all');
+
   console.log(`\n☁️  Starting ESAD Deploy for ${moduleId} (v${version})\n`);
   
   const config = configObj ? configObj.data : null;

package/src/cli/commands/dev.js

@@ -1,123 +1,129 @@
-const { spawn } = require('cross-spawn');
-const { getWorkspaceConfig, syncHostConfig } = require('../utils/config');
-const fs = require('fs-extra');
-const path = require('path');
-const chalk = require('chalk');
-const { resolveModuleMetadata, listAvailableModules, resolveProjectDir } = require('../utils/resolution');
-const { runProcess } = require('../utils/process');
-const AdmZip = require('adm-zip');
-
-module.exports = async (options) => {
-  let cwd = process.cwd();
-  let pkgPath = path.join(cwd, 'package.json');
-  
-  // Enforce Workspace Root
-  const configObj = getWorkspaceConfig();
-  if (!configObj) {
-    console.error(chalk.red(`❌ Error: Call this command from the project root (esad.config.json not found).`));
-    process.exit(1);
-  }
-
-  const workspaceRoot = path.dirname(configObj.path);
-  const { projectName } = configObj.data;
-  
-  // Synchronize Host Config
-  syncHostConfig(configObj);
-  
-  if (options.id) {
-    const targetDir = resolveProjectDir(options.id, configObj);
-    if (!targetDir) {
-      console.error(chalk.red(`\n❌ Error: Module not found: ${options.id}`));
-      listAvailableModules(configObj);
-      process.exit(1);
-    }
-    cwd = targetDir;
-    pkgPath = path.join(cwd, 'package.json');
-    console.log(chalk.green(`📂 Module detected: ${path.relative(workspaceRoot, cwd)}`));
-  } 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(chalk.green(`📂 Host detected: ${path.relative(workspaceRoot, cwd)}`));
-    }
-  }
-
-  if (!fs.existsSync(pkgPath)) {
-    console.error(chalk.red(`❌ Error: package.json not found in ${cwd}.`));
-    process.exit(1);
-  }
-
-  const pkg = fs.readJsonSync(pkgPath);
-  let moduleId = options.id || pkg.name;
-  const platform = options.platform || 'android';
-
-  console.log(chalk.cyan(`\n☁️  Starting ESAD Dev-Push for ${moduleId} (${platform})\n`));
-  
-  const config = configObj ? configObj.data : null;
-  const devUrlBase = config?.devModeEndpoint || config?.deployEndpoint?.replace('/versions', '');
-  
-  if (!devUrlBase) {
-    console.error(chalk.red(`❌ Error: 'devModeEndpoint' or 'deployEndpoint' not configured in esad.config.json.`));
-    process.exit(1);
-  }
-
-  const devUploadUrl = devUrlBase.replace('{{moduleId}}', moduleId) + '/dev';
-  console.log(`📡 Dev-Cloud Endpoint: ${devUploadUrl}`);
-
-  // 1. Build
-  console.log(`\n🏗️  Step 1/3: Building bundle...`);
-  const bundleOutput = path.join(cwd, 'build', platform, 'index.bundle');
-  await fs.ensureDir(path.dirname(bundleOutput));
-  
-  try {
-    await runProcess('npx', [
-      'react-native', 
-      'webpack-bundle', 
-      '--platform', platform, 
-      '--dev', 'false',
-      '--bundle-output', bundleOutput,
-      '--assets-dest', path.dirname(bundleOutput)
-    ], cwd);
-  } catch (err) {
-    console.error(chalk.red(`❌ Build failed.`));
-    process.exit(1);
-  }
-
-  // 2. Zip
-  console.log(`\n🗜️  Step 2/3: Zipping assets...`);
-  const zip = new AdmZip();
-  const buildDir = path.join(cwd, 'build');
-  zip.addLocalFolder(buildDir);
-  const zipPath = path.join(cwd, `dev-bundle-${moduleId}.zip`);
-  zip.writeZip(zipPath);
-
-  // 3. Upload
-  console.log(`\n🚀 Step 3/3: Pushing to Dev-Cloud...`);
-  try {
-    const FormData = require('form-data');
-    const form = new FormData();
-    form.append('bundle', fs.createReadStream(zipPath));
-
-    const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
-    const response = await fetch(devUploadUrl, {
-      method: 'POST',
-      body: form,
-      headers: form.getHeaders(),
-    });
-
-    if (response.ok) {
-      console.log(chalk.green(`\n✅ Successfully synced ${moduleId} to Dev-Cloud!`));
-      console.log(`📱 Host app configured with 'devModeFor: ["${options.id || moduleId}"]' will now load this version.\n`);
-    } else {
-      const errorText = await response.text();
-      console.error(chalk.red(`❌ Cloud Sync failed: ${response.status} ${response.statusText}`));
-      console.error(errorText);
-    }
-  } catch (err) {
-    console.error(chalk.red(`❌ Error during sync: ${err.message}`));
-  } finally {
-    if (fs.existsSync(zipPath)) fs.unlinkSync(zipPath);
-  }
-};
+const { spawn } = require('cross-spawn');
+const { getWorkspaceConfig, syncHostConfig } = require('../utils/config');
+const fs = require('fs-extra');
+const path = require('path');
+const chalk = require('chalk');
+const { resolveModuleMetadata, listAvailableModules, resolveProjectDir } = require('../utils/resolution');
+const { runProcess } = require('../utils/process');
+const { prepareNative } = require('../utils/scaffold');
+const AdmZip = require('adm-zip');
+
+module.exports = async (options) => {
+  let cwd = process.cwd();
+  let pkgPath = path.join(cwd, 'package.json');
+  
+  // Enforce Workspace Root
+  const configObj = getWorkspaceConfig();
+  if (!configObj) {
+    console.error(chalk.red(`❌ Error: Call this command from the project root (esad.config.json not found).`));
+    process.exit(1);
+  }
+
+  const workspaceRoot = path.dirname(configObj.path);
+  const { projectName } = configObj.data;
+  
+  // Synchronize Host Config
+  syncHostConfig(configObj);
+  
+  if (options.id) {
+    const metadata = resolveModuleMetadata(options.id, configObj);
+    if (!metadata) {
+      console.error(chalk.red(`\n❌ Error: Module not found: ${options.id}`));
+      listAvailableModules(configObj);
+      process.exit(1);
+    }
+    cwd = metadata.path;
+    moduleId = metadata.id;
+    pkgPath = path.join(cwd, 'package.json');
+    console.log(chalk.green(`📂 Module detected: ${path.relative(workspaceRoot, cwd)} (ID: ${moduleId})`));
+  } else {
+    // Target host by default if in root
+    const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+    if (fs.existsSync(hostDir)) {
+      cwd = hostDir;
+      moduleId = pkg.name; // Fallback to package name if in host
+      pkgPath = path.join(cwd, 'package.json');
+      console.log(chalk.green(`📂 Host detected: ${path.relative(workspaceRoot, cwd)}`));
+    }
+  }
+
+  if (!fs.existsSync(pkgPath)) {
+    console.error(chalk.red(`❌ Error: package.json not found in ${cwd}.`));
+    process.exit(1);
+  }
+
+  const pkg = fs.readJsonSync(pkgPath);
+  if (!moduleId) moduleId = pkg.name;
+  const platform = options.platform || 'android';
+
+  console.log(chalk.cyan(`\n☁️  Starting ESAD Dev-Push for ${moduleId} (${platform})\n`));
+  
+  const config = configObj ? configObj.data : null;
+  const devUrlBase = config?.devModeEndpoint || config?.deployEndpoint?.replace('/versions', '');
+  
+  if (!devUrlBase) {
+    console.error(chalk.red(`❌ Error: 'devModeEndpoint' or 'deployEndpoint' not configured in esad.config.json.`));
+    process.exit(1);
+  }
+
+  const devUploadUrl = devUrlBase.replace('{{moduleId}}', moduleId) + '/dev';
+  console.log(`📡 Dev-Cloud Endpoint: ${devUploadUrl}`);
+
+  // 0. Prepare Native
+  await prepareNative(cwd, platform);
+
+  // 1. Build
+  console.log(`\n🏗️  Step 1/3: Building bundle...`);
+  const bundleOutput = path.join(cwd, 'build', platform, 'index.bundle');
+  await fs.ensureDir(path.dirname(bundleOutput));
+  
+  try {
+    await runProcess('npx', [
+      'react-native', 
+      'webpack-bundle', 
+      '--platform', platform, 
+      '--dev', 'false',
+      '--bundle-output', bundleOutput,
+      '--assets-dest', path.dirname(bundleOutput)
+    ], cwd);
+  } catch (err) {
+    console.error(chalk.red(`❌ Build failed.`));
+    process.exit(1);
+  }
+
+  // 2. Zip
+  console.log(`\n🗜️  Step 2/3: Zipping assets...`);
+  const zip = new AdmZip();
+  const buildDir = path.join(cwd, 'build');
+  zip.addLocalFolder(buildDir);
+  const zipPath = path.join(cwd, `dev-bundle-${moduleId}.zip`);
+  zip.writeZip(zipPath);
+
+  // 3. Upload
+  console.log(`\n🚀 Step 3/3: Pushing to Dev-Cloud...`);
+  try {
+    const FormData = require('form-data');
+    const form = new FormData();
+    form.append('bundle', fs.createReadStream(zipPath));
+
+    const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
+    const response = await fetch(devUploadUrl, {
+      method: 'POST',
+      body: form,
+      headers: form.getHeaders(),
+    });
+
+    if (response.ok) {
+      console.log(chalk.green(`\n✅ Successfully synced ${moduleId} to Dev-Cloud!`));
+      console.log(`📱 Host app configured with 'devModeFor: ["${options.id || moduleId}"]' will now load this version.\n`);
+    } else {
+      const errorText = await response.text();
+      console.error(chalk.red(`❌ Cloud Sync failed: ${response.status} ${response.statusText}`));
+      console.error(errorText);
+    }
+  } catch (err) {
+    console.error(chalk.red(`❌ Error during sync: ${err.message}`));
+  } finally {
+    if (fs.existsSync(zipPath)) fs.unlinkSync(zipPath);
+  }
+};

package/src/cli/commands/host.js

@@ -1,151 +1,151 @@
-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 { 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));
-
-/**
- * Check if a port is in use
- */
-const isPortInUse = (port) => new Promise((resolve) => {
-  const req = http.get(`http://localhost:${port}`, (res) => {
-    resolve(true); // Responded, so it's in use
-  });
-  req.on('error', () => {
-    resolve(false); // Refused, so it's free
-  });
-  req.end();
-});
-
-module.exports = async (subcommand) => {
-  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 or the Workspace Root.`);
-    return;
-  }
-
-  const pkg = fs.readJsonSync(pkgPath);
-
-  // 1. Initial Checks & Automated Native Preparation
-  if (subcommand === 'dev' || subcommand === 'start') {
-    await prepareNative(cwd, 'all');
-
-    // 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. Check for Port 8081
-    const portBusy = await isPortInUse(8081);
-    let shouldStartBundler = true;
-
-    if (portBusy) {
-      console.log(`\n⚠️  Warning: Port 8081 is already in use by another process.`);
-      console.log(`💡 Skipping Bundler startup - assuming it's already running. Proceeding with Native Build only.\n`);
-      shouldStartBundler = false;
-    }
-
-    // 4. Start Bundler in a New Window (if needed)
-    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'], { 
-          detached: true, 
-          stdio: 'ignore',
-          shell: true 
-        }).unref();
-      } else {
-        spawn('npx', ['react-native', 'webpack-start'], { 
-          cwd, 
-          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++) {
-          if (await isPortInUse(8081)) return true;
-          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 launching on Android...`);
-      await runProcess('npx', ['expo', 'run:android', '--no-bundler'], cwd);
-    } else if (choice === 'i') {
-      console.log(`🍎 Compiling and launching on iOS...`);
-      await runProcess('npx', ['expo', 'run:ios', '--no-bundler'], cwd);
-    } else if (choice === 'b') {
-      if (portBusy) {
-        console.log(`✨ Bundler is already active. You can launch manual native runs.`);
-      } else {
-        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();
-  }
-};
+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 { 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));
+
+/**
+ * Check if a port is in use
+ */
+const isPortInUse = (port) => new Promise((resolve) => {
+  const req = http.get(`http://localhost:${port}`, (res) => {
+    resolve(true); // Responded, so it's in use
+  });
+  req.on('error', () => {
+    resolve(false); // Refused, so it's free
+  });
+  req.end();
+});
+
+module.exports = async (subcommand) => {
+  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 or the Workspace Root.`);
+    return;
+  }
+
+  const pkg = fs.readJsonSync(pkgPath);
+
+  // 1. Initial Checks & Automated Native Preparation
+  if (subcommand === 'dev' || subcommand === 'start') {
+    await prepareNative(cwd, 'all');
+
+    // 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. Check for Port 8081
+    const portBusy = await isPortInUse(8081);
+    let shouldStartBundler = true;
+
+    if (portBusy) {
+      console.log(`\n⚠️  Warning: Port 8081 is already in use by another process.`);
+      console.log(`💡 Skipping Bundler startup - assuming it's already running. Proceeding with Native Build only.\n`);
+      shouldStartBundler = false;
+    }
+
+    // 4. Start Bundler in a New Window (if needed)
+    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'], { 
+          detached: true, 
+          stdio: 'ignore',
+          shell: true 
+        }).unref();
+      } else {
+        spawn('npx', ['react-native', 'webpack-start'], { 
+          cwd, 
+          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++) {
+          if (await isPortInUse(8081)) return true;
+          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 launching on Android...`);
+      await runProcess('npx', ['expo', 'run:android', '--no-bundler'], cwd);
+    } else if (choice === 'i') {
+      console.log(`🍎 Compiling and launching on iOS...`);
+      await runProcess('npx', ['expo', 'run:ios', '--no-bundler'], cwd);
+    } else if (choice === 'b') {
+      if (portBusy) {
+        console.log(`✨ Bundler is already active. You can launch manual native runs.`);
+      } else {
+        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/plugin/index.js

@@ -39,15 +39,15 @@ function withESAD(env, options) {
     },
     resolve: {
       ...Repack.getResolveOptions(),
+      extensions: [
+        '.expo.ts', '.expo.tsx', '.expo.js', '.expo.jsx',
+        '.native.ts', '.native.tsx', '.native.js', '.native.jsx',
+        ...Repack.getResolveOptions().extensions,
+      ],
       alias: {
-        '@': path.resolve(dirname, '.'),
-        // Internal MFv2 & Re.Pack Aliases (Magic)
-        '@module-federation/runtime/helpers': path.resolve(dirname, 'node_modules/@module-federation/runtime/dist/helpers.js'),
-        '@module-federation/error-codes/browser': path.resolve(dirname, 'node_modules/@module-federation/error-codes/dist/browser.cjs'),
-        '@module-federation/sdk': path.resolve(dirname, 'node_modules/@module-federation/sdk'),
-        
+        '@': dirname,
+        'expo-router': path.resolve(dirname, 'node_modules/expo-router'),
         ...Repack.getResolveOptions().alias,
-        ...(options.alias || {}),
       }
     },
     module: {
@@ -55,17 +55,17 @@ function withESAD(env, options) {
         {
           oneOf: [
             {
-              test: /\.[cm]?[jt]sx?$/,
+              test: /\.[jt]sx?$/,
               include: [
-                /node_modules[\\/]react-native/,
-                /node_modules[\\/]@react-native/,
+                path.resolve(dirname, 'app'),
+                path.resolve(dirname, 'index.js'),
+                /[\\/]node_modules[\\/]expo-router[\\/]/
               ],
-              type: 'javascript/auto',
               use: {
-                loader: '@callstack/repack/babel-swc-loader',
+                loader: 'babel-loader',
                 options: {
-                  sourceMaps: true,
-                  parallel: true,
+                  presets: ['babel-preset-expo'],
+                  plugins: ['react-native-reanimated/plugin'],
                 },
               },
             },
@@ -97,10 +97,12 @@ function withESAD(env, options) {
           'react/jsx-runtime': { singleton: true, eager: true, requiredVersion: pkg.dependencies.react },
           'react-native': { singleton: true, eager: true, requiredVersion: pkg.dependencies['react-native'] },
           'react-native-safe-area-context': { singleton: true, eager: true, requiredVersion: pkg.dependencies['react-native-safe-area-context'] },
-          '@codemoreira/esad/client': { 
-            singleton: true, 
+          'expo-router': { singleton: true, eager: true, requiredVersion: pkg.dependencies['expo-router'] },
+          'react-native-screens': { singleton: true, eager: true, requiredVersion: pkg.dependencies['react-native-screens'] },
+          '@codemoreira/esad/client': {
+            singleton: true,
             eager: options.type === 'host', // Only eager in host to ensure it's available
-            import: clientPath 
+            import: clientPath
           },
           ...(options.shared || {})
         }