@fto-consult/expo-ui 7.5.45 → 7.6.2

package/babel.config.alias.js

@@ -1,5 +1,6 @@
 const path = require("path");
 const fs = require("fs");
+
 module.exports = (opts)=>{
     const isLocalDev = require("./is-local-dev")();
     const dir = path.resolve(__dirname);
@@ -77,16 +78,7 @@ module.exports = (opts)=>{
     ///le chemin racine du projet expo-ui
     r["$expo-ui-root-path"] = r["$expo-ui-root"]= path.resolve(expo,"..");
     
-    const $assets = r.$assets;
     const $electron = path.resolve(dir,"electron");
-    const electronPaths = {
-        ...r,
-        sourceCode : r.$src,
-        assets : $assets,
-        images : r.$images,
-        projectRoot : projectRoot,//la racine au projet
-        electron : $electron,//le chemin racine electron
-    };
     //le chemin ver le repertoire electron
     r.$eelectron = r["$e-electron"] = $electron;
     r.$electron = r.$electron || r.$eelectron;
@@ -97,16 +89,6 @@ module.exports = (opts)=>{
     if(!r.$context){
         r.$context = r.$econtext;
     }
-    const electronAssetsPath = path.resolve(dir,"electron","assets");
-    if($assets){
-        const l1 = path.resolve($assets,"logo.png"), l2 = path.resolve($assets,"logo.png");
-        const logoPath = fs.existsSync(l1)? l1 : fs.existsSync(l2)? l2 : undefined;
-        const ePath = path.resolve(electronAssetsPath,"images","logo.png");
-        if(logoPath && require("./electron/utils/createDir")(ePath)){
-            fs.copyFileSync(logoPath,ePath,fs.constants.COPYFILE_FICLONE);
-            electronPaths.logo = logoPath;
-        }
-    }
     r["$erealm"] = path.resolve(expo,'realm');
     if(!r.$realm){
         r.$realm = r.$erealm;

package/bin/index.js

@@ -8,19 +8,10 @@
 'use strict';
 
 const { program } = require('commander');
-const path= require("path");
-const fs = require("fs");
-const  {createDir,electronDir,copy,exec,throwError,writeFile,isValidUrl} = require("./utils");
 
-
-const dir = path.resolve(__dirname);
-const projectRoot = path.resolve(process.cwd());
 const packageObj = require("../package.json");
 const version = packageObj.version;
-const description = packageObj.description;
 const packageName = packageObj.name;
-const localElectronPackage = path.resolve(projectRoot,"node_modules",packageName)
-const localElectronPackageElectron = path.resolve(localElectronPackage,"electron");
 
 program
   .name(packageName)
@@ -41,148 +32,5 @@ program.command('generate-getTable')
   .action((src, options) => {
     require("./generate-tables")();
   });
-  
-program.command('electron')
-  .description('utilitaire cli pour la plateforme electron. NB : Le package electron doit être installé globalement via l\'instruction npm i -g electron')
-  .argument('<cmd>', 'la commande à exécuter (start,init,build,package). Start permet de démarrer le script electron, init permet d\'initialiser l\'application, build permet de compiler le code expo (exporter), package permet d\'effectuer le packaging de l\'application pour la distribution')
-  //.option('-r, --project-root [dir]', 'le project root de l\'application')
-  //.option('-c, --config [dir]', 'le chemin (relatif au project root) du fichier de configuration de l\'application 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 du répertoire qui contiendra les fichiers build, des fichiers du exporté par le framework expo; commande : build|start')
-  .option('-u, --url [url]', 'le lien url qui sera ouvert par l\'application; commande start')
-  .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, --icon [iconPath]', 'le chemin vers le dossier des icones de l\'application : (Dans ce dossier, doit contenir une image icon.ico pour window, icon.incs pour mac et icon.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,icon} = opts;
-    if(projectRoot == dir){
-        throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
-    }
-    
-    const isElectionInitialized = require("../electron/is-initialized")(electronProjectRoot);
-    process.env.isElectron = true;
-    process.env.isElectronScript = true;
-    const buildOutDir = path.resolve(electronProjectRoot,"dist");
-    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;
-    icon = icon && typeof icon =="string" && fs.existsSync(path.resolve(icon)) && icon || undefined;
-    require("../electron/create-index-file")({electronProjectRoot,appName:packageObj.name,icon});
-    if(fs.existsSync(electronProjectRoot)){
-      const mainPackagePath = path.resolve(electronProjectRoot,"package.app.json");
-      try {
-        const mainPackageAppJSON = fs.existsSync(mainPackagePath)? require(mainPackagePath) : {};
-        writeFile(mainPackagePath,JSON.stringify({...packageObj,...mainPackageAppJSON,name:packageObj.name,icon:icon||mainPackageAppJSON.icon||undefined},null,"\t"));
-      } catch{}
-    }
-    
-    if(!isElectionInitialized || script =='init'){
-        if(script !=='init'){
-            console.log("initializing electron application before ....");
-        }
-        return require("./init")({
-           projectRoot,
-           electronDir,
-           electronProjectRoot,
-           icon,
-        });
-    }
-    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 start = x=>{
-       return new Promise((resolve,reject)=>{
-        cmd = `electron "${electronProjectRoot}"  ${icon ? `--icon ${path.resolve(icon)}`:""} ${isValidUrl(url)? ` --url ${url}`:''}`; //--root ${electronProjectRoot}
-          exec({
-            cmd, 
-            projectRoot : electronProjectRoot,
-          }).finally(()=>{
-            console.log("ant to exit");
-          })
-          typeof (resolve) =='function' && setTimeout(resolve,1000);
-      })
-    };
-    if(url){
-      return start().then(process.exit);
-    }
-    const promise = new Promise((resolve,reject)=>{
-      const next = ()=>{
-          if(fs.existsSync(webBuildDir)){
-              return copy(webBuildDir,buildOutDir).catch(reject).then(resolve);
-          } else {
-            reject("dossier web-build exporté par electron innexistant!!");
-          }
-        }
-        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"));
-          } catch{}
-            cmd = "npx expo export:web";
-            return exec({cmd,projectRoot}).then(next).catch(reject).finally(()=>{
-              try {
-                writeFile(packagePath,JSON.stringify({...packageObj,homepage},null,"\t"));
-              } catch{}
-            });
-        }
-        next();
-    });
-    return promise.then(()=>{
-      if(!fs.existsSync(buildOutDir) || !fs.existsSync(indexFile)){
-         throwError("répertoire d'export web invalide où innexistant ["+buildOutDir+"]");
-      }
-      switch(script){
-          case "start":
-             return start();
-            break;
-          case "build":
-            break;
-          case "package" :
-            if(packageImport || opts.import){ //on importe le projet existant electron forge, @see : https://www.electronforge.io/import-existing-project
-              console.log("importing electron forge existing project....");
-              cmd = "npm install --save-dev @electron-forge/cli";
-              return exec({cmd,projectRoot:electronProjectRoot}).finally(()=>{
-                cmd = `npm exec --package=@electron-forge/cli -c "electron-forge import"`;
-                return exec({cmd,projectRoot:electronProjectRoot}).then(()=>{
-                  console.log("package electron forge importé avec succèss");
-                });
-              });
-                
-            } else {
-              cmd = `npx electron-forge package ${platform? `--platform="${platform}"`:""} ${arch?`--arch="${arch}"`:""}`;
-              const electronPackagePath = path.resolve(electronProjectRoot,'package.json');
-              const electronPackageJSON = require(electronPackagePath);
-              try {
-                writeFile(electronPackagePath,JSON.stringify({...electronPackageJSON,name:packageObj.name||electronPackageJSON.realName||electronPackageJSON.name},null,"\t"));
-              } catch{}
-                return exec({cmd,projectRoot:electronProjectRoot}).then(()=>{
-                  console.log("application package avec succèss");
-                }).finally(()=>{
-                    try {
-                      writeFile(electronPackagePath,JSON.stringify(electronPackageJSON,null,"\t"));
-                    } catch{}
-                });
-            }
-           break;
-      }
-    }).catch((e)=>{
-      console.log(e," is cathing ggg");
-    }).finally(()=>{
-      process.exit();
-    });
-
-  });
 
   program.parse();

