@fto-consult/expo-ui 8.20.7 → 8.21.1

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/{app.json → bin/create-app/app.json}

@@ -1,22 +1,22 @@
-{
-  "expo": {
-    "name": "expo-ui",
-    "slug": "fto-consult-expo-ui",
-    "scheme": "fto-consult-expo-ui",
-    "version": "1.0.0",
-    "orientation": "portrait",
-    "expoSdkVersion" : "50",
-    "web": {
-      "bundler": "webpack"
-    },
-    "android": {
-      "package": "com.borispipo.ftoconsultexpoui"
-    },
-    "extra": {
-      "eas": {
-        "projectId": "b895ce11-4941-4ea9-80da-b24d5abb4483"
-      }
-    }
-  },
-  "userInterfaceStyle": "automatic"
-}
+{
+  "expo": {
+    "name": "expo-ui",
+    "slug": "fto-consult-expo-ui",
+    "scheme": "fto-consult-expo-ui",
+    "version": "1.0.0",
+    "orientation": "portrait",
+    "expoSdkVersion" : "50",
+    "web": {
+      "bundler": "webpack"
+    },
+    "android": {
+      "package": "com.borispipo.ftoconsultexpoui"
+    },
+    "extra": {
+      "eas": {
+        "projectId": "b895ce11-4941-4ea9-80da-b24d5abb4483"
+      }
+    }
+  },
+  "userInterfaceStyle": "automatic"
+}

package/bin/create-app.js

@@ -207,7 +207,7 @@ const createAPPJSONFile = (projectRoot,{name,version})=>{
             appJSONManager.save();
         }
     const eas = path.resolve(projectRoot,"eas.json");
