@fto-consult/expo-ui 9.4.0 → 9.5.0

package/babel.config.js

@@ -19,7 +19,12 @@ module.exports = function(api,opts) {
       return false;
     }
     return true;
-  })
+  });
+  const inlineDovOptions = { unsafe: true};
+  const environmentPath = require("./copy-env-file")(projectRoot);
+  if(environmentPath && fs.existsSync(environmentPath)){
+    inlineDovOptions.path = environmentPath;
+  }
   require("@fto-consult/common/bin/generate-jsonconfig")({...opts,alias});
   return {
     presets: [
@@ -28,6 +33,7 @@ module.exports = function(api,opts) {
     ],
     plugins : [
       ...plugins,
+      ["inline-dotenv",inlineDovOptions],
       ["module-resolver", {"alias": alias}],
       "@babel/plugin-proposal-export-namespace-from",
       ...(reanimated?[reanimated]:[]),

package/bin/create-app/dependencies.js

@@ -10,7 +10,7 @@
 	"@react-navigation/native-stack": "^6.9.26",
 	"@react-navigation/stack": "^6.3.29",
 	"@shopify/flash-list": "1.6.4",
-	"expo": "^51.0.0",
+	"expo": "^51.0.8",
 	"expo-camera": "~15.0.9",
 	"expo-clipboard": "~6.0.3",
 	"expo-document-picker": "~12.0.1",

package/copy-env-file.js

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const {writeFile,copy} = require("./bin/utils");
 
 const checkEnv = (...envrs)=>{
     for(let i in envrs){
@@ -18,18 +17,8 @@ module.exports = (projectRoot,forceCreate)=>{
     projectRoot = projectRoot && typeof projectRoot =="string" && fs.existsSync(projectRoot) && projectRoot || process.cwd();
     const pWithEnv = path.resolve(projectRoot,`.env.${env}`);
     const environmentPath = fs.existsSync(pWithEnv) ? pWithEnv : path.resolve(projectRoot,".env"); 
-    const localEnv = path.resolve(__dirname,".env");
-    if(environmentPath && fs.existsSync(environmentPath) && environmentPath !== localEnv){
-        // File ".env" will be created or overwritten by default.
-        try {
-          copy(environmentPath, localEnv,{overwrite:true});
-        }
-        catch (e){}
+    if(environmentPath && fs.existsSync(environmentPath)){
+        return environmentPath;
     } 
-    if(!fs.existsSync(localEnv) && forceCreate !==false){
-        try {
-            writeFile(localEnv,"");
-        } catch(e){}
-    }
-    return localEnv;
+    return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "9.4.0",
+  "version": "9.5.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {

package/src/components/Avatar/AutoHeightImage/cache.js

@@ -1,5 +1,5 @@
 import { Image } from 'react-native';
-import { resolveAssetSource } from '$ecomponents/Image';
+import { resolveAssetSource } from '$ecomponents/Image/utils';
 
 /**
  * store with

package/src/components/Image/index.js

@@ -3,51 +3,21 @@ import Menu from "$ecomponents/Menu";
 import Avatar from "$ecomponents/Avatar";
 import {isDecimal,setQueryParams,isValidURL,defaultDecimal,defaultStr as defaultString,isDataURL,isPromise,defaultBool,isObj,isNonNullString} from "$cutils";
 import notify from "$enotify";
-let maxWidthDiff = 100, maxHeightDiff = 100;
 import {StyleSheet} from "react-native";
 import React from "$react";
 import PropTypes from "prop-types";
-import {isMobileNative,isWeb} from "$cplatform";
+import {isMobileNative} from "$cplatform";
+import {getUri} from "./utils";
 import {uniqid} from "$cutils";
 //import Signature from "$ecomponents/Signature";
 import Label from "$ecomponents/Label";
 //import Cropper from "./Cropper";
-
 import {pickImage,nonZeroMin,canTakePhoto,takePhoto} from "$emedia";
 import addPhoto from "$eassets/add_photo.png";
 
-export const isAssets = (asset,staticAssets)=>{
-    return isObj(asset) && isDecimal(asset.width) && isDecimal(asset.height) && isNonNullString(asset.uri) && (staticAssets ? asset.uri.contains("/static/"):true);
-}
-export const isValidImageSrc = (src)=>{
-    if(!isNonNullString(src)) return false;
-    return isDataURL(src) && !src.includes(",undefined") ? true : isValidURL(src) ? true : src.contains("/static/media/")? true  : false;
-}
-export const resolveAssetSource = (source)=>{
-    if(!source && !isDecimal(source)) return undefined;
-    try {
-        if(isWeb()){
-            return {uri:source};
-        }
-        return Image.resolveAssetSource(source);
-    } catch(e){
-        console.log(e," triing to resolve image asset from source ",source)
-        return undefined;
-    }
-}
-export const getUri = (src,onlySting)=>{
-    if(isAssets(src)) return src.uri;
-    if(isDecimal(src)){
-        if(onlySting !== false){
-            return resolveAssetSource(src)?.uri;
-        }
-        return resolveAssetSource(src);
-    }
-    if(isObj(src) && isValidImageSrc(src.uri)){
-        return src.uri;
-    } else if(isValidImageSrc(src)) return src;
-    return null;
-}
+let maxWidthDiff = 100, maxHeightDiff = 100;
+
+export * from "./utils";
 
 export default function ImageComponent(props){
     const [src,setSrc] = React.useState(defaultVal(props.src));

package/src/components/Image/utils.js

@@ -0,0 +1,36 @@
+import {Image} from "react-native";
+import { isObj,isDecimal,isNonNullString,isDataURL} from "$cutils";
+import { isWeb } from "$cplatform";
+
+export const isAssets = (asset,staticAssets)=>{
+    return isObj(asset) && isDecimal(asset.width) && isDecimal(asset.height) && isNonNullString(asset.uri) && (staticAssets ? asset.uri.contains("/static/"):true);
+}
+export const isValidImageSrc = (src)=>{
+    if(!isNonNullString(src)) return false;
+    return isDataURL(src) && !src.includes(",undefined") ? true : isValidURL(src) ? true : src.contains("/static/media/")? true  : false;
+}
+export const resolveAssetSource = (source)=>{
+    if(!source && !isDecimal(source)) return undefined;
+    try {
+        if(isWeb()){
+            return {uri:source};
+        }
+        return Image.resolveAssetSource(source);
+    } catch(e){
+        console.log(e," triing to resolve image asset from source ",source)
+        return undefined;
+    }
+}
+export const getUri = (src,onlySting)=>{
+    if(isAssets(src)) return src.uri;
+    if(isDecimal(src)){
+        if(onlySting !== false){
+            return resolveAssetSource(src)?.uri;
+        }
+        return resolveAssetSource(src);
+    }
+    if(isObj(src) && isValidImageSrc(src.uri)){
+        return src.uri;
+    } else if(isValidImageSrc(src)) return src;
+    return null;
+}