@fto-consult/expo-ui 7.5.40 → 7.5.41

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

package/electron/index.js

@@ -31,9 +31,11 @@ const isAsar = (typeof require.main =="string" && require.main ||"").indexOf('ap
 const distPath = path.join("dist",'index.html');
 
 const processCWD = process.cwd();
+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) || processCWD;
+|| 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 packageJSON = fs.existsSync(packageJSONPath) ? Object.assign({},require(`${packageJSONPath}`)) : {};
 const appName = typeof packageJSON.realAppName =='string' && packageJSON.realAppName || typeof packageJSON.name =="string" && packageJSON.name || "";  
@@ -49,10 +51,11 @@ const mainProcessIndex = projectRoot && fs.existsSync(path.resolve(projectRoot,m
 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
 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(!isValidUrl(pUrl) && !fs.existsSync(indexFilePath)){
-  throw {message:`Unable to start the application: index file located at [${indexFilePath}] does not exists : projectRoot = [${projectRoot}], isAsar:[${require.main}]`}
+  throw {message:`Unable to start the application: index file located at [${indexFilePath}] does not exists : projectRoot = [${projectRoot}], exec path is ${execPath}`}
 }
 
 const quit = ()=>{

package/package.json

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