package/bin/update-appex-chart.js

@@ -1,6 +1,6 @@
 const path = require("path");
 const fs = require("fs");
-const {writeFile} = require("../electron/utils")
+const {writeFile} = require("../bin/utils")
 const $ecomponents = path.resolve("./src/components");
 const eAppex  = path.resolve($ecomponents,"Chart","appexChart");
 const cwdApexChart = path.resolve(process.cwd(),"node_modules","apexcharts","dist","apexcharts.min.js");

package/bin/update-pdfmake.js

@@ -1,6 +1,6 @@
 const path = require("path");
 const fs = require("fs");
-const {writeFile} = require("../electron/utils")
+const {writeFile} = require("../bin/utils")
 const ePdfmake  = path.resolve("./src","pdf","pdfmake");
 const pdfmakeBuildPath = path.resolve(process.cwd(),"node_modules","pdfmake","build");
 const pdfmakePath = path.resolve(pdfmakeBuildPath,"pdfmake.min.js"),

package/bin/utils.js

@@ -1 +1 @@
-module.exports = require("../electron/utils");
+module.exports = require("@fto-consult/electron/src/utils");

package/copy-env-file.js

@@ -1,10 +1,7 @@
 const fs = require("fs");
-const fsExtra = require("fs-extra");
 const path = require("path");
