@fto-consult/expo-ui 7.5.42 → 7.5.44

package/bin/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
   toujours ajouter l'instruction ci-dessus à la première ligne de chaque script npx
@@ -60,7 +60,6 @@ program.command('electron')
     const electronProjectRoot = path.resolve(projectRoot,"electron");
     const opts = Object.assign({},typeof options.opts =='function'? options.opts() : options);
     let {out,arch,url,build,platform,import:packageImport,icon} = opts;
-    //let {projectRoot} = opts;
     if(projectRoot == dir){
         throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
     }
@@ -80,6 +79,14 @@ program.command('electron')
     let cmd = undefined;
     icon = icon && typeof icon =="string" && fs.existsSync(path.resolve(icon)) && icon || undefined;
     require("../electron/create-index-file")({electronProjectRoot,appName:packageObj.name,icon});
+    if(fs.existsSync(electronProjectRoot)){
+      const mainPackagePath = path.resolve(electronProjectRoot,"package.app.json");
+      try {
+        const mainPackageAppJSON = fs.existsSync(mainPackagePath)? require(mainPackagePath) : {};
+        writeFile(mainPackagePath,JSON.stringify({...packageObj,...mainPackageAppJSON,icon:icon||mainPackageAppJSON.icon||undefined},null,"\t"));
+      } catch{}
+    }
+    
     if(!isElectionInitialized || script =='init'){
         if(script !=='init'){
             console.log("initializing electron application before ....");
@@ -88,6 +95,7 @@ program.command('electron')
            projectRoot,
            electronDir,
            electronProjectRoot,
+           icon,
         });
     }
     const outDir = out && path.dirname(out) && path.resolve(path.dirname(out),"electron") || path.resolve(electronProjectRoot,"bin")
