@fto-consult/expo-ui 7.4.2 → 7.4.4

package/babel.config.alias.js

@@ -1,6 +1,7 @@
 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);
@@ -114,7 +115,7 @@ module.exports = (opts)=>{
         } catch{}
     }
     ///on sauvegarde les chemins des fichiers utiles, qui seront utilisées par la variable electron plus tard
-    writeFile(path.resolve(dir,"electron","paths.json"),JSON.stringify(electronPaths));
+    writeFile(paths(projectRoot),JSON.stringify(electronPaths, null, "\t"));
     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} = require("./utils");
+const  {createDir,electronDir,copy,exec,throwError,paths:getPaths} = require("./utils");
 
 
 const dir = path.resolve(__dirname);
@@ -59,7 +59,7 @@ program.command('electron')
     if(projectRoot == dir){
         throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
     }
-    const pathsJSON = path.resolve(electronDir,"paths.json");
+    const pathsJSON = path.resolve(electronDir,getPaths(projectRoot));
     if(!fs.existsSync(pathsJSON)){
       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.");
     }
@@ -85,6 +85,7 @@ program.command('electron')
            electronDir,
            electronProjectRoot,
            paths,
+           pathsJSON
         });
     }
     require("../electron/create-index-file")(electronProjectRoot);

package/bin/init.js

@@ -4,13 +4,14 @@ const exec = require("../electron/utils/exec");
 const createDir = require("../electron/utils/createDir");
 const writeFile = require("../electron/utils/writeFile");
 const copy = require("../electron/utils/copy");
+const paths = require("../electron/utils/paths");
 const electronDir = path.resolve(__dirname,"..","electron");
 const createIndexFile = require("../electron/create-index-file");
 const appSuffix = " Desktop";
 const mainPackage = require("../package.json");
 const mainPackageName = mainPackage.name;
 
-module.exports = ({projectRoot,electronProjectRoot})=>{
+module.exports = ({projectRoot,electronProjectRoot,paths,pathsJSON})=>{
     return new Promise((resolve,reject)=>{
         //make shure electron project root exists
         if(!createDir(electronProjectRoot)){
@@ -57,6 +58,11 @@ module.exports = ({projectRoot,electronProjectRoot})=>{
         /**** copying all electron utils files */
         const utilsPath = path.resolve(electronProjectRoot,"utils");
         copy(path.resolve(electronDir,"utils"),utilsPath);
+        if(pathsJSON && fs.existsSync(pathsJSON)){
+            try {
+                copy(pathsJSON,path.resolve(electronProjectRoot,"paths.json"));
+            } catch(e){}
+        }
         console.log("installing package dependencies ...");
         return exec({
             cmd : "npm install",// --prefix "+electronProjectRoot,

package/bin/package.js

@@ -1,5 +1,6 @@
 const getIcon = require("../electron/utils/getIcon");
 const path = require("path");
+const path = require("../electron/utils/paths");
 const defaultFunc = (cb,cb2) => typeof cb =='function' ? cb : typeof cb2 ==='function'? cb2 : x=> x;
 const paths = require("../electron/paths.json");
 const images = paths.$images, assets = paths.$assets, logo = paths.logo;

package/electron/index.js

@@ -276,10 +276,11 @@ ipcMain.on("electron-toggle-dev-tools",function(event,value) {
 
 
 app.whenReady().then(() => {
+  const readOpts = {toggleDevTools,window:win,win};
   if(typeof mainProcess.whenReady =='function'){
-     mainProcess.whenReady();
+     mainProcess.whenReady(readOpts);
   } else if(typeof mainProcess.appOnReady =='function'){
-     mainProcess.appOnReady();
+     mainProcess.appOnReady(readOpts);
   }
   globalShortcut.register('CommandOrControl+F12', () => {
     toggleDevTools();

package/electron/init/main.js

@@ -10,12 +10,17 @@
 module.exports = {
     /***** 
         @must return Instance of Browser window
+        width: 500, height: 400, transparent: true, frame: false, 
+        alwaysOnTop: true
     */
-    splashScreen : function(){
+    splashScreen : function({width, height, transparent, frame, alwaysOnTop}){
         return null;
     },
-    /*** this function is called when app is ready */
-    whenReady : function(){
+    /*** this function is called when app is ready 
+        toggleDevTools : {function},la fonction permettant de toggle les outils de developements
+        window : {BrowserWindow}, le browser window principal de l'application
+    */
+    whenReady : function({toggleDevTools,window,win}){
     
     }
 }

package/electron/is-initialized.js

@@ -7,6 +7,7 @@ module.exports = (projectRoot)=>{
         && 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"))
         
     && true || false;
 }

package/electron/utils/index.js

@@ -4,8 +4,9 @@ module.exports = {
     writeFile : require("./writeFile"),
     copy : require("./copy"),
     electronDir : path.resolve(__dirname, ".."),
+    paths : require("./paths"),
     exec : require("./exec"),
-    thowError : (...args)=>{
+    throwError : (...args)=>{
         console.error(...args);
         process.exit(-1);
     },

package/electron/utils/paths.js

@@ -0,0 +1,13 @@
+
+/**** permet de retourner le chemin des fichier, généré via les alias paths.json
+    contenant la liste des fichiers de l'application
+*/
+const fs = require("fs");
+const path = requrie("path");
+
+
+export default function (projectRoot){
+    projectRoot = projectRoot && fs.existsSync(projectRoot) && projectRoot || process.cwd();
+    const mainPackage = require("../../package.json");
+    return path.resolve(projectRoot,"node_modules",mainPackage.name,"paths.json");
+}

package/package.json

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