@fto-consult/expo-ui 7.4.26 → 7.4.28

package/electron/index.js

@@ -314,8 +314,8 @@ app.whenReady().then(() => {
 })
 
 ipcMain.on("electron-restart-app",x =>{app.relaunch();})
-let tray = null;
-let isJSON = function (json_string){
+  let tray = null;
+  let isJSON = function (json_string){
   if(!json_string || typeof json_string != 'string') return false;
   var text = json_string;
   return !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(text.replace(/"(\\.|[^"\\])*"/g, '')));
@@ -357,6 +357,21 @@ ipcMain.on("electron-get-path",(event,pathName)=>{
   return p;
 });
 
+ipcMain.on("electron-get-project-root",(event)=>{
+  return projectRoot;
+});
+ipcMain.on("electron-get-electron-project-root",(event)=>{
+  return electronProjectRoot;
+});
+
+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("electron-get-media-access-status",(event,mediaType)=>{
   let p = systemPreferences.getMediaAccessStatus(mediaType);
   event.returnValue = p;

package/electron/preload.js

@@ -6,16 +6,14 @@ 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 ePath = path.resolve(__dirname);
-const packagePath = path.resolve(ePath,"package.json");
-if(!fs.existsSync(packagePath)){
-    throw {message : "Chemin du fichier "+packagePath+ " introuvable"};
-}
-const _app = require(`${packagePath}`);
+const packageJSONStr = ipcRenderer.sendSync("electron-get-package-json");
+const projectRoot = ipcRenderer.sendSync("electron-get-electron-project-root");
+const pathsJS = projectRoot && fs.existsSync(projectRoot) && path.resolve(projectRoot,"paths.json") || null;
+const _app = packageJSONStr ? JSON.parse(packageJSONStr) : {};
 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 paths = require("./paths.json");
+const paths = pathsJS ? require(`${pathsJS}`) : {};
 const APP_NAME = _app.name.trim().toUpperCase();
 let backupPathField = "_e_backupDataPath";
 let cBackupPathField = "company"+backupPathField;

package/package.json

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