@@ -96,7 +104,7 @@ program.command('electron')
     }
     const start = x=>{
        return new Promise((resolve,reject)=>{
-        cmd = `electron "${electronProjectRoot}" --root ${electronProjectRoot} ${icon ? `--icon ${path.resolve(icon)}`:""} ${isValidUrl(url)? ` --url ${url}`:''}`;
+        cmd = `electron "${electronProjectRoot}"  ${icon ? `--icon ${path.resolve(icon)}`:""} ${isValidUrl(url)? ` --url ${url}`:''}`; //--root ${electronProjectRoot}
           exec({
             cmd, 
             projectRoot : electronProjectRoot,

package/bin/init.js

@@ -10,7 +10,7 @@ const appSuffix = "-desk";
 const mainPackage = require("../package.json");
 const mainPackageName = mainPackage.name;
 
-module.exports = ({projectRoot,electronProjectRoot})=>{
+module.exports = ({projectRoot,electronProjectRoot,icon})=>{
     return new Promise((resolve,reject)=>{
         //make shure electron project root exists
         if(!createDir(electronProjectRoot)){
@@ -19,7 +19,7 @@ module.exports = ({projectRoot,electronProjectRoot})=>{
         const mPackageJSON = Object.assign({},require(`${path.resolve(projectRoot,'package.json')}`));
         const electronPackagePath = path.resolve(electronProjectRoot,"package.json");
         const electronPackageJSON = Object.assign({},fs.existsSync(electronPackagePath)? require(electronPackagePath) : {});
-        const projectRootPackage = {...mPackageJSON,...electronPackageJSON};
+        const projectRootPackage = {icon,...mPackageJSON,...electronPackageJSON};
         const dependencies = require("../electron/dependencies");
         const electronProjectRootPackage = path.resolve(electronProjectRoot,"package.json");
         projectRootPackage.main = `index.js`;

package/electron/index.js

@@ -16,7 +16,7 @@ const iconName = process.platform =="win32" ? "icon.ico" : process.platform =='d
 
 program
   .option('-u, --url <url>', 'L\'adresse url à ouvrir au lancement de l\'application')
-  .option('-r, --root <projectRoot>', 'le chemin du project root de l\'application')
+  //.option('-r, --root <projectRoot>', 'le chemin du project root de l\'application')
   .option('-l, --icon [iconPath]', 'le chemin vers le dossier des icones de l\'application : (Dans ce dossier, doit contenir une image icon.ico pour window, icon.incs pour mac et icon.png pour linux)')
   .parse();
 
@@ -27,17 +27,11 @@ if(iconPath && fs.existsSync(path.resolve(iconPath,iconName))){
     iconPath = path.resolve(iconPath,iconName);
 }
 
-const isAsar = (typeof require.main =="string" && require.main ||"").indexOf('app.asar') !== -1;
 const distPath = path.join("dist",'index.html');
-
 const processCWD = process.cwd();
 const appPath = app.getAppPath();
-const asarPath = path.resolve(processCWD,"resources","app.asar");
-const electronProjectRoot = mainProjectRoot && typeof mainProjectRoot =='string' && fs.existsSync(path.resolve(mainProjectRoot)) && fs.existsSync(path.resolve(mainProjectRoot,distPath)) && path.resolve(mainProjectRoot)  || null;
-const projectRoot =  electronProjectRoot || fs.existsSync(path.resolve(processCWD,"electron")) && fs.existsSync(path.resolve(processCWD,"electron",distPath)) && path.resolve(processCWD,"electron") 
-|| fs.existsSync(path.resolve(processCWD,distPath)) && path.resolve(processCWD) || fs.existsSync(asarPath) && fs.existsSync(path.relative(asarPath,"dist")) && asarPath ||
-processCWD;
-const packageJSONPath = fs.existsSync(processCWD,"package.json")? path.resolve(processCWD,"package.json") : path.resolve(projectRoot,"package.json");
+const isAsar = appPath.indexOf('app.asar') !== -1;
+const packageJSONPath = fs.existsSync(processCWD,"package.json")? path.resolve(processCWD,"package.json") : fs.existsSync(path.resolve(appPath,"package.app.json")) ? path.resolve(appPath,"package.app.json") : path.resolve(appPath,"package.json") ;
 const packageJSON = fs.existsSync(packageJSONPath) ? Object.assign({},require(`${packageJSONPath}`)) : {};
 const appName = typeof packageJSON.realAppName =='string' && packageJSON.realAppName || typeof packageJSON.name =="string" && packageJSON.name || "";  
 
@@ -46,17 +40,17 @@ let mainWindow = undefined;
 
 Menu.setApplicationMenu(null);
 
-const indexFilePath = path.resolve(path.join(projectRoot,distPath));
+const indexFilePath = path.resolve(path.join(appPath,distPath));
 const mainProcessPath = path.resolve('processes',"main","index.js");
-const mainProcessIndex = projectRoot && fs.existsSync(path.resolve(projectRoot,mainProcessPath)) && path.resolve(projectRoot,mainProcessPath);
+const mainProcessIndex = fs.existsSync(path.resolve(appPath,mainProcessPath)) && path.resolve(appPath,mainProcessPath);
 const mainProcessRequired = mainProcessIndex && require(`${mainProcessIndex}`);
-//pour étendre les fonctionnalités au niveau du main proceess, bien vouloir écrire dans le fichier projectRoot/electron/main/index.js
+//pour étendre les fonctionnalités au niveau du main proceess, bien vouloir écrire dans le fichier ../electron/main/index.js
 const mainProcess = mainProcessRequired && typeof mainProcessRequired =='object'? mainProcessRequired : {};
 const execPath = app.getPath ('exe') || process.execPath;
 
 // Gardez une reference globale de l'objet window, si vous ne le faites pas, la fenetre sera
-if(true || !isValidUrl(pUrl) && !fs.existsSync(indexFilePath)){
-  throw {message:`Unable to start the application: index file located at [${indexFilePath}] does not exists : appPath = [${appPath}] projectRoot = [${projectRoot}], exec path is ${execPath}`}
+if(!isValidUrl(pUrl) && !fs.existsSync(indexFilePath)){
+  throw {message:`Unable to start the application: index file located at [${indexFilePath}] does not exists : appPath = [${appPath}], exec path is ${execPath}`}
 }
 
 const quit = ()=>{
@@ -353,12 +347,17 @@ function createWindow () {
     event.returnValue = p;
     return p;
   });
+  ipcMain.on("get-app-path",(event,pathName)=>{
+    event.returnValue = appPath;
+    return appPath;
+  });
   ipcMain.on("get-project-root",(event)=>{
-    event.returnValue  = projectRoot;
+    event.returnValue  = appPath;
     return event.returnValue;
   });
-  ipcMain.on("get-electron-project-root",(event)=>{
-    event.returnValue = projectRoot;
+  
+  ipcMain.on("get-process-cwd",(event)=>{
+    event.returnValue = processCWD;
     return event.returnValue ;
   });
   

package/electron/preload.js

@@ -419,6 +419,9 @@ const ELECTRON = {
             return ipcRenderer.invoke('set-system-theme:light-mode');
         }
     },
+    get appPath(){
+        return ipcRenderer.sendSync("get-app-path");
+    }
 };
 
 require("./pload")(ELECTRON,{projectRoot});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.5.42",
+  "version": "7.5.44",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",