@fto-consult/expo-ui 7.4.29 → 7.4.31

package/babel.config.alias.js

@@ -93,6 +93,7 @@ module.exports = (opts)=>{
     r.$eelectron = r["$e-electron"] = $electron;
     r.$electron = r.$electron || r.$eelectron;
     r.$projectRoot = r.$eprojectRoot = projectRoot;
+    r.$electronProjectRoot = path.resolve(r.$projectRoot,"electron");
     r.$econtext = path.resolve(expo,"context");
     r.$epdf = path.resolve(expo,"pdf");
     if(!r.$context){

package/bin/index.js

@@ -19,7 +19,8 @@ const packageObj = require("../package.json");
 const version = packageObj.version;
 const description = packageObj.description;
 const packageName = packageObj.name;
-
+const localElectronPackage = path.resolve(projectRoot,"node_modules",packageName)
+const localElectronPackageElectron = path.resolve(localElectronPackage,"electron");
 
 program
   .name(packageName)
@@ -70,9 +71,14 @@ program.command('electron')
       }
     } 
     const paths = require(`${pathsJSON}`);
-    if(typeof paths !=='object' || !paths || !paths.projectRoot){
+    if(typeof paths !=='object' || !paths || !paths.projectRoot || !fs.existsSync(paths.projectRoot)){
         throwError("Fichiers des chemins d'application invalide!!! merci d'exécuter l'application en environnement web|android|ios puis réessayez");
     }
+    if(fs.existsSync(localElectronPackageElectron)){
+      try {
+        writeFile(path.resolve(localElectronPackageElectron,"paths.json"),JSON.stringify(paths,null,"\t"));
+      } catch{}
+    }
     /**** le project root d'où a été lancé le script electron doit être le même que celui de l'application principale */
     if(projectRoot !== paths.projectRoot){
        throwError(`main app project root ${paths.projectRoot} must be equals to ${projectRoot} in which you want to generate electron app`);

package/electron/index.js

@@ -15,10 +15,12 @@ const programOptions = program.opts();
 const {url:pUrl,paths:pathsJSON,root:mainProjectRoot} = programOptions
 const cPaths = path.resolve("./paths.json");
 const pathsJ = pathsJSON && fs.existsSync(pathsJSON) && pathsJSON.endsWith("paths.json")? pathsJSON  : null;
-let paths = pathsJ ? require(`${pathsJ}`) : fs.existsSync(cPaths) ? require(cPaths) : null;
-const projectRoot = mainProjectRoot && fs.existsSync(mainProjectRoot) ? mainProjectRoot : paths.projectRoot || '';
-const electronProjectRoot = projectRoot && fs.existsSync(path.resolve(projectRoot,"electron")) && path.resolve(projectRoot,"electron") || null;
+let paths = pathsJ ? require(`${pathsJ}`) : fs.existsSync(cPaths) ? require(cPaths) : '';
+const projectRoot = mainProjectRoot && fs.existsSync(mainProjectRoot) ? mainProjectRoot : paths.projectRoot || process.cwd();
+const electronProjectRoot = projectRoot && fs.existsSync(path.resolve(projectRoot,"electron")) && path.resolve(projectRoot,"electron") || '';
 const ePathsJSON = path.resolve(electronProjectRoot,"paths.json");
+const packageJSONPath = path.resolve(projectRoot,"package.json");
+const packageJSON = fs.existsSync(packageJSONPath) ? require(`${packageJSONPath}`) : {};
 const eePaths = path.resolve(getPaths(projectRoot));
 if(!paths){
   if(fs.existsSync(ePathsJSON)){
@@ -351,28 +353,37 @@ ipcMain.on("update-system-tray",(event,opts)=>{
   } else contextMenu = null;
   tray.setContextMenu(contextMenu) 
 })
-ipcMain.on("electron-get-path",(event,pathName)=>{
+ipcMain.on("get-path",(event,pathName)=>{
   const p = app.getPath(pathName);
   event.returnValue = p;
   return p;
 });
 
-ipcMain.on("electron-get-project-root",(event)=>{
+ipcMain.on("get-project-root",(event)=>{
+  event.returnValue  = projectRoot;
   return projectRoot;
 });
-ipcMain.on("electron-get-electron-project-root",(event)=>{
-  return electronProjectRoot;
+ipcMain.on("get-electron-project-root",(event)=>{
+  event.returnValue = electronProjectRoot;
+  return event.returnValue ;
 });
 
-ipcMain.on("electron-get-package-json",(event)=>{
-  const packageJSON = path.resolve(projectRoot,"package.json");
-  if(fs.existsSync(packageJSON)){
-      return JSON.stringify(require(packageJSON));
-  }
-  return JSON.stringify({});
+ipcMain.on("get-package.json",(event)=>{
+  event.returnValue = JSON.stringify(packageJSON);
+  return event.returnValue ;
+});
+
+ipcMain.on("get-paths.json",(event)=>{
+  event.returnValue = JSON.stringify(paths);
+  return event.returnValue ;
+});
+
+ipcMain.on("get-app-name",(event)=>{
+  event.returnValue = packageJSON.name;
+  return event.returnValue ;
 });
 
-ipcMain.on("electron-get-media-access-status",(event,mediaType)=>{
+ipcMain.on("get-media-access-status",(event,mediaType)=>{
   let p = systemPreferences.getMediaAccessStatus(mediaType);
   event.returnValue = p;
   return p;
@@ -382,7 +393,7 @@ ipcMain.on("electron-ask-for-media-access",(event,mediaType)=>{
   systemPreferences.askForMediaAccess(mediaType);
 });
 
-ipcMain.on("electron-get-app-icon",(event)=>{
+ipcMain.on("get-app-icon",(event)=>{
   event.returnValue = win != win && win.getIcon && win.getIcon();
 });
 ipcMain.on("electron-set-app-icon",(event,iconPath)=>{

package/electron/preload.js

@@ -4,23 +4,21 @@ const { contextBridge, ipcRenderer, shell } = require('electron')
 const appInstance = require("./app/instance");
 const path = require("path");
 const fs = require("fs");
-const isObj = x=>x && typeof x =='object' && !Array.isArray(x);
 const isNonNullString = x=>x && typeof x =='string';
-const projectRoot = ipcRenderer.sendSync("electron-get-project-root");
-const electronProjectRoot = ipcRenderer.sendSync("electron-get-electron-project-root");
-const pathsJS = electronProjectRoot && fs.existsSync(electronProjectRoot) && path.resolve(electronProjectRoot,"paths.json") || null;
-const _app = projectRoot && fs.existsSync(path.resolve(projectRoot,"package.json")) ? require(path.resolve(projectRoot,"package.json")) : {};
-if(!_app || typeof _app !=='object' || typeof _app.name !=='string'){
-    throw {message : "Contenu du fichier "+packagePath+" invalide!! Veuillez spécifier un nom valide d'application, propriété <<name>> dudit fichier"}
+const pathsStr = ipcRenderer.sendSync("get-paths.json");
+const paths = typeof pathsStr ==='string' && pathsStr ? JSON.parse(pathsStr) : {};
+const appName = ipcRenderer.sendSync("get-app-name");
+if(!appName || typeof appName !=='string'){
+    throw {message : "Nom de l'application invalide!! Veuillez spécifier un nom valide d'application"}
 }
-const paths = pathsJS ? require(`${pathsJS}`) : {};
-const APP_NAME = _app.name.trim().toUpperCase();
+const APP_NAME = appName.toUpperCase();
 let backupPathField = "_e_backupDataPath";
 let cBackupPathField = "company"+backupPathField;
 let dbPathField = "_electron_DBPathField";
+
 const getPath = function(pathName){
     if(typeof pathName !=='string' || !pathName) return;
-    return ipcRenderer.sendSync("electron-get-path",pathName);
+    return ipcRenderer.sendSync("get-path",pathName);
 }
 const APP_PATH = path.join(getPath("appData"),APP_NAME).toLowerCase();
 let databasePath = path.join(APP_PATH,"databases");

package/package.json

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