@fto-consult/expo-ui 4.1.0 → 4.2.1

package/electron/preload.js

@@ -1,5 +1,5 @@
-const createDir = require("./createDir");
-const postMessage = require("./postMessage");
+const createDir = require("./utils/createDir");
+const postMessage = require("./utils/postMessage");
 const { contextBridge, ipcRenderer, shell } = require('electron')
 const appInstance = require("./app/instance");
 const path = require("path");
@@ -7,7 +7,7 @@ const fs = require("fs");
 const isObj = x=>x && typeof x =='object' && !Array.isArray(x);
 const isNonNullString = x=>x && typeof x =='string';
 const ePath = path.resolve(__dirname);
-const packagePath = path.resolve(ePath,"package.app.json");
+const packagePath = path.resolve(ePath,"package.json");
 if(!fs.existsSync(packagePath)){
     throw {message : "Chemin du fichier "+packagePath+ " introuvable"};
 }
@@ -40,7 +40,7 @@ if(typeof separator != 'string' || !separator){
         return filePath.substring(0, sepIndex+1);
     })();
 }
-const Config = require('./config');
+const Config = require('./utils/config');
 let confPath = process.env.ProgramData || process.env.ALLUSERSPROFILE;
 if(confPath && typeof confPath =="string"){
     if(fs.existsSync(confPath)){

package/electron/{exec.js → utils/exec.js}

@@ -31,7 +31,7 @@ const loaderTimer = function(timout) {
     var P = ["\\", "|", "/", "-"];
     var x = 0;
     return setInterval(function() {
-      process.stdout.write("\r "+text+P[x++]);
+      process.stdout.write("\r "+text+" "+P[x++]);
       x &= 3;
     }, timout);
   };
@@ -47,7 +47,10 @@ module.exports = function(cmdOpts,options){
         return Promise.reject("Commande de script invalide, veuillez spécifier une chaine de caractère non nulle");
     }
     if(typeof projectRoot =='string' && projectRoot && fs.existsSync(projectRoot)){
-        return _exec('cd '+projectRoot).then((r)=>{
+        return _exec(`cd ${projectRoot}`).then((r)=>{
+            try {
+                process.chdir(projectRoot);
+            } catch(e){}
             return _exec(cmd,cmdOpts,logMessages);
         })
     }

package/electron/utils/getIcon.js

@@ -0,0 +1,25 @@
+const isWindow = process.platform =="win32",
+isMac = process.platform =='darwin',
+isLinux = process.platform =="linux";
+const fs = require("fs");
+const getDirname = require("./getDirname");
+const path = require("path");
+const getIcon = (p)=>{
+  if(Array.isArray(p)){
+     for(let i in p){
+       const r = getIcon(p[i]);
+       if(r) return r;
+     }
+  } else if(typeof p =='string' && p && fs.existsSync(p)){
+    const ext = isWindow ? ".ico" : isMac ? ".incs" : ".png";
+    const possibles =  ["icon","logo","favicon"];
+    for(let i in possibles){
+      const ico = path.join(getDirname(p),possibles[i]+ext);
+      if(fs.existsSync(ico)){
+         return ico;
+      }
+    }
+  }
+  return undefined;
+};
+module.exports = getIcon;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "4.1.0",
+  "version": "4.2.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^2.18.0",
+    "@fto-consult/common": "^2.19.0",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",
@@ -69,7 +69,6 @@
     "@react-navigation/native": "^6.1.1",
     "@react-navigation/native-stack": "^6.9.7",
     "@shopify/flash-list": "1.3.1",
-    "conf": "^10.2.0",
     "expo": "^47.0.8",
     "expo-camera": "~13.1.0",
     "expo-clipboard": "~4.0.1",
@@ -85,8 +84,6 @@
     "google-libphonenumber": "^3.2.31",
     "htmlparser2-without-node-native": "^3.9.2",
     "mongo-parse": "^2.1.0",
-    "node-machine-id": "^1.1.12",
-    "parent-package-json": "^2.0.1",
     "prop-types": "^15.8.1",
     "react": "18.1.0",
     "react-apexcharts": "^1.4.0",
@@ -119,7 +116,6 @@
     "@expo/webpack-config": "^0.17.3",
     "babel-plugin-inline-dotenv": "^1.7.0",
     "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
-    "electron": "^22.2.0"
+    "babel-plugin-transform-inline-environment-variables": "^0.4.4"
   }
 }

package/readMe.md

@@ -10,11 +10,16 @@ npm i --D @babel/plugin-proposal-export-namespace-from @babel/preset-react babel
 
 ### **Commandes electron : expo-ui electron cli**
 
-### `expo-ui [build|start] [compile] [build] [url=local-url] [platform=[window|linux|mac]] [arch=x64|x86]`
+### `expo-ui [build|start] [compile] [build] [url=local-url] [platform=[win32|darwin|linux|mas]] [arch=x64|x86] [out=outpout dir]`
 
-1.  \[build|start\], le script à exécuter : build|start
+1.  \[build|start|package\], le script à exécuter : build|start
 2.  \[compile\], si l'application sera compilé, via la commande expo export:web; valide lorsque aucune url n'est spécifiée
 3.  \[build\]\], si l'exécutable sera crée pour la plateforme \[platform\], valide uniquement pour le script \<\<build>>
 4.  \[url=local-url\], l'url à ouvrir via l'application electron (exemple : http://localhost:19006/), valide uniquement pour le script \<\<start>>;
-5.  \[plateforem\], la plateforme vers laquelle on souhaite exporter l'exécutable electron, vailde uniquement pour le script \<\<build>>
+5.  \[platform\], la plateforme vers laquelle on souhaite exporter l'exécutable electron, vailde uniquement pour le script \<\<build>>
 6.  \[arch\], l'architecture de l'exécutable à exporter, valide uniquement pour le script \<\<build>>
+7.  \[out\], le repertoire destitation, valide pour les scripts \[build et package\]
+
+## **Générer le fichier binaire**
+
+1.  installer le package electron-packager : `npm install --save-dev electron-packager`