@fto-consult/expo-ui 7.5.25 → 7.5.27

package/electron/create-index-file.js

@@ -9,10 +9,12 @@ module.exports = ({electronProjectRoot,force,appName})=>{
     }
     const indexPath = path.resolve(electronProjectRoot,"index.js");
     if(true || !fs.existsSync(indexPath) || force === true){
-        writeFile(indexPath,`module.exports = require("${packageJSON.name}/electron/index.js")({
-            projectRoot : "${electronProjectRoot}",
-            appName : "${appName}"
-        })`);
+        writeFile(indexPath,`
+module.exports = require("${packageJSON.name}/electron/index.js")({
+    projectRoot : __dirname,
+    appName : "${appName}"
+})        
+`);
     }
     return indexPath;
 }

package/electron/index.js

@@ -17,11 +17,13 @@ const isValidUrl = require("./utils/isValidUrl");
 
 const distPath = path.join("dist",'index.html');
 const processCWD = process.cwd();
-const electronProjectRoot = mainProjectRoot && fs.existsSync(mainProjectRoot) && fs.existsSync(path.resolve(mainProjectRoot,distPath)) ? mainProjectRoot  : null;
-const projectRoot =  electronProjectRoot || fs.existsSync(path.resolve(processCWD,"electron")) && fs.existsSync(path.resolve(processCWD,"electron",distPath)) ? path.resolve(processCWD,"electron") : undefined;
+const electronProjectRoot = mainProjectRoot && typeof mainProjectRoot =='string' && fs.existsSync(mainProjectRoot) && fs.existsSync(path.resolve(mainProjectRoot,distPath)) && mainProjectRoot  || null;
+const projectRoot =  electronProjectRoot || fs.existsSync(path.resolve(processCWD,"electron")) && fs.existsSync(path.resolve(processCWD,"electron",distPath)) && path.resolve(processCWD,"electron") || undefined;
 const packageJSONPath = fs.existsSync(processCWD,"package.json")? path.resolve(processCWD,"package.json") : path.resolve(projectRoot,"package.json");
 const packageJSON = fs.existsSync(packageJSONPath) ? require(`${packageJSONPath}`) : {};
 
+throw `electron project root is ${electronProjectRoot} and project root is ${projectRoot}`;
+
 const ObjectSize = (object)=>{
     if(!object || typeof object !=='object' || Array.isArray(object)) return false;
     for(let i in object){
@@ -39,7 +41,7 @@ function mainExportedApp (options){
     }
     options.packageJSON = ObjectSize(options.packageJSON) && options.packageJSON || packageJSON;
     if(!ObjectSize(options.packageJSON)){
-        if(options.projectRoot && fs.existsSync(path.resolve(options.projectRoot,"package.json"))){
+        if(options.projectRoot && typeof options.projectRoot =='string' && fs.existsSync(path.resolve(options.projectRoot,"package.json"))){
             options.packageJSON = require(path.resolve(options.projectRoot,"package.json"));
         }
     }

package/package.json

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