@fto-consult/expo-ui 6.19.4 → 6.19.5

package/bin/create-app.js

@@ -1,13 +1,14 @@
 const {exec,thowError,copy,writeFile,createDirSync} = require("./utils");
 const fs = require("fs"), path = require("path");
 const createAppDir = path.resolve(__dirname,"create-app");
+const argv = process.argv[2];
 module.exports = function(parsedArgs,{projectRoot}){
     const packageObj = require("../package.json");
     let root = process.cwd(), mainPackagePath = path.resolve(root,"package.json");
     let mainPackage = fs.existsSync(mainPackagePath) && require(`${mainPackagePath}`) || null;
     const name = String(parsedArgs.name||parsedArgs.appName || mainPackage?.name).trim();
     if(!name){
-        return thowError(name," nom de l'application invalide, veuillez spécifier un nom d'application valide");
+        return thowError(name," nom de l'application invalide, veuillez spécifier un nom d'application valide",argv);
     }
     let hasPackage = !!mainPackage && typeof mainPackage =='object';
     if(!hasPackage){

package/bin/index.js

@@ -20,9 +20,6 @@ const path= require("path");
 const fs = require("fs");
 const dir = path.resolve(__dirname);
 const projectRoot = path.resolve(process.cwd());
-if(projectRoot == dir){
-   throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
-}
 const parsedArgs = require("../electron/utils/parseArgs")(null,supportedScript);
 parsedArgs.script = typeof parsedArgs.script =='string' && parsedArgs.script && parsedArgs.script.toLowerCase().trim() || "";
 if(!parsedArgs.script || !(parsedArgs.script in supportedScript)){
@@ -38,6 +35,9 @@ const script = parsedArgs.script;
  *        url = [url-to-start-electron-to]
  * */
 if(parsedArgs.electron){
+  if(projectRoot == dir){
+      throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
+  }
   const pathsJSON = path.resolve(electronDir,"paths.json");
   if(!fs.existsSync(pathsJSON)){
     throwError("Le fichier des chemins d'accès à l'application est innexistant, rassurez vous de tester l'application en environnement web, via la cmde <npx expo start>, avant l'exécution du script electron.");

package/electron/utils/exec.js

@@ -1,12 +1,22 @@
-const exec = require('child_process').exec;
+const {exec,execSync} = require('child_process');
 const fs = require("fs");
-const _exec = (cmd,cmdOpts,logMessages)=>{
+const _exec = (cmd,cmdOpts,logMessages,sync)=>{
     cmdOpts = typeof cmdOpts =='object' && cmdOpts || {};
     cmdOpts.env = typeof cmdOpts.env =="object" && cmdOpts.env || {};
     cmdOpts.env = {...process.env,...cmdOpts.env};
     cmdOpts.env.platform = cmdOpts.env.platform || "electron";
+    cmdOpts.stdio = cmdOpts.stdio || "inherit";
+    const timer = cmdOpts.loader !==false ? loaderTimer(cmd) : null;
+    if(sync){
+        try {
+            return execSync(cmd,cmdOpts);
+        } catch(e){
+            clearInterval(timer);
+            throw e;
+        }
+        return null;
+    }
     return new Promise((resolve,reject)=>{
-        const timer = cmdOpts.loader !==false ? loaderTimer(cmd) : null;
         exec(cmd,cmdOpts, (error, stdout, stderr) => {
             if (error) {
                 logMessages !== false && console.log(`error: ${error.message}`);;
@@ -38,7 +48,8 @@ const loaderTimer = function(timout) {
       x &= 3;
     }, timout);
   };
-module.exports = function(cmdOpts,options){
+  
+const runExec = function(cmdOpts,options,sync){
     if(typeof cmdOpts =='string'){
         cmdOpts = {cmd:cmdOpts};
     }
@@ -57,5 +68,12 @@ module.exports = function(cmdOpts,options){
             return _exec(cmd,cmdOpts,logMessages);
         })
     }
-    return _exec(cmd,cmdOpts,logMessages);
-}
+    return _exec(cmd,cmdOpts,logMessages,sync);
+}
+module.exports = function(cmdOpts,options){
+    return runExec(cmdOpts,options,false);
+}
+
+module.exports.execSync = module.exports.sync = function(cmdOpts,options){
+    return runExec(cmdOpts,options,true);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.19.4",
+  "version": "6.19.5",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {