create-fleetbo-project 1.2.26 → 1.2.28

package/install-react-template.js

@@ -22,18 +22,42 @@ const axios = require('axios');
 const dotenv = require('dotenv');
 const os = require('os');
 
+const args               = process.argv.slice(2);
+const command            = args[0];
+const GENERATOR_COMMANDS = ['page', 'g', 'generate'];
+if (GENERATOR_COMMANDS.includes(command)) {
+    try {
+        require('./page.js');
+    } catch (error) {
+        console.error('\\x1b[31m%s\\x1b[0m', ' CRITICAL ERROR in Fleetbo Generator:');  
+        if (error.code === 'MODULE_NOT_FOUND') {
+             console.error(".   The generator script (scripts/page.js) is missing.");
+             console.error("    Please update your Fleetbo SDK.");
+        } else {
+             console.error(error.message);
+        }
+        process.exit(1);
+    }
+    return; 
+}
+
 const UPDATE_NETWORK_URL = 'https://us-central1-myapp-259bf.cloudfunctions.net/updateDeveloperNetwork';
 const PORT = 3000;
 
-// Gestion des processus système (Mac/Linux)
+// Définir la redirection nulle selon l'OS
+const NULL_DEV = process.platform === 'win32' ? '>nul 2>&1' : '2>/dev/null';
+
+// Gestion des processus système (Mac/Linux/Windows)
 function killProcessOnPort(port) {
     try {
         if (process.platform !== 'win32') {
-            const pid = execSync(\`lsof -ti:\${port} 2>/dev/null\`).toString().trim();
+            const pid = execSync(\`lsof -ti:\${port} \${NULL_DEV}\`).toString().trim();
             if (pid) {
-                execSync(\`kill -9 \${pid.split('\\n').join(' ')} 2>/dev/null\`);
+                execSync(\`kill -9 \${pid.split('\\n').join(' ')} \${NULL_DEV}\`);
             }
         }
+        // Pas de kill port spécifique Windows ici car géré par le kill global souvent, 
+        // ou nécessiterait netstat complexe. On laisse faire pour l'instant.
     } catch (e) {}
 }
 
@@ -41,7 +65,7 @@ function killProcessOnPort(port) {
 function killNetworkService() {
     try {
         const cmd = process.platform === 'win32' ? 'taskkill /IM cloudflared.exe /F' : 'pkill cloudflared';
-        execSync(cmd + ' 2>/dev/null');
+        execSync(cmd + ' ' + NULL_DEV); // Utilisation de la variable adaptée
     } catch (e) {}
 }
 
@@ -98,6 +122,7 @@ async function runDevEnvironment() {
     
     const devServer = spawn(npmCmd, ['start'], {
         stdio: ['ignore', 'pipe', 'pipe'],
+        shell: true,
         env: { ...process.env, BROWSER: 'none', PORT: PORT.toString() }
     });
 
@@ -233,15 +258,22 @@ async function setupProject() {
     console.log('   [4/6]  ⚙️  Configuring environment & CLI...');
     
     const envContent = `REACT_APP_FLEETBO_DB_KEY=${keys.fleetboDBKey}
-REACT_APP_ENTERPRISE_ID=${keys.enterpriseId}
-REACT_KEY_APP=${projectName}
-REACT_APP_TESTER_EMAIL=${userEmailArg}
-DANGEROUSLY_DISABLE_HOST_CHECK=true
-WDS_SOCKET_PORT=0
-`;
+            REACT_APP_ENTERPRISE_ID=${keys.enterpriseId}
+            REACT_KEY_APP=${projectName}
+            REACT_APP_TESTER_EMAIL=${userEmailArg}
+            DANGEROUSLY_DISABLE_HOST_CHECK=true
+            WDS_SOCKET_PORT=0
+            `;
     
     fs.writeFileSync(path.join(projectDir, '.env'), envContent, 'utf8');
-    fs.writeFileSync(path.join(projectDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
+    // On s'assure que le dossier scripts existe (normalement oui via le tar.gz, mais sécurité d'abord)
+    const scriptsDir = path.join(projectDir, 'scripts');
+    if (!fs.existsSync(scriptsDir)) {
+        fs.mkdirSync(scriptsDir, { recursive: true });
+    }
+    fs.writeFileSync(path.join(scriptsDir, 'cli.js'), CLI_SCRIPT_CONTENT, 'utf8');
+    // On rend le script exécutable (Optionnel mais propre sur Mac/Linux)
+    try { fs.chmodSync(path.join(scriptsDir, 'cli.js'), '755'); } catch (e) {}
 
     console.log('   [5/6]  📚 Installing dependencies...');
     execSync('npm install', { stdio: 'inherit' }); 
@@ -253,7 +285,7 @@ WDS_SOCKET_PORT=0
     const packageJsonPath = path.join(projectDir, 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
     packageJson.name = projectName;
-    packageJson.scripts = { ...packageJson.scripts, "fleetbo": "node cli.js", "dev": "node cli.js" };
+    packageJson.scripts = { ...packageJson.scripts, "fleetbo": "node scripts/cli.js", "dev": "node scripts/cli.js" };
     fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
 
     console.log('\n [Fleetbo] ✅ Project successfully created!');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fleetbo-project",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "description": "Creates a new Fleetbo project.",
   "main": "install-react-template.js",
   "bin": {