@fto-consult/expo-ui 6.19.3 → 6.19.4

package/bin/create-app.js

@@ -9,19 +9,28 @@ module.exports = function(parsedArgs,{projectRoot}){
     if(!name){
         return thowError(name," nom de l'application invalide, veuillez spécifier un nom d'application valide");
     }
-    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 +45,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

@@ -20,6 +20,9 @@ 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)){
@@ -35,9 +38,6 @@ 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/package.json

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