@fto-consult/expo-ui 7.5.42 → 7.5.43

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
@@ -80,6 +80,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 +96,7 @@ program.command('electron')
            projectRoot,
            electronDir,
            electronProjectRoot,
+           icon,
         });
     }
     const outDir = out && path.dirname(out) && path.resolve(path.dirname(out),"electron") || path.resolve(electronProjectRoot,"bin")

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

@@ -34,11 +34,9 @@ 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 projectRoot =  electronProjectRoot || fs.existsSync(path.resolve(appPath,distPath)) && appPath || fs.existsSync(asarPath) && fs.existsSync(path.relative(asarPath,"dist")) && asarPath || appPath;
 const packageJSONPath = fs.existsSync(processCWD,"package.json")? path.resolve(processCWD,"package.json") : path.resolve(projectRoot,"package.json");
-const packageJSON = fs.existsSync(packageJSONPath) ? Object.assign({},require(`${packageJSONPath}`)) : {};
+const packageJSON = fs.existsSync(packageJSONPath) ? Object.assign({},require(`${packageJSONPath}`)) : fs.existsSync(path.resolve(projectRoot,"package.app.json")) ? require(path.resolve(projectRoot,"package.app.json")) : {};
 const appName = typeof packageJSON.realAppName =='string' && packageJSON.realAppName || typeof packageJSON.name =="string" && packageJSON.name || "";  
 
 // fermee automatiquement quand l'objet JavaScript sera garbage collected.

package/package.json

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