@fto-consult/expo-ui 7.5.28 → 7.5.30

package/babel.config.alias.js

@@ -1,7 +1,5 @@
 const path = require("path");
 const fs = require("fs");
-const writeFile = require("./electron/utils/writeFile");
-const paths = require("./electron/utils/paths");
 module.exports = (opts)=>{
     const isLocalDev = require("./is-local-dev")();
     const dir = path.resolve(__dirname);
@@ -109,15 +107,6 @@ module.exports = (opts)=>{
             electronPaths.logo = logoPath;
         }
     }
-    const expoUIElectronPath = path.resolve(projectRoot,"electron")
-    const pathsSringified = JSON.stringify(electronPaths, null, "\t");
-    ///on sauvegarde les chemins des fichiers utiles, qui seront utilisées par la variable electron plus tard
-    try {
-        writeFile(paths(projectRoot),pathsSringified);
-    } catch{}
-    if(fs.existsSync(expoUIElectronPath)){
-        writeFile(path.resolve(expoUIElectronPath,"paths.json"),pathsSringified);
-    }
     r["$erealm"] = path.resolve(expo,'realm');
     if(!r.$realm){
         r.$realm = r.$erealm;

package/bin/index.js

@@ -10,7 +10,7 @@
 const { program } = require('commander');
 const path= require("path");
 const fs = require("fs");
-const  {createDir,electronDir,copy,exec,throwError,paths:getPaths,writeFile,isValidUrl} = require("./utils");
+const  {createDir,electronDir,copy,exec,throwError,writeFile,isValidUrl} = require("./utils");
 
 
 const dir = path.resolve(__dirname);
@@ -53,39 +53,17 @@ program.command('electron')
   .option('-b, --build [boolean]', 'si ce flag est spécfifié alors l\'application sera compilée; combinée avec la commande start|package pour indiquer que l\'application sera à nouveau exportée ou pas.')
   .option('-a, --arch [architecture]', 'l\'architecture de la plateforme; Commande package')
   .option('-p, --platform [platform]', 'la plateforme à utiliser pour la compilation; commande package')
+  .option('-l, --logo [logoPath]', 'le chemin vers le logo de l\'application : (.ico pour window, .incs pour mac et .png pour linux)')
   .option('-i, --import [boolean]', 'la commande d\'initialisation du package electron forge, utile pour le packaging de l\'application. Elle permet d\'exécuter le cli electron package, pour l\'import d\'un projet existant. Commande package. exemple : expo-ui electron package --import')
   
   .action((script, options) => {
     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} = opts;
+    let {out,arch,url,build,platform,import:packageImport,logo} = opts;
     //let {projectRoot} = opts;
     if(projectRoot == dir){
         throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
     }
-    let pathsJSON = path.resolve(getPaths(projectRoot));
-    const electronPathsJSON = path.resolve(electronProjectRoot,"paths.json");
-    if(!fs.existsSync(pathsJSON)){
-      if(fs.existsSync(electronPathsJSON)){
-        pathsJSON = electronPathsJSON
-      } else {
-        throwError("Le fichier des chemins d'accès à l'application est innexistant, rassurez vous de tester l'application en environnement web, via la cmde <npx expo start>, avant l'exécution du script electron.");
-      }
-    } 
-    const paths = require(`${pathsJSON}`);
-    if(typeof paths !=='object' || !paths || !paths.projectRoot || !fs.existsSync(paths.projectRoot)){
-        throwError("Fichiers des chemins d'application invalide!!! merci d'exécuter l'application en environnement web|android|ios puis réessayez");
-    }
-    if(fs.existsSync(localElectronPackageElectron)){
-      try {
-        writeFile(path.resolve(localElectronPackageElectron,"paths.json"),JSON.stringify(paths,null,"\t"));
-      } catch{}
-    }
-    
-    /**** le project root d'où a été lancé le script electron doit être le même que celui de l'application principale */
-    if(projectRoot !== paths.projectRoot){
-       throwError(`main app project root ${paths.projectRoot} must be equals to ${projectRoot} in which you want to generate electron app`);
-    }
     
     const isElectionInitialized = require("../electron/is-initialized")(electronProjectRoot);
     process.env.isElectron = true;
@@ -100,7 +78,8 @@ program.command('electron')
     const packageObj = require(`${packagePath}`);
     const homepage = packageObj.homepage;
     let cmd = undefined;
-    require("../electron/create-index-file")({electronProjectRoot,appName:packageObj.name});
+    logo = logo && typeof logo =="string" && fs.existsSync(path.resolve(logo)) && logo || undefined;
+    require("../electron/create-index-file")({electronProjectRoot,appName:packageObj.name,logo});
     if(!isElectionInitialized || script =='init'){
         if(script !=='init'){
             console.log("initializing electron application before ....");
@@ -109,20 +88,12 @@ program.command('electron')
            projectRoot,
            electronDir,
            electronProjectRoot,
-           paths,
-           pathsJSON
         });
     }
     const outDir = out && path.dirname(out) && path.resolve(path.dirname(out),"electron") || path.resolve(electronProjectRoot,"bin")
     if(!createDir(outDir)){
         throwError("Impossible de créer le répertoire <<"+outDir+">> du fichier binaire!!");
     }
-    const logoPath = paths.logo || paths.$assets && path.resolve(paths.$assets,"logo.png") || paths.$images && path.resolve(paths.$images,"logo.png");
-    if(!logoPath || !fs.existsSync(logoPath)){
-       if(logoPath){
-        console.warn("Logo de l'application innexistant!! Vous devez spécifier le logo de votre application, fichier ["+(logoPath)+"]")
-      }
-    }
     const start = x=>{
        return new Promise((resolve,reject)=>{
         cmd = `electron "${electronProjectRoot}" --root ${electronProjectRoot} ${isValidUrl(url)? ` --url ${url}`:''}`;

package/bin/init.js

@@ -10,7 +10,7 @@ const appSuffix = "-desk";
 const mainPackage = require("../package.json");
 const mainPackageName = mainPackage.name;
 
-module.exports = ({projectRoot,electronProjectRoot,paths,pathsJSON})=>{
+module.exports = ({projectRoot,electronProjectRoot})=>{
     return new Promise((resolve,reject)=>{
         //make shure electron project root exists
         if(!createDir(electronProjectRoot)){
@@ -62,17 +62,6 @@ module.exports = ({projectRoot,electronProjectRoot,paths,pathsJSON})=>{
         /**** copying all electron utils files */
         const utilsPath = path.resolve(electronProjectRoot,"utils");
         copy(path.resolve(electronDir,"utils"),utilsPath);
-        const destPathJSON = path.resolve(electronProjectRoot,"paths.json");
-        try {
-            if(paths && typeof paths =='object' && paths.$src && fs.existsSync(paths.$src)){
-                writeFile(destPathJSON,JSON.stringify(paths, null, "\t"));
-            }
-        } catch{}
-        if(!fs.existsSync(destPathJSON) && pathsJSON && fs.existsSync(pathsJSON)){
-            try {
-                copy(pathsJSON,destPathJSON);
-            } catch(e){}
-        }
         const gP = path.resolve(electronProjectRoot,".gitignore") ;
         if(!fs.existsSync(gP)){
           try {

package/electron/create-index-file.js

@@ -3,7 +3,7 @@ const writeFile = require("../electron/utils/writeFile");
 const path = require("path");
 const packageJSON = require("../package.json");
 
-module.exports = ({electronProjectRoot,force,appName})=>{
+module.exports = ({electronProjectRoot,force,logo,appName})=>{
     if(!electronProjectRoot || typeof electronProjectRoot !='string' || !fs.existsSync(electronProjectRoot)){
         return null;
     }
@@ -12,7 +12,8 @@ module.exports = ({electronProjectRoot,force,appName})=>{
         writeFile(indexPath,`
 module.exports = require("${packageJSON.name}/electron/index.js")({
     projectRoot : __dirname,
-    appName : "${appName}"
+    appName : "${appName}",
+    logo : ${logo}? "${logo}" : undefined,
 })        
 `);
     }

package/electron/index.js

@@ -4,27 +4,23 @@ const mainApp = require("./main-app");
 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('-p, --paths <paths>', 'le chemin vers le fichiers paths.json contenant la liste des alias de l\'application, exportés au moment de la compilation')
   .parse();
 
 const programOptions = program.opts();
-const {url:pUrl,root:mainProjectRoot} = programOptions;
+const {url,root:mainProjectRoot} = programOptions;
 
 const isAsar = (typeof require.main =="string" && require.main ||"").indexOf('app.asar') !== -1;
 const path = require("path");
 const fs = require("fs");
 const isValidUrl = require("./utils/isValidUrl");
-
-throw "Before begin "+mainProjectRoot;
 const distPath = path.join("dist",'index.html');
+
 const processCWD = process.cwd();
-const electronProjectRoot = mainProjectRoot && typeof mainProjectRoot =='string' && fs.existsSync(mainProjectRoot) && fs.existsSync(path.resolve(mainProjectRoot,distPath)) && mainProjectRoot  || null;
+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") || 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){
@@ -36,7 +32,7 @@ const ObjectSize = (object)=>{
 function mainExportedApp (options){
     options = Object.assign({},options);
     options.isAsar = isAsar;
-    options.url = isValidUrl(options.url)? options.url : isValidUrl(pUrl)? pUrl : undefined;
+    options.url = isValidUrl(options.url)? options.url : isValidUrl(url)? url : undefined;
     if(!options.projectRoot || typeof options.projectRoot !=='string' || !fs.existsSync(options.projectRoot) || !fs.existsSync(path.resolve(options.projectRoot,distPath))){
         options.projectRoot = projectRoot;
     }
@@ -49,14 +45,13 @@ function mainExportedApp (options){
     options.appName = typeof options.appName =="string" && options.appName || 
     typeof options.packageJSON?.realAppName =='string' && options?.packageJSON?.realAppName || typeof packageJSON?.realAppName =="string" && packageJSON?.realAppName ||  
     typeof option?.packageJSON?.name =="string" && options?.packageJSON?.name || typeof packageJSON.name =="string" && packageJSON.name || undefined;
-    throw JSON.stringify(options);
     return mainApp(options);
 }
 
 module.exports = mainExportedApp;
 
-if(isValidUrl(pUrl) || electronProjectRoot){
-    mainExportedApp({url:pUrl,projectRoot,packageJSON});
+if(isValidUrl(url) || electronProjectRoot){
+    mainExportedApp({url:url,projectRoot,packageJSON});
 }
 
 module.exports.createBrowserWindow = mainApp.createBrowserWindow;

package/electron/is-initialized.js

@@ -6,8 +6,6 @@ module.exports = (projectRoot)=>{
     return fs.existsSync(path.resolve(projectRoot,"node_modules")) && fs.existsSync(path.resolve(projectRoot,"index.js")) 
         && fs.existsSync(path.resolve(projectRoot,"package.json")) 
         && fs.existsSync(path.resolve(projectRoot,'processes',"main","index.js")) 
-        && fs.existsSync(path.resolve(projectRoot,'processes',"renderer","index.js"))
-        && fs.existsSync(path.resolve(projectRoot,"paths.json"))
-        
+        && fs.existsSync(path.resolve(projectRoot,'processes',"renderer","index.js"))     
     && true || false;
 }

package/package.json

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