@fto-consult/expo-ui 1.1.30 → 1.1.32

package/babel.config.alias.js

@@ -1,7 +1,6 @@
 const path = require("path");
 module.exports = (opts)=>{
     const dir = path.resolve(__dirname);
-    const expo = path.resolve(dir,"src");
     const assets = path.resolve(dir,"assets");
     opts = typeof opts =='object' && opts ? opts : {};
     opts.platform = "expo";
@@ -9,7 +8,10 @@ module.exports = (opts)=>{
     opts.base = opts.base || dir;
     opts.withPouchDB = opts.withPouchDB !== false && opts.withPouchdb !== false ? true : false;
     delete opts.withPouchdb;
-    const r = require("@fto-consult/common/babel.config.alias")(opts);
+    const src = path.resolve(opts.base);
+    const expo = require("./lookup-expo-ui-path")()?path.resolve(src,"..","expo-ui") : path.resolve(dir,"src");
+    console.log(expo," is expo heee ",`${expo}/node_modules/common/babel.config.alias`);
+    const r = require(`${expo}/node_modules/common/babel.config.alias`)(opts);
     r["$eauth"] = path.resolve(expo,"auth");
     r["$ecomponents"] = r["$expo-components"] = path.resolve(expo,"components");
     r["$components"] = r["$components"] || r["$ecomponents"];
@@ -67,7 +69,6 @@ module.exports = (opts)=>{
     if(!r["$logoComponent"]){
         r["$logoComponent"] = r["$elogoComponent"];
     }
-
     if(typeof opts.mutator =='function'){
         opts.mutator(r);
     }

package/expo-ui-path.js

@@ -4,11 +4,10 @@
 
 const fs = require("fs");
 const path = require("path");
-const dir = path.resolve(__dirname)
 ///retourne le chemin vers le package @expo-ui
 module.exports = function (...args){
     const suffix = path.join(...args);
-    const p = lookupForExpoUIPath();
+    const p = require("./lookup-expo-ui-path")();
     const sep = path.sep;
     if(p && fs.existsSync(p)){
         const rootPath = path.resolve(p,"..");
@@ -20,21 +19,3 @@ module.exports = function (...args){
     return suffix ? path.join("@fto-consult/expo-ui",suffix).replace(sep,"/"):"@fto-consult/expo-ui";
 };
 
-const lookupForExpoUIPath = ()=>{
-    let level = 4; //jusqu'à 4 niveaux
-    let expoUIPath= null;
-    let rootPath = path.resolve(dir);
-    while(level>0 && !expoUIPath){
-        const p = path.resolve(rootPath,"expo-ui");
-        const nPath = path.resolve(rootPath,"node_modules");
-        const srcPath = path.resolve(rootPath,"src");
-        const babelPath = path.resolve(rootPath,"babel.config.js");
-        if(fs.existsSync(p) && fs.existsSync(nPath) && fs.existsSync(srcPath) && fs.existsSync(babelPath)){
-            expoUIPath = p;
-            return expoUIPath;
-        }
-        rootPath = path.resolve(rootPath,"..");
-        level = level-1;
-    }
-    return expoUIPath;
-}

package/lookup-expo-ui-path.js

@@ -0,0 +1,24 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+const fs = require("fs");
+const path = require("path");
+const dir = path.resolve(__dirname)
+module.exports = function lookupForExpoUIPath (){
+    let level = 4; //jusqu'à 4 niveaux
+    let expoUIPath= null;
+    let rootPath = path.resolve(dir);
+    while(level>0 && !expoUIPath){
+        const p = path.resolve(rootPath,"expo-ui");
+        const nPath = path.resolve(rootPath,"node_modules");
+        const srcPath = path.resolve(rootPath,"src");
+        const babelPath = path.resolve(rootPath,"babel.config.js");
+        if(fs.existsSync(p) && fs.existsSync(nPath) && fs.existsSync(srcPath) && fs.existsSync(babelPath)){
+            expoUIPath = p;
+            return expoUIPath;
+        }
+        rootPath = path.resolve(rootPath,"..");
+        level = level-1;
+    }
+    return expoUIPath;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "1.1.30",
+  "version": "1.1.32",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {