@fto-consult/expo-ui 6.20.8 → 6.20.10

package/bin/create-app.js

@@ -1,24 +1,29 @@
 const {exec,thowError,copy,writeFile,createDirSync} = require("./utils");
 const fs = require("fs"), path = require("path");
 const createAppDir = path.resolve(__dirname,"create-app");
-module.exports = function(parsedArgs,{projectRoot}){
+module.exports = function(parsedArgs){
     const argvName = process.argv[3];
     const packageObj = require("../package.json");
-    let root = process.cwd(), mainPackagePath = path.resolve(root,"package.json");
-    let mainPackage = fs.existsSync(mainPackagePath) && require(`${mainPackagePath}`) || null;
+    const root = process.cwd();
+    let mainPackage = fs.existsSync(path.resolve(root,"package.json")) && require(`${path.resolve(root,"package.json")}`) || null;
     const name = argvName && argvName.trim() || mainPackage?.name && typeof mainPackage?.name=="string" && mainPackage.name.trim() || "";
     if(!name){
         return thowError(name," nom de l'application invalide, veuillez spécifier un nom d'application valide",argvName,process.argv);
     }
     const devDependencies = packageObj.devDependencies;
-    let hasPackage = String(mainPackage?.name)?.toLowerCase() !== name?.toLowerCase() ? false : mainPackage && typeof mainPackage =='object';
+    const inSameFolder = typeof mainPackage?.name =="string" && mainPackage?.name.trim().toLowerCase() === name?.toLowerCase().trim();
+    const projectRoot = path.join(`${root}/${inSameFolder && name || ""}`);
+    createDirSync(projectRoot);
+    const mainPackagePath = path.join(projectRoot,"package.json");
+    mainPackage = fs.existsSync(mainPackagePath) && require(`${mainPackagePath}`) || null;
+    let hasPackage = !!mainPackage;
     const devDeps = {
       ...defaultDevDependencies,
       ...(devDependencies && typeof devDependencies ==='object'? devDependencies : {}),
     };
     const euModule = "@fto-consult/expo-ui";
     let hasUpdateDeps = false;
-    if(!hasPackage || !mainPackage){
+    if(!hasPackage){
         mainPackage = {
           name,
           version : "1.0.0",
@@ -45,12 +50,8 @@ module.exports = function(parsedArgs,{projectRoot}){
           hasUpdateDeps = true;
           mainPackage.dependencies[euModule] = "latest";
       }
-      const pRoot = path.resolve(root,name.trim());
-      const newDir = createDirSync(pRoot); 
-      projectRoot = newDir || fs.existsSync(pRoot) & pRoot || projectRoot;
-      mainPackagePath = path.resolve(projectRoot,"package.json");
     }
-    if(hasUpdateDeps || !hasPackage){
+    if(hasUpdateDeps || !hasPackage || !fs.existsSync(mainPackagePath)){
         writeFile(mainPackagePath,JSON.stringify(mainPackage,null,2),{overwrite:true});
     }
     console.log("creating application .....");
@@ -64,11 +65,10 @@ module.exports = function(parsedArgs,{projectRoot}){
     createAPPJSONFile(projectRoot,{...mainPackage,name});
     copy(path.resolve(createAppDir,"src"),path.resolve(projectRoot,"src"),{recursive:true,overwrite:false});
     console.log("intalling dependencies ...");
-    try {
-      exec.sync(`npm install`,{projectRoot})
-    } finally{
-        process.exit();
-    }
+    return exec(`npm install`,{projectRoot}).finally(()=>{
+      console.log("application ready");
+      process.exit();
+    });
 }
 const defaultDevDependencies = {
  "@expo/webpack-config":"latest", 

package/package.json

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