@fto-consult/expo-ui 6.19.3 → 6.19.5

package/bin/create-app.js

@@ -1,27 +1,37 @@
 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);
     }
-    if(!mainPackage){
+    let hasPackage = !!mainPackage && typeof mainPackage =='object';
+    if(!hasPackage){
+      mainPackage = {
+        name,
+        version : "1.0.0",
+        "description": "",
+        "main": "index.js",
+        scripts : {
+          start : "npx expo start -c",
+        }
+     }
       const newDir = createDirSync(path.resolve(root,name.trim())); 
       projectRoot = newDir || projectRoot;
       mainPackagePath = path.resolve(projectRoot,"package.json");
       console.log(projectRoot," is new project root ",mainPackage);
     }
-    const cb = (pkg,)=>{
-      mainPackage = pkg && typeof pkg =='object' && pkg || mainPackage;
+    const cb = ()=>{
       const devDpendencies = packageObj.devDependencies;
         const deps = devDpendencies && typeof devDpendencies =="object" && Object.keys(devDpendencies).join(" ") || "";
           new Promise((resolve,reject)=>{
           console.log("installing dev dependencies ....");
-          return exec(`npm i -D @expo/webpack-config @expo/metro-config ${typeof deps=="string" && deps||""}`).then(resolve).catch(reject);
+          return exec(`npm i -D @expo/webpack-config @expo/metro-config ${typeof deps=="string" && deps||""}`,{projectRoot}).then(resolve).catch(reject);
         }).then(()=>{}).finally(()=>{
             console.log("creating application .....");
             createEntryFile(projectRoot);
@@ -36,20 +46,9 @@ module.exports = function(parsedArgs,{projectRoot}){
             process.exit();
         });
     }
-    if(!mainPackage){
-       mainPackage = {
-          name,
-          version : "1.0.0",
-          "description": "",
-          "main": "index.js",
-          scripts : {
-            start : "npx expo start -c",
-          }
-       }
+    if(!hasPackage){
        writeFile(mainPackagePath,JSON.stringify(mainPackage,null,2));
-       exec("npm i @fto-consult/expo-ui").finally(()=>{
-          return cb(mainPackage);
-       });
+       exec("npm i @fto-consult/expo-ui",{projectRoot}).finally(cb);
     }  else {
         return cb();
     }

package/bin/index.js

@@ -36,7 +36,7 @@ const script = parsedArgs.script;
  * */
 if(parsedArgs.electron){
   if(projectRoot == dir){
-    throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
+      throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
   }
   const pathsJSON = path.resolve(electronDir,"paths.json");
   if(!fs.existsSync(pathsJSON)){

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.3",
+  "version": "6.19.5",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {