@codemoreira/esad 2.0.1-1 → 2.0.1-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "2.0.1-1",
+  "version": "2.0.1-3",
   "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/init.js

@@ -63,13 +63,23 @@ export default {
     await renameProject(hostDir, hostName);
     
     // Inject local context mock immediately to avoid crashes on fresh boot
-    fs.writeJsonSync(path.join(hostDir, '.esad.context.json'), { projectName, devMode: {} }, { spaces: 2 });
+    const context = { projectName, devMode: {} };
+    fs.writeJsonSync(path.join(hostDir, '.esad.context.json'), context, { spaces: 2 });
     
-    console.log(`\n📦 Installing dependencies into host...`);
+    // Stabilize filesystem before heavy operations
+    await new Promise(res => setTimeout(res, 500));
+
+    console.log(`\n📦 Installing dependencies into host (this may take a minute)...`);
     await runProcess('npm', ['install'], { cwd: hostDir });
-    console.log(`\n🎉 ESAD Workspace Initialized!`);
-    console.log(`-> cd ${projectName}/${hostName}\n-> esad host dev (to start Host)`);
+    
+    console.log(chalk.green(`\n🎉 ESAD Workspace Initialized successfully!`));
+    console.log(chalk.cyan(`\n👉 Next steps:`));
+    console.log(`   1. cd ${projectName}/${hostName}`);
+    console.log(`   2. esad host dev (to start Host)`);
+    console.log(`   3. esad dev (in a module folder to federate)\n`);
   } catch (err) {
-    console.error(`❌ Failed to init Host:`, err.message);
+    console.error(chalk.red(`\n❌ Failed to initialize workspace:`));
+    console.error(chalk.yellow(`   ${err.message}`));
+    console.log(chalk.dim(`\n   Check npm logs if it was an installation error.`));
   }
 };

package/src/cli/utils/process.js

@@ -3,7 +3,9 @@ const nativeSpawn = require('child_process').spawn;
 const path = require('path');
 const fs = require('fs-extra');
 
-const runProcess = (cmd, args, cwd = process.cwd()) => {
+const runProcess = (cmd, args, options = process.cwd()) => {
+    const cwd = typeof options === 'string' ? options : (options.cwd || process.cwd());
+    let childRef;
     const promise = new Promise((resolve, reject) => {
       let finished = false;
       let started = false;
@@ -15,47 +17,45 @@ const runProcess = (cmd, args, cwd = process.cwd()) => {
       };
 
       const isWin = process.platform === 'win32';
-      const localBinPath = path.join(cwd, 'node_modules', '.bin', isWin ? `${cmd}.cmd` : cmd);
+      const localBin = isWin ? `${cmd}.cmd` : cmd;
+      const localBinPath = path.join(cwd, 'node_modules', '.bin', localBin);
       
       let command = cmd;
       let finalArgs = args;
       let useNativeSpawn = false;
 
       if (fs.existsSync(localBinPath)) {
-        command = isWin ? `node_modules\\.bin\\${cmd}.cmd` : `./node_modules/.bin/${cmd}`;
-        useNativeSpawn = isWin; // Use native spawn on Windows for local binaries to avoid cross-spawn issues
+        // 1. Priority: Local node_modules/.bin (fastest & consistent)
+        command = isWin ? `node_modules\\.bin\\${localBin}` : `./node_modules/.bin/${localBin}`;
+        useNativeSpawn = isWin; 
       } else {
-        command = isWin ? 'npx.cmd' : 'npx';
-        finalArgs = [cmd, ...args];
+        // 2. Fallback: System Path (git, npm, npx, etc)
+        // cross-spawn handles .cmd/.exe resolution automatically
+        command = cmd;
+        finalArgs = args;
+        useNativeSpawn = false;
       }
       
       console.log(`[ESAD] Resolved Command: ${command} (CWD: ${cwd})`);
 
-      // Mark as started after a short delay
       setTimeout(() => { started = true; }, 2000);
 
       const spawnFn = useNativeSpawn ? nativeSpawn : spawn;
-      const child = spawnFn(command, finalArgs, { 
+      childRef = spawnFn(command, finalArgs, { 
         stdio: 'inherit', 
         cwd, 
         shell: true
       });
 
-      // Attach child to promise for control
-      promise.child = child;
-      promise.kill = (signal) => child.kill(signal);
-
-      child.on('error', err => {
+      childRef.on('error', err => {
         if (started && err.code === 'ENOENT') {
           console.warn(`[ESAD] Warning: Late ENOENT ignored for ${cmd}.`);
           return;
         }
-
-        console.error(`[ESAD] Process Error: ${err.code} - ${err.message}`);
-        finalize(reject, new Error(`Failed to start ${cmd}: ${err.message}`));
+        finalize(reject, err);
       });
 
-      child.on('close', code => {
+      childRef.on('close', code => {
         if (code !== 0) {
           finalize(reject, new Error(`Process ${cmd} exited with code ${code}`));
         } else {
@@ -64,6 +64,9 @@ const runProcess = (cmd, args, cwd = process.cwd()) => {
       });
     });
 
+    promise.child = childRef;
+    promise.kill = (signal) => childRef && childRef.kill(signal);
+
     return promise;
   };
 

package/src/cli/utils/transformer.js

@@ -10,20 +10,19 @@ const updateDevMode = (configPath, moduleId, url) => {
 
   // 1. Ensure devMode object exists
   if (!content.includes('devMode:')) {
-    // Inject devMode before the last closing brace (naive but effective for clean configs)
-    content = content.replace(/}([^}]*)$/, `  devMode: {},\n}$1`);
+    // Inject devMode after the opening brace of export default
+    content = content.replace(/(export default\s*\{)/, `$1\n  devMode: {},\n`);
   }
 
   // 2. Add or update the module entry
   const entryRegex = new RegExp(`(['"]${moduleId}['"]|${moduleId}):\\s*['"]([^'"]*)['"]`, 'g');
   
   if (entryRegex.test(content)) {
-    // Update existing
-    content = content.replace(entryRegex, `$1: '${url}'`);
+    // Update existing entry
+    content = content.replace(entryRegex, `'${moduleId}': '${url}'`);
   } else {
-    // Insert new entry into devMode object
-    const devModeRegex = /(devMode:\s*{)/;
-    content = content.replace(devModeRegex, `$1\n    '${moduleId}': '${url}',`);
+    // Insert new entry right after devMode: {
+    content = content.replace(/(devMode:\s*\{)/, `$1\n    '${moduleId}': '${url}',`);
   }
 
   fs.writeFileSync(configPath, content);
@@ -44,9 +43,9 @@ const clearAllDevMode = (configPath) => {
   if (!fs.existsSync(configPath)) return;
   let content = fs.readFileSync(configPath, 'utf8');
 
-  // Remove the entire devMode block
-  const devModeBlockRegex = /\s*devMode:\s*{[\s\S]*?},?/g;
-  content = content.replace(devModeBlockRegex, '');
+  // Simply reset devMode to empty object
+  const devModeBlockRegex = /devMode:\s*{[\s\S]*?}/;
+  content = content.replace(devModeBlockRegex, 'devMode: {}');
 
   fs.writeFileSync(configPath, content);
 };