@fto-consult/expo-ui 7.4.32 → 7.4.34

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} = require("./utils");
+const  {createDir,electronDir,copy,exec,throwError,paths:getPaths,writeFile,isValidUrl} = require("./utils");
 
 
 const dir = path.resolve(__dirname);
@@ -50,13 +50,13 @@ program.command('electron')
   //.option('-s, --splash [dir]', 'le chemin (relatif au project root) du fichier du splash screen de l\'application')
   .option('-o, --out [dir]', 'le chemin (relatif au project root) du répertoire qui contiendra les fichiers build')
   .option('-u, --url [url]', 'le lien url qui sera ouvert par l\'application')
-  .option('-i, --compile [url]', 'le lien url qui sera ouvert par l\'application')
+  .option('-b, --build [boolean]', 'si ce flag est spécfifié alors l\'application sera compilée')
   .option('-a, --arch [architecture]', 'l\'architecture de la plateforme')
   .option('-p, --platform [platform]', 'la plateforme à utiliser pour la compilation')
   .action((script, options) => {
     const electronProjectRoot = path.resolve(projectRoot,"electron");
     const opts = Object.assign({},typeof options.opts =='function'? options.opts() : options);
-    let {out,arch,url,compile,platform} = opts;
+    let {out,arch,url,build,platform} = opts;
     //let {projectRoot} = opts;
     if(projectRoot == dir){
         throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
@@ -122,7 +122,7 @@ program.command('electron')
     let cmd = undefined;
     const start = x=>{
        return new Promise((resolve,reject)=>{
-        cmd = `electron "${electronProjectRoot}"${url? ` --url ${url}`:''} --paths ${pathsJSON} --root ${projectRoot}`;
+        cmd = `electron "${electronProjectRoot}" --paths ${pathsJSON} --root ${projectRoot} ${isValidUrl(url)? ` --url ${url}`:''}`;
           exec({
             cmd, 
             projectRoot : electronProjectRoot,
@@ -143,7 +143,7 @@ program.command('electron')
             reject("dossier web-build exporté par electron innexistant!!");
           }
         }
-        if(!url && (compile || script ==="build" || !fs.existsSync(path.resolve(webBuildDir,"index.html")))){
+        if(!url && (build || script ==="build" || !fs.existsSync(path.resolve(webBuildDir,"index.html")))){
           console.log("exporting expo web app ...");
           try {
             writeFile(packagePath,JSON.stringify({...packageObj,homepage:"./"},null,"\t"));

package/electron/index.js

@@ -20,6 +20,7 @@ const projectRoot = mainProjectRoot && fs.existsSync(mainProjectRoot) ? mainProj
 const electronProjectRoot = projectRoot && fs.existsSync(path.resolve(projectRoot,"electron")) && path.resolve(projectRoot,"electron") || '';
 const ePathsJSON = path.resolve(electronProjectRoot,"paths.json");
 const packageJSONPath = path.resolve(projectRoot,"package.json");
+const isValidUrl = require("./utils/isValidUrl");
 const packageJSON = fs.existsSync(packageJSONPath) ? require(`${packageJSONPath}`) : {};
 const eePaths = path.resolve(getPaths(projectRoot));
 if(!paths){
@@ -115,7 +116,7 @@ function createBrowserWindow (options){
       _win.setMenuBarVisibility(false)
       _win.setAutoHideMenuBar(true)
   }
-  const url = options.loadURL && typeof options.loadURL ==='string'? options.loadURL : pUrl || undefined;
+  const url = isValidUrl(options.loadURL) ? options.loadURL : isValidUrl(pUrl) ? pUrl : undefined;
   if(url){
     _win.loadURL(url);
   }
@@ -129,7 +130,6 @@ function createBrowserWindow (options){
   });
   return _win;
 }
-const args = require("./utils/parseArgs")();
 function createWindow () {
   // Créer le browser window
   win = createBrowserWindow({
@@ -191,8 +191,8 @@ function createWindow () {
         win.webContents.send('before-app-exit');
       }
   });
-  if(args.url){
-    win.loadURL(args.url);
+  if(isValidUrl(pUrl)){
+    win.loadURL(pUrl);
   } else {
     win.loadFile(path.resolve(path.join(electronProjectRoot,"dist",'index.html')))
   }
@@ -437,9 +437,8 @@ ipcMain.on('close-main-render-process', _ => {
 function debounce(func, wait, immediate) {
   var timeout;
 
-  return function executedFunction() {
+  return function executedFunction(...args) {
     var context = this;
-    var args = arguments;
 	    
     var later = function() {
       timeout = null;

package/electron/init/main.js

@@ -9,9 +9,10 @@
 
 module.exports = {
     /***** 
-        @must return Instance of Browser window
-        width: 500, height: 400, transparent: true, frame: false, 
-        alwaysOnTop: true
+        must return an Instance of Browser window
+        width: 500, height: 400, transparent: true, frame: false, alwaysOnTop: true
+        @param {width{number|500},{height{number|400}},transparent{boolean|true}, frame{boolean|false}, alwaysOnTop{boolean|true}}
+        @return {InstanceOf(BrowserWindow)}
     */
     splashScreen : function({width, height, transparent, frame, alwaysOnTop}){
         return null;

package/electron/utils/index.js

@@ -10,6 +10,7 @@ module.exports = {
         console.error(...args);
         process.exit(-1);
     },
+    isValidUrl : require("./isValidUrl"),
     createDirSync : require("./createDirSync"),
     ...require("./dependencies"),
     isObj : x=> typeof x =="object" && x && !Array.isArray(x),

package/electron/utils/isValidUrl.js

@@ -0,0 +1,4 @@
+module.exports = (str)=>{
+    if(typeof str !=='string' || !str) return false;
+    return /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/.test(str);
+};

package/electron/utils/postMessage.js

@@ -13,7 +13,7 @@ module.exports = function(message,...params){
     const opts = message && typeof message =='object' && !Array.isArray(message) ? message : {};
     message = opts.message;
     if(!message || typeof message !='string') return null;
-    opts.params = Array.isArray(opts.params) && opts.params || Array.isArray(params) &&  params || [];
+    opts.params = Array.isArray(opts.params) && opts.params || params;
     opts.message = "ELECTRON_MESSAGE/"+message.trim();
     return window.postMessage(opts);
 }

package/package.json

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