@fto-consult/expo-ui 6.18.38 → 6.19.0

package/babel.config.js

@@ -8,10 +8,9 @@ module.exports = function(api,opts) {
   //console.log(environmentPath," is envvv ",opts);
   const path = require("path");
   const fs = require("fs");
-  const dir = path.resolve(__dirname);
   typeof api.cache =='function' && api.cache(true);
   const inlineDovOptions = { unsafe: true};
-  const options = {base:dir,...opts,platform:"expo"};
+  const options = {...opts,platform:"expo"};
   const environmentPath = require("./copy-env-file")();
   if(fs.existsSync(environmentPath)){
     inlineDovOptions.path ='./.env';

package/bin/create-app/registerApp.js

@@ -1,11 +1,13 @@
 import registerApp from "$expo-ui-root-path"; 
 import screens from "./src/screens";
+import drawerItems from "./src/navigation/drawerItems";
+
 registerApp({
     /**** application navigation */
     navigation : {
         //all application screeens
         screens,
-        drawerItems : [], //application main drawer items
+        drawerItems, //application main drawer items
     },
     /**application components */
     components : {
@@ -24,14 +26,11 @@ registerApp({
     /**
      * //when main application component is mounted
      */
-    onMount : function(){ 
-    },
+    onMount : function(){},
     /****when main application component is unmounted*/
-    onUnmount : function(){ 
-    },
+    onUnmount : function(){},
     /**** called any time main application's component is rendered */
-    onRender : function(){
-    },
+    onRender : function(){},
     /*** if you need to wrap main application content with some custom react Provider */
     render : ({children})=>{
         return children;

package/bin/create-app/src/navigation/drawerItems.js

@@ -0,0 +1,8 @@
+
+export default {
+    dashboard : {
+        label : "Dashboard",
+        routeName : "Home",
+        icon : "home",
+    }
+}

package/bin/create-app.js

@@ -4,36 +4,49 @@ const createAppDir = path.resolve(__dirname,"create-app");
 module.exports = function(parsedArgs,{projectRoot}){
     const packageObj = require("../package.json");
     const root = process.cwd(), mainPackagePath = path.resolve(root,"package.json");
-    const mainPackage = fs.existsSync(mainPackagePath) && require(`${mainPackagePath}`) || null;
-    if(!mainPackage || !mainPackage.name){
-        thowError("Nom de l'application invalide. Rassurez vous d'exécuter l'application dans un répertoire valide."," package : ",mainPackage);
-        return;
-    }
-    const name = String(parsedArgs.name||mainPackage.name).trim();
+    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");
     }
-    const devDpendencies = packageObj.devDependencies;
-    const deps = devDpendencies && typeof devDpendencies =="object" && Object.keys(devDpendencies).join(" ");
-    new Promise((resolve,reject)=>{
-        if(typeof deps =="string" && deps){
-            console.log("installing dev dependencies ....");
-            return exec(`npm i -D ${deps}`).then(resolve).catch(reject);
-        }
-        return resolve({});
-    }).then(()=>{}).finally(()=>{
-        console.log("creating application .....");
-        createEntryFile(projectRoot);
-        [path.join(projectRoot,"babel.config.js"),path.join(projectRoot,"metro.config.js"),path.join(projectRoot,"webpack.config.js")].map((p)=>{
-            if(!fs.existsSync(p)){
-                const file = path.basename(p);
-                writeFile(p,fs.readFileSync(`${path.join(createAppDir,file)}`));
-            }
+    const cb = (pkg,)=>{
+      mainPackage = pkg && typeof pkg =='object' && pkg || mainPackage;
+      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);
+        }).then(()=>{}).finally(()=>{
+            console.log("creating application .....");
+            createEntryFile(projectRoot);
+            [path.join(projectRoot,"babel.config.js"),path.join(projectRoot,"metro.config.js"),path.join(projectRoot,"webpack.config.js")].map((p)=>{
+                if(!fs.existsSync(p)){
+                    const file = path.basename(p);
+                    writeFile(p,fs.readFileSync(`${path.join(createAppDir,file)}`));
+                }
+            });
+            createAPPJSONFile(projectRoot,{...mainPackage,name});
+            copy(path.resolve(createAppDir,"src"),path.resolve(projectRoot,"src"),{recursive:true,overwrite:false});
+            process.exit();
         });
-        createAPPJSONFile(projectRoot,{...mainPackage,name});
-        copy(path.resolve(createAppDir,"src"),path.resolve(projectRoot,"src"),{recursive:true,overwrite:false});
-        process.exit();
-    });
+    }
+    if(!mainPackage){
+       mainPackage = {
+          name,
+          version : "1.0.0",
+          "description": "",
+          "main": "index.js",
+          scripts : {
+            start : "npx expo start -c",
+          }
+       }
+       writeFile(mainPackagePath,JSON.stringify(mainPackage,null,2));
+       exec("npm i @fto-consult/expo-ui").finally(()=>{
+          return cb(mainPackage);
+       });
+    }  else {
+        return cb();
+    }
 }
 
 const createEntryFile = (projectRoot)=>{

package/bin/index.js

@@ -148,7 +148,7 @@ if(parsedArgs.electron){
     process.exit();
   });
 } else {
-  if(script ===createAppScript){
+  if(script ===createAppScript || script ==="init"){
     return require("./create-app")(parsedArgs,{projectRoot});
   }
   process.exit();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.18.38",
+  "version": "6.19.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -41,7 +41,7 @@
     "fix-dependencies": "expo-cli doctor --fix-dependencies",
     "delete-node-modules": "rimraf ./**/node_modules",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
-    "update": "npm i expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-safe-area-context@latest react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-native-screens@latest react-virtuoso@latest sharp-cli@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
+    "update": "npm i expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-safe-area-context@latest react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-native-screens@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
   },
   "bin": {
     "expo-ui": "./bin/index.js"
@@ -115,8 +115,7 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@expo/metro-config": "^0.10.6",
-    "@expo/webpack-config": "^18.1.2",
+    "@expo/metro-config": "latest",
     "babel-plugin-inline-dotenv": "^1.7.0",
     "babel-plugin-module-resolver": "^5.0.0"
   }