fleetbo-cockpit-cli 1.0.181 → 1.0.184

package/cli.js

@@ -120,49 +120,62 @@ const checkGitSecurity = () => {
 };
 
 const injectRouteIntoAppJs = (moduleName, subPath = '') => {
-    const appJsPath = fs.existsSync(path.join(process.cwd(), 'src', 'App.jsx'))
-    ? path.join(process.cwd(), 'src', 'App.jsx')
-    : path.join(process.cwd(), 'src', 'App.jsx');
-    if (!fs.existsSync(appJsPath)) {
-        console.error(`   \x1b[31m[Safety Stop]\x1b[0m App.jsx missing.`);
+    // 🔍 DÉTERMINATION DU FICHIER CIBLE SELON LE FRAMEWORK
+    const targetFile = JS_FRAMEWORK === 'vue'
+        ? path.join(process.cwd(), 'src', 'router.js')  // Cible Vue
+        : path.join(process.cwd(), 'src', 'App.jsx');    // Cible React
+
+    if (!fs.existsSync(targetFile)) {
+        console.error(`   \x1b[31m[Safety Stop]\x1b[0m ${path.basename(targetFile)} missing.`);
         return false;
     }
 
-    let content = fs.readFileSync(appJsPath, 'utf8');
+    let content = fs.readFileSync(targetFile, 'utf8');
     const importAnchor = '// FLEETBO_MORE_IMPORTS';
-    const routeAnchor = '{/* FLEETBO_DYNAMIC ROUTES */}';
+    const routeAnchor = JS_FRAMEWORK === 'vue'
+        ? '/* FLEETBO_DYNAMIC ROUTES */'
+        : '{/* FLEETBO_DYNAMIC ROUTES */}';
 
     if (!content.includes(importAnchor) || !content.includes(routeAnchor)) {
-        console.log(`   \x1b[33m[Skipped]\x1b[0m Anchors missing in App.jsx. Manual injection required.`);
+        console.log(`   \x1b[33m[Skipped]\x1b[0m Anchors missing in ${path.basename(targetFile)}. Manual injection required.`);
         return false;
     }
 
     const cleanSubPath = subPath ? `${subPath}/` : '';
-    const importLine = `import ${moduleName} from './app/${cleanSubPath}${moduleName}';`;
-    const routeLine = `<Route path="/${cleanSubPath}${moduleName.toLowerCase()}" element={<${moduleName} />} />`;
+    let importLine, routeLine;
+
+    if (JS_FRAMEWORK === 'vue') {
+        // 🟢 SYNTAXE VUE
+        importLine = `import ${moduleName} from './app/${cleanSubPath}${moduleName}.vue';`;
+        routeLine = `{ path: '/${cleanSubPath}${moduleName.toLowerCase()}', component: ${moduleName} },`;
+    } else {
+        // 🔵 SYNTAXE REACT
+        importLine = `import ${moduleName} from './app/${cleanSubPath}${moduleName}';`;
+        routeLine = `<Route path="/${cleanSubPath}${moduleName.toLowerCase()}" element={<${moduleName} />} />`;
+    }
 
     let modified = false;
 
     // 1. Injection de l'import (Capture l'indentation d'origine)
     if (!content.includes(importLine)) {
-        const importMatch = content.match(new RegExp(`(\\n[ \\t]*)${importAnchor.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`));
+        const importMatch = content.match(new RegExp(`(\\n[ \\t]*)${importAnchor.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&')}`));
         const importIndent = importMatch ? importMatch[1] : '\n';
         content = content.replace(importAnchor, `${importLine}${importIndent}${importAnchor}`);
         modified = true;
     }
-    
-    // 2. Injection de la route (Capture l'indentation d'origine, fini les espaces en dur !)
+
+    // 2. Injection de la route (Capture l'indentation d'origine)
     if (!content.includes(routeLine)) {
-        const routeMatch = content.match(new RegExp(`(\\n[ \\t]*)${routeAnchor.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`));
+        const routeMatch = content.match(new RegExp(`(\\n[ \\t]*)${routeAnchor.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&')}`));
         const routeIndent = routeMatch ? routeMatch[1] : '\n';
         content = content.replace(routeAnchor, `${routeLine}${routeIndent}${routeAnchor}`);
         modified = true;
     }
-    
+
     if (modified) {
-        fs.writeFileSync(appJsPath, content);
+        fs.writeFileSync(targetFile, content);
     }
-    
+
     return modified;
 };
 
@@ -231,34 +244,39 @@ const getModuleCache = async ({ projectId, moduleName }) => {
 };
 
 const removeRouteFromAppJs = (moduleName) => {
-    const appJsPath = fs.existsSync(path.join(process.cwd(), 'src', 'App.jsx'))
-    ? path.join(process.cwd(), 'src', 'App.jsx')
-    : path.join(process.cwd(), 'src', 'App.jsx');
-    if (!fs.existsSync(appJsPath)) return false;
+    const targetFile = JS_FRAMEWORK === 'vue'
+        ? path.join(process.cwd(), 'src', 'router.js')
+        : path.join(process.cwd(), 'src', 'App.jsx');
+    if (!fs.existsSync(targetFile)) return false;
 
-    let content = fs.readFileSync(appJsPath, 'utf8');
-    
-    const importLine = `import ${moduleName} from './app/mocks/${moduleName}';`;
-    const routeLine = `<Route path="/mocks/${moduleName.toLowerCase()}" element={<${moduleName} />} />`;
+    let content = fs.readFileSync(targetFile, 'utf8');
+
+    let importLine, routeLine;
+    if (JS_FRAMEWORK === 'vue') {
+        importLine = `import ${moduleName} from './app/mocks/${moduleName}.vue';`;
+        routeLine = `{ path: '/mocks/${moduleName.toLowerCase()}', component: ${moduleName} },`;
+    } else {
+        importLine = `import ${moduleName} from './app/mocks/${moduleName}';`;
+        routeLine = `<Route path="/mocks/${moduleName.toLowerCase()}" element={<${moduleName} />} />`;
+    }
 
     const originalContent = content;
-    
-    // On supprime l'import ET le saut de ligne qui le suit
+
     const importRegex = new RegExp(`${importLine.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g');
     content = content.replace(importRegex, '');
 
-    // On supprime la route ET tous les espaces/sauts de ligne qui la PRÉCÈDENT
     const routeRegex = new RegExp(`\\n?\\s*${routeLine.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`, 'g');
     content = content.replace(routeRegex, '');
 
     if (content !== originalContent) {
-        fs.writeFileSync(appJsPath, content);
-        console.log(`   \x1b[32m[Unrouted]\x1b[0m ${moduleName} removed from App.jsx.`);
+        fs.writeFileSync(targetFile, content);
+        console.log(`   \x1b[32m[Unrouted]\x1b[0m ${moduleName} removed from ${path.basename(targetFile)}.`);
         return true;
     }
     return false;
 };
 
+
 // ============================================
 // COMMAND: alex
 // ============================================
@@ -968,11 +986,11 @@ else if (command === 'android' || command === 'ios') {
             console.error(`\x1b[31m  Error:\x1b[0m ${error.message}`);
             
             if (error.message.includes('Limit') || error.message.includes('Quota')) {
-                console.log(`\n\x1b[33m  💡 Tip:\x1b[0m Upgrade to Senior Pilot for more builds.`);
+                console.log(`\n\x1b[33m   Tip:\x1b[0m Upgrade to Senior Pilot for more builds.`);
             } else if (error.message.includes('No native module')) {
-                console.log(`\n\x1b[33m  💡 Tip:\x1b[0m Run "npm run fleetbo alex" to create native modules first.`);
+                console.log(`\n\x1b[33m   Tip:\x1b[0m Run "npm run fleetbo alex" to create native modules first.`);
             } else if (error.message.includes('Trial Period Ended')) {
-                console.log(`\n\x1b[33m  💡 Tip:\x1b[0m Your free sprint is over. Upgrade to Senior Pilot on fleetbo.io.`);
+                console.log(`\n\x1b[33m   Tip:\x1b[0m Your free sprint is over. Upgrade to Senior Pilot on fleetbo.io.`);
             }
             console.log('');
             process.exit(1); 
@@ -1056,8 +1074,8 @@ else {
             await axios.post(UPDATE_NETWORK_URL, { keyApp, networkUrl, tester: testerEmail });
             console.log('\n\x1b[32mEngine started successfully\x1b[0m');
             console.log(`\n\x1b[32mFleetbo OS ❯\x1b[0m -------------------------------------------------------------`);
-            console.log('\x1b[32mFleetbo OS ❯\x1b[0m \x1b[1mGO GO GO ! OS IS READY\x1b[0m');
-            console.log('\x1b[32mFleetbo OS ❯\x1b[0m You can now start coding and previewing. 🚀');
+            console.log(`\x1b[32mFleetbo OS ❯\x1b[0m \x1b[1mGO ! ${projectName} running in OS\x1b[0m`);
+            console.log('\x1b[32mFleetbo OS ❯\x1b[0m You can now start coding and previewing.');
             console.log(`\x1b[32mFleetbo OS ❯\x1b[0m -------------------------------------------------------------`);
             console.log(`\n\x1b[34mPilot Instruction ❯\x1b[0m Return to the Workspace. The Engine is ready for your orders.\n`);
         } catch (err) {
@@ -1066,7 +1084,7 @@ else {
     }
     
     async function runDevEnvironment() {
-        console.log(`[Fleetbo] 🛡️  Initializing Universal Dev Environment...`);
+        console.log(`[Fleetbo]   Initializing Universal Dev Environment...`);
         
         killNetworkService();
         killProcessOnPort(PORT); // On tue le 3000 par précaution, au cas où
@@ -1096,7 +1114,7 @@ else {
         devServer.stdout.on('data', (data) => {
             const output = data.toString();
             
-            // 🛡️ FILTRE ANTI-PLOMBERIE FLEETBO
+            //  FILTRE ANTI-PLOMBERIE FLEETBO
             const lines = output.split('\n');
             const forbiddenTerms = [
                 'Attempting to bind to HOST', 'If this was unintentional', 'Learn more here:',
@@ -1113,10 +1131,10 @@ else {
                 process.stdout.write(filteredOutput + '\n');
             }
             
-            // 🚀 MAGIE 1 : DÉTECTION DU PORT RÉEL (Vite/Vue ou React)
-            // Cherche un pattern comme http://localhost:5173 ou http://127.0.0.1:3000
-            // ✅ LA SOLUTION : On déclenche UNIQUEMENT quand on a trouvé le port !
-            // 🌐 CAPTURE AGNOSTIQUE DU PORT (S'adapte dynamiquement à Vite)
+            //  MAGIE 1 : DÉTECTION DU PORT RÉEL (Vite/Vue ou React)
+            //  Cherche un pattern comme http://localhost:5173 ou http://127.0.0.1:3000
+            //  LA SOLUTION : On déclenche UNIQUEMENT quand on a trouvé le port !
+            //  CAPTURE AGNOSTIQUE DU PORT (S'adapte dynamiquement à Vite)
             const portMatch = output.match(/http:\/\/(?:localhost|127\.0\.0\.1):(\d+)/);
 
             if (portMatch) {
@@ -1141,10 +1159,10 @@ else {
                     const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
 
                     if (attempt > 0) {
-                        console.log(`\x1b[33m[Fleetbo] 🔄 Uplink reconnection ${attempt}/${MAX_UPLINK_RETRIES - 1}...\x1b[0m`);
+                        console.log(`\x1b[33m[Fleetbo]  Uplink reconnection ${attempt}/${MAX_UPLINK_RETRIES - 1}...\x1b[0m`);
                     }
 
-                    // ✅ LE TUNNEL CLOUDFLARE UTILISE LE PORT DÉTECTÉ DYNAMIQUEMENT !
+                    // LE TUNNEL CLOUDFLARE UTILISE LE PORT DÉTECTÉ DYNAMIQUEMENT !
                     const uplinkCommand = `${npxCmd} -y cloudflared tunnel --url http://127.0.0.1:${detectedPort} --http-host-header 127.0.0.1:${detectedPort}`;
                     uplinkProcess = spawn(uplinkCommand, { shell: true });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetbo-cockpit-cli",
-  "version": "1.0.181",
+  "version": "1.0.184",
   "description": "Fleetbo CLI - Build native mobile apps with React",
   "author": "Fleetbo",
   "license": "MIT",