@fto-consult/expo-ui 7.4.21 → 7.4.23

package/bin/index.js

@@ -108,6 +108,11 @@ program.command('electron')
     const indexFile = path.resolve(buildOutDir,"index.html");
     const webBuildDir = path.resolve(projectRoot,"web-build");
     const packagePath = path.resolve(projectRoot,"package.json");
+    if(!fs.existsSync(packagePath)){
+        throwError("package.json file does not exist in "+projectRoot+". please make jure that your have running package script in expo root application");
+    }
+    const packageObj = require(`${packagePath}`);
+    const homepage = packageObj.homepage;
     let cmd = undefined;
     const start = x=>{
        return new Promise((resolve,reject)=>{
@@ -132,10 +137,18 @@ program.command('electron')
             reject("dossier web-build exporté par electron innexistant!!");
           }
         }
-        if(!url && (compile || !fs.existsSync(path.resolve(webBuildDir,"index.html")))){
+        if(!url && (compile || script ==="build" || !fs.existsSync(path.resolve(webBuildDir,"index.html")))){
           console.log("exporting expo web app ...");
+          try {
+            writeFile(packagePath,JSON.stringify({...packageObj,homepage:"./"},null,"\t"));
+          } catch{}
           cmd = "npx expo export:web";
-          return exec({cmd,projectRoot}).then(next).catch(reject);
+          return exec({cmd,projectRoot}).then((e)=>{
+            try {
+              writeFile(packagePath,JSON.stringify({...packageObj,homepage},null,"\t"));
+            } catch{}
+             next(e);
+          }).catch(reject);
         }
         next();
     });
@@ -150,10 +163,6 @@ program.command('electron')
           case "build":
             break;
           default :
-            if(!fs.existsSync(packagePath)){
-                throwError("package.json file does not exist in "+projectRoot+". please make jure that your have running package script in expo root application");
-            }
-            const packageObj = require(`${packagePath}`);
             const electronPackage = require(`${path.resolve(electronProjectRoot,'package.json')}`);
             electronPackage.name = packageObj.name;
             electronPackage.version = packageObj.version;

package/electron/index.js

@@ -13,9 +13,9 @@ program
 
 const programOptions = program.opts();
 const {url:pUrl,paths:pathsJSON,root:mainProjectRoot} = programOptions
-
+const cPaths = path.resolve("./paths.json");
 const pathsJ = pathsJSON && fs.existsSync(pathsJSON) && pathsJSON.endsWith("paths.json")? pathsJSON  : null;
-let paths = pathsJ ? require(`${pathsJ}`) : fs.existsSync(path.resolve("./paths.json")) ? require("./paths.json") : null;
+let paths = pathsJ ? require(`${pathsJ}`) : fs.existsSync(cPaths) ? require(cPaths) : null;
 const projectRoot = mainProjectRoot && fs.existsSync(mainProjectRoot) ? mainProjectRoot : paths.projectRoot || '';
 const electronProjectRoot = projectRoot && fs.existsSync(path.resolve(projectRoot,"electron")) && path.resolve(projectRoot,"electron") || null;
 const ePathsJSON = path.resolve(electronProjectRoot,"paths.json");

package/package.json

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