@fto-consult/expo-ui 2.9.1 → 2.9.3

package/compiler.config.js

@@ -5,26 +5,24 @@ module.exports = function({config,isNext,nodeModulesPath,base,dir}){
     nodeModulesPath = Array.isArray(nodeModulesPath)? nodeModulesPath : [];
     config.resolve.modules = Array.isArray(config.resolve.modules)? config.resolve.modules:[]
     config.resolve.modules = [path.resolve(dir, 'node_modules'),path.resolve(root, 'node_modules'), 'node_modules',...nodeModulesPath,...config.resolve.modules];
-    if(!isNext){
-        config.module.rules.push({
-            test: /\.(js|jsx|ts|tsx)$/,
-            include: [
-                dir,
-                base,
-                path.resolve(dir,"node_modules","@fto-consult"),
-                /(common)/
-            ],
-            exclude:[
-                path.resolve(dir,"node_modules"),
-                path.resolve(root,"node_modules"),
-                /node_modules[/\\](?!react-native-paper|react-native|react-native-vector-icons|react-native-safe-area-view)/,
-                /(node_modules)/
-            ],
-            use: {
-              loader: 'babel-loader',
-            }
-        });
-    }
+    config.module.rules.push({
+        test: /\.(js|jsx|ts|tsx)$/,
+        include: [
+            dir,
+            base,
+            path.resolve(dir,"node_modules","@fto-consult"),
+            /(common)/
+        ],
+        exclude:[
+            path.resolve(dir,"node_modules"),
+            path.resolve(root,"node_modules"),
+            /node_modules[/\\](?!react-native-paper|react-native|react-native-vector-icons|react-native-safe-area-view)/,
+            /(node_modules)/
+        ],
+        use: {
+          loader: 'babel-loader',
+        }
+    });
     config.plugins.push(require("@fto-consult/common/circular-dependencies"));
     return config;
 }

package/expo-ui-path.js

@@ -4,47 +4,16 @@
 
 const fs = require("fs");
 const path = require("path");
-const { hideBin } = require('yargs/helpers')
-const yargs = require('yargs/yargs');
-let pathRef = {current:null};
-const metroConfig = "metro.config";
 ///retourne le chemin vers le package @expo-ui
 module.exports = function (...args){
-    const argv = yargs(hideBin(process.argv)).argv;
     const suffix = path.join(...args);
-    const isMetroConfig = suffix && suffix.toLowerCase().includes(metroConfig);
-    let isBuild = isMetroConfig ? false : pathRef.current ? true : false;
-    let expoUIPath = isBuild ? pathRef.current : "@fto-consult/expo-ui";
-    if(isMetroConfig && typeof argv == 'object' && argv && !Array.isArray(argv)){
-        for(let i in argv){
-            let v = argv[i];
-            if(typeof v !='string' || !v) continue;
-            v = v.toLowerCase(); 
-            i = (i+'').toLocaleLowerCase();
-            if(i != '$0'){
-                if(v.includes('production') || v.includes('export') || v.includes('android')){
-                    isBuild = true;
-                    break;
-                }
-            }
-        }
-    }
+    const expoUIPath = "@fto-consult/expo-ui";
     const sep = path.sep;
-    if(isBuild){
-        if(isMetroConfig){
-            pathRef.current = expoUIPath;
-        }
-        const pp = suffix ? path.join(expoUIPath,suffix).replace(sep,"/") : expoUIPath;
-        return pp;
-    }
     const p = require("./lookup-expo-ui-path")();
     if(p && fs.existsSync(p)){
         const rootPath = path.resolve(p,"..");
         const src = path.resolve(rootPath,"src");
         if(fs.existsSync(src) && fs.existsSync((path.resolve(rootPath,"babel.config.js")))){
-            if(isMetroConfig){
-                pathRef.current = path.resolve(p);
-            }
             return path.resolve(p,suffix).replace(sep,(sep+sep));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "resolutions": {
@@ -43,7 +43,8 @@
     "update-app-version": "node ./update-app-version.js",
     "find-licenses": "node ./find-licenses.js",
     "fix-dependencies": "expo doctor --fix-dependencies",
-    "delete-node-modules": "rimraf ./**/node_modules"
+    "delete-node-modules": "rimraf ./**/node_modules",
+    "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'"
   },
   "repository": {
     "type": "git",
@@ -67,7 +68,8 @@
     "@expo/metro-config": "^0.4.0",
     "@expo/vector-icons": "^13.0.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.14.16",
+    "@fto-consult/common": "^1.15.2",
+    "@fto-consult/expo-ui": "^2.9.2",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",
@@ -109,7 +111,6 @@
     "react-native-web": "~0.18.7",
     "react-native-webview": "11.23.1",
     "sharp-cli": "^2.1.0",
-    "tippy.js": "^6.3.7",
-    "yargs": "^17.1.1-candidate.0"
+    "tippy.js": "^6.3.7"
   }
 }

package/src/components/Countries/SelectCountry.js

@@ -7,6 +7,7 @@ import {defaultObj} from "$utils";
 import PropTypes from "prop-types";
 import {isNonNullString,isNumber,defaultStr} from "$utils";
 import Label from "$ecomponents/Label";
+import appConfig from "$capp/config";
 
 /**** retourne les props du champ de type countrie */
 export const getCountryFieldProps = (props)=>{
@@ -28,6 +29,7 @@ export const getCountryFieldProps = (props)=>{
                 <Label>{item.label}</Label>
             </View>
         },
+        defaultValue : appConfig.countryCode,
         ...defaultObj(rest),
     }
 }