-const writeFile = require("./electron/utils/writeFile");
-/*** create and copy environment path to this directory
- * 
- */
+const {writeFile,copy} = require("./bin/utils");
+
 module.exports = (projectRoot,forceCreate)=>{
     const env = typeof process.env.NODE_ENV =="string" && process.env.NODE_ENV.toLowerCase().trim() || "development";
     const isDevEnv = 'development' === env;
@@ -16,7 +13,7 @@ module.exports = (projectRoot,forceCreate)=>{
     if(environmentPath && fs.existsSync(environmentPath)){
         // File ".env" will be created or overwritten by default.
         try {
-          fsExtra.copySync(environmentPath, localEnv,{overwrite:true});
+          copy(environmentPath, localEnv,{overwrite:true});
         }
         catch (e){}
     } 

package/create-transpile-module-transformer.js

@@ -1,4 +1,4 @@
-const {writeFile} = require("./electron/utils");
+const {writeFile} = require("./bin/utils");
 const fs = require("fs"), path = require("path");
 module.exports = function(opts){
     opts = typeof opts =='object'&& opts || {};

package/find-licenses.js

@@ -96,7 +96,7 @@ const findLicencesMain = (options)=>{
         for(let i in  s){
             content[s[i]] = openLibraries[s[i]]
         }
-        fs.writeFileSync(outputPath, "module.exports = "+JSON.stringify(content)+";");
+        fs.writeFileSync(outputPath, "module.exports = "+JSON.stringify(content,null,"\t")+";");
     } else {
         return ({
             error : true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.5.45",
+  "version": "7.6.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -44,7 +44,7 @@
     "test-bin": "node ./bin/index.js",
     "update-appexchart": "npm run update-apexchart",
     "delete-node-modules": "rimraf ./**/node_modules",
-    "extract-asar" : "npx @electron/asar extract app.asar <destfolder>",
+    "extract-asar": "npx @electron/asar extract app.asar <destfolder>",
     "dev": "npx expo start --no-dev --minify -c",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
     "update": "npm i pdfmake@latest expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @emotion/native@latest @fto-consult/common@latest @react-navigation/stack react-native-blob-util  react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest react-native-web@latest react-dom@latest && npx expo install --fix && npm run update-apexchart && npm run update-pdfmake && npm run find-licenses"
@@ -73,6 +73,7 @@
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
     "@fto-consult/common": "^3.73.10",
+    "@fto-consult/electron": "^1.0.2",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",
@@ -84,7 +85,6 @@
     "@shopify/flash-list": "1.4.3",
     "apexcharts": "^3.45.0",
     "commander": "^11.1.0",
-    "conf": "^10.2.0",
     "expo": "^49.0.21",
     "expo-camera": "~13.4.4",
     "expo-clipboard": "~4.3.1",
@@ -102,7 +102,6 @@
     "htmlparser2-without-node-native": "^3.9.2",
     "is-plain-obj": "^4.1.0",
     "js-base64": "^3.7.5",
-    "node-machine-id": "^1.1.12",
     "pdfmake": "^0.2.8",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",