@fto-consult/expo-ui 8.20.7 → 8.21.0

package/babel.config.alias.js

@@ -11,7 +11,7 @@ module.exports = (opts)=>{
     opts.projectRoot = opts.projectRoot || projectRoot;
     opts.withPouchDB = opts.withPouchDB !== false && opts.withPouchdb !== false ? true : false;
     delete opts.withPouchdb;
-    const expoUI = require("./expo-ui-path")();
+    const expoUI = opts.isWeb === true ? require("./expo-ui-path")() : path.resolve(projectRoot,"node_modules","@fto-consult","expo-ui");
     const r = require("@fto-consult/common/babel.config.alias")(opts);
     const expo = path.resolve(expoUI,"src");
     r["$ecomponents"] = r["$expo-components"] = path.resolve(expo,"components");
@@ -64,9 +64,7 @@ module.exports = (opts)=>{
     }
     r.$eutils = path.resolve(expo,"utils");
     r.$ehooks = path.resolve(expo,"context","hooks");
-    ///le chemin racine du projet expo-ui
     r["$expo-ui-root-path"] = r["$expo-ui-root"]= path.resolve(expo,"..");
-    
     const $electron = path.resolve(dir,"electron");
     //le chemin ver le repertoire electron
     r.$eelectron = r["$e-electron"] = $electron;

package/babel.config.js

@@ -1,19 +1,22 @@
+const path = require("path");
+const fs = require("fs");
+
 module.exports = function(api,opts) {
+  api.cache(true);
   opts = typeof opts =='object' && opts ? opts : {};
-  api = api && typeof api =='object'? api : {};
-  ///les chemin vers la variable d'environnement, le chemin du fichier .env,@see : https://github.com/brysgo/babel-plugin-inline-dotenv
-  //console.log(environmentPath," is envvv ",opts);
-  const path = require("path");
-  const fs = require("fs");
-  typeof api.cache =='function' && api.cache(true);
   const inlineDovOptions = { unsafe: true};
-  const options = {...opts,platform:"expo"};
+  const platform = api.caller(caller => caller && caller.platform);
+  const isWeb = platform === 'web';
+  const options = {...opts,isWeb,isAndroid:platform==="android",isIos : platform==="ios",platform:"expo"};
   const environmentPath = require("./copy-env-file")();
   if(environmentPath && fs.existsSync(environmentPath)){
     inlineDovOptions.path ='./.env';
   }
   /*** par défaut, les variables d'environnements sont stockés dans le fichier .env situé à la racine du projet, référencée par la prop base  */
   const alias =  require("./babel.config.alias")(options);
+  if(typeof options.aliasMutator =="function"){
+    options.aliasMutator(alias);
+  }
   require(`${path.resolve(__dirname,"bin","generate-tables")}`)();//génère les tables des bases de données
   const plugins = (Array.isArray(opts.plugins) ? options.plugins : []);
   let reanimated = "react-native-reanimated/plugin";

package/metro.config.js

@@ -6,8 +6,7 @@ module.exports = function(opts){
   let {assetExts,sourceExts} = opts;
   assetExts = Array.isArray(assetExts)? assetExts: [];
   sourceExts= Array.isArray(sourceExts)?sourceExts : [];
-  const projectRoot = path.resolve(process.cwd());
-  const localDir = path.resolve(__dirname);
+  const projectRoot = typeof opts.projectRoot =="string" && opts.projectRoot && fs.existsSync(path.resolve(opts.projectRoot))? path.resolve(opts.projectRoot) : path.resolve(process.cwd());
   const transpilePath = null;//require("./create-transpile-module-transformer")(opts);
   const hasTranspilePath = typeof transpilePath =='string' && transpilePath && fs.existsSync(transpilePath);
   //@see : https://docs.expo.dev/versions/latest/config/metro/
@@ -38,15 +37,21 @@ module.exports = function(opts){
       ...sourceExts,"txt",
       'jsx', 'js','tsx',
   ]
-  
+  config.watchFolders = Array.isArray(config.watchFolders)? config.watchFolders : [];
+  let hasFTO = false;
+  for(let i in config.watchFolders){
+      if(typeof config.watchFolders[i] ==="string" && config.watchFolders[i].includes("@fto-consult")){
+        hasFTO = true;
+      }
+  }
+  if(!hasFTO){
+      config.watchFolders.push(path.resolve(projectRoot,"node_modules","@fto-consult"))
+  }
   // 3. Force Metro to resolve (sub)dependencies only from the `nodeModulesPaths`
   config.resolver.disableHierarchicalLookup = true;
   
   // Remove all console logs in production...
   config.transformer.minifierConfig.compress.drop_console = false;
   
-  // 3. Force Metro to resolve (sub)dependencies only from the `nodeModulesPaths`, @see : https://docs.expo.dev/guides/monorepos/
-  config.resolver.disableHierarchicalLookup = true;
-  
   return config;
 }

package/package.json

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