-    const cEas = path.resolve(__dirname,"..","eas.json");
+    const cEas = path.resolve(__dirname,"create-app","eas.json");
     if(!fs.existsSync(eas) && fs.existsSync(cEas)){
       try {
         copy(cEas,eas,{overwrite:false})

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.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -37,8 +37,7 @@
     "logcat-export": "adb -d logcat com.ftc.apps.salite1 *:S > logcat.txt",
     "electron-c": "npm run compile-electron && npm run electron",
     "electron-p": "npm run compile-electron-p && npm run electron",
-    "update-app-version": "node ./update-app-version.js",
-    "find-licenses": "node ./find-licenses.js",
+    "find-licenses": "node ./bin/find-licenses.js",
     "fix-dependencies": "expo-cli doctor --fix-dependencies",
     "expo-fix": "npx expo install --fix",
     "update-apexchart": "node ./bin/update-appex-chart.js",

package/edit-json-file.js

@@ -1,41 +0,0 @@
-/*** met à jour dynamiquement la version de l'application */
-const jsonfile = require('jsonfile');
-const fs = require('fs')
-
-function recursiveUpdate(initial, update,recursiveArray){
-  initial = initial && typeof initial == 'object'? initial : {};
-  for(prop in update){
-      if({}.hasOwnProperty.call(update, prop)){
-          if(update[prop] && typeof update[prop] === 'object'){
-              if(Array.isArray(update[prop]) && recursiveArray !==false){
-                initial[prop] = update[prop];
-              } else {
-                recursiveUpdate(initial[prop], update[prop],recursiveArray);
-              }
-          } else if(typeof update[prop] == 'string' && update[prop] ) {
-              initial[prop] = update[prop].toString().replace(/\+/g, ' ');
-          }
-      }
-  }
-  return initial;
-}
-
-function  editJsonFile(packagePath,config){
-  if(!fs.existsSync(packagePath)) return;
-  try {
-      let packaged = jsonfile.readFileSync(packagePath);
-      if(!config || typeof config != 'object') return false;
-      recursiveUpdate(packaged,config);
-      jsonfile.writeFileSync(packagePath, packaged, {spaces: 4})
-      return true;
-  }
-  catch (e) {
-      process.stdout.write('An exception occurred:\n')
-      process.stdout.write('    ' + e.message)
-      process.stdout.write('\n')
-      process.exit(1)
-  }
-}
-
-
-module.exports = editJsonFile;

package/env.js

@@ -1,11 +0,0 @@
-
-//permet de retourner le contenu de la variable d'environnement .env de l'application//
-module.exports = function(){
-    const fs = require("fs");
-    const path = require("path");
-    try {
-        const envPath = path.resolve(process.cwd(),".env");
-        return fs.existsSync(envPath)? require("./parse-env")(fs.readFileSync(envPath,'utf8')) : {};
-    } catch{}
-    return {};
-}

package/expo-ui-root-path.old.js

@@ -1,16 +0,0 @@
-if(isDevEnv){
-    const rootPath = process.cwd();
-    const src = path.resolve(rootPath,"src");
-    try {
-        const envObj = require("./parse-env")();
-        const euPathm = typeof envObj.EXPO_UI_ROOT_PATH =="string" && envObj.EXPO_UI_ROOT_PATH && path.resolve(envObj.EXPO_UI_ROOT_PATH)||'';
-        const eu = euPathm && fs.existsSync(euPathm)? euPathm : null;
-        if(eu &&  fs.existsSync(path.resolve(eu,"src")) && fs.existsSync(path.resolve(eu,"webpack.config.js"))){
-            return path.resolve(eu,suffix).replace(sep,(sep+sep));
-        }
-    } catch{}
-    const expoUi = path.resolve(rootPath,"expo-ui");
-    if(fs.existsSync(src) && fs.existsSync(expoUi) && fs.existsSync(path.resolve(expoUi,"webpack.config.js"))){
-        return path.resolve(expoUi,suffix).replace(sep,(sep+sep));
-    }
-}

package/main.js

@@ -1,4 +0,0 @@
-import { registerRootComponent } from 'expo';
-import App from "./App";
-
-registerRootComponent(App);

package/parse-env.js

@@ -1,47 +0,0 @@
-const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg
-const fs = require("fs");
-const path = require("path");
-// Parser src into an Object
-module.exports = function parse (src) {
-  if(typeof src !=='string' || !src.trim()){
-    try {
-        const envPath = path.resolve(process.cwd(),".env");
-        src = fs.existsSync(envPath)? fs.readFileSync(envPath,'utf8') :"";
-    } catch{}
-  }
-  if(typeof src !=='string' || !src) return {};
-  const obj = {}
-  // Convert buffer to string
-  let lines = src.toString()
-
-  // Convert line breaks to same format
-  lines = lines.replace(/\r\n?/mg, '\n')
-
-  let match
-  while ((match = LINE.exec(lines)) != null) {
-    const key = match[1]
-
-    // Default undefined or null to empty string
-    let value = (match[2] || '')
-
-    // Remove whitespace
-    value = value.trim()
-
-    // Check if double quoted
-    const maybeQuote = value[0]
-
-    // Remove surrounding quotes
-    value = value.replace(/^(['"`])([\s\S]*)\1$/mg, '$2')
-
-    // Expand newlines if double quoted
-    if (maybeQuote === '"') {
-      value = value.replace(/\\n/g, '\n')
-      value = value.replace(/\\r/g, '\r')
-    }
-
-    // Add to object
-    obj[key] = value
-  }
-
-  return obj
-}

package/update-app-version.js

@@ -1,19 +0,0 @@
-const editJsonFile = require("./edit-json-file.js");
-const fs = require("fs");
-/***** le fichier de configuration doit être stocké dans le repertoire /src/config.js où src est le repertoire source du projet parent qui a installé l'application */
-const run = () => {
-  const parentPackage = require("./parent-package");
-  if(!parentPackage) return;
-  console.log("before updating parent package version ",parentPackage)
-  const srcParent = path.dirname(parentPackage,"src","config.js");
-  if(fs.existsSync(srcParent)){
-    const appConfig = require(srcParent);
-    if(appConfig && typeof appConfig =='object'){
-      console.log("updating parent package version ",parentPackage)
-      let config = {version:appConfig.version};
-      editJsonFile(parentPackage,config);
-    } 
-  }
-}
-
-run();