@fto-consult/expo-ui 1.1.29 → 1.1.31

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}/babel.config.alias`);
+    const r = require(`${expo/node_modules}/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,49 +4,18 @@
 
 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,"..");
         const src = path.resolve(rootPath,"src");
         if(fs.existsSync(src) && fs.existsSync((path.resolve(rootPath,"babel.config.js")))){
-            const expoUIPath = path.resolve(rootPath,"expo-ui-build-path.js");
-            try {
-                var writeStream = fs.createWriteStream(expoUIPath);
-                writeStream.write("module.exports=\"./expo-ui/\";");
-                writeStream.end();
-                return path.resolve(p,suffix).replace(sep,(sep+sep));
-            } catch{
-                if(fs.existsSync(expoUIPath)){
-                    try {
-                        fs.rmSync(expoUIPath);
-                    } catch{}
-                }
-            }
+            return path.resolve(p,suffix).replace(sep,(sep+sep));
         }
     }
     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/metro.config.js

@@ -1,7 +1,6 @@
 const { getDefaultConfig } = require('@expo/metro-config');
 const path = require("path");
 const isCaseSensitive = require("./is-os-case-sensitive");
-const fs = require("fs");
 module.exports = (opts)=>{
   opts = opts && typeof opts =='object'? opts : {};
   let {dir,nodeModulesPaths,assetExts,sourceExts} = opts;
@@ -9,7 +8,6 @@ module.exports = (opts)=>{
   assetExts = Array.isArray(assetExts)? assetExts: [];
   sourceExts= Array.isArray(sourceExts)?sourceExts : [];
   dir = dir || path.resolve(__dirname);
-  require("./expo-ui-path")(path.basename(__filename));
   const projectRoot = path.resolve(dir);
   const localDir = path.resolve(__dirname);
   const config = getDefaultConfig(projectRoot);
@@ -17,16 +15,6 @@ module.exports = (opts)=>{
   if(projectRoot !== localDir){
     config.watchFolders.push(localDir);
   }
-  const eUI = path.resolve(projectRoot,"expo-ui-build-path.js");
-  //si le fichier n'existe pas alors on le crèèe
-  if(!fs.existsSync(eUI)){
-    try {
-        const writeStream = fs.createWriteStream(eUI);
-        writeStream.write("module.exports=\"@fto-consult/expo-ui/\";");
-        writeStream.end();
-        return path.resolve(p,suffix).replace(sep,(sep+sep));
-    }catch{}
-  }
   config.resolver.assetExts = [
      ...config.resolver.assetExts,
      ...assetExts,

package/package.json

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