@fto-consult/expo-ui 9.0.1 → 9.0.3

package/babel.config.alias.js

@@ -3,18 +3,16 @@ const fs = require("fs");
 
 module.exports = (opts)=>{
     const dir = path.resolve(__dirname);
-    const isDev = String(process.env.NODE_ENV).toLowerCase().trim() !="production";
     const projectRoot = typeof opts.projectRoot =='string' && fs.existsSync(opts.projectRoot.trim()) && opts.projectRoot.trim() || process.cwd();
     opts = typeof opts =='object' && opts ? opts : {};
-    opts.platform = "expo";
     opts.projectRoot = opts.projectRoot || projectRoot;
     const assets = fs.existsSync(path.resolve(opts.projectRoot,"assets")) ? path.resolve(opts.projectRoot,"assets") : path.resolve(dir,"assets");
     opts.assets = opts.assets || opts.alias && typeof opts.alias =='object' && opts.alias.$assets || assets;
     opts.withPouchDB = opts.withPouchDB !== false && opts.withPouchdb !== false ? true : false;
     delete opts.withPouchdb;
     const expoUI = require("./expo-ui-path")(projectRoot);
-    const cPath = isDev && fs.existsSync(path.resolve(expoUI,"node_modules","@fto-consult","common"))? path.resolve(expoUI,"node_modules","@fto-consult","common") : null; 
-    const r = require(`${cPath ? path.resolve(cPath,"babel.config.alias.js"):'@fto-consult/common/babel.config.alias'}`)(opts);
+    const cPath = require("./common-path")(projectRoot);
+    const r = require(`${path.resolve(cPath,"babel.config.alias.js")}`)({...opts,platform:"expo"});
     const expo = path.resolve(expoUI,"src");
     r["$ecomponents"] = path.resolve(expo,"components");
     r["$econfirm"] = path.resolve(r["$ecomponents"],"Dialog","confirm");

package/babel.config.js

@@ -37,4 +37,3 @@ module.exports = function(api,opts) {
   };
 };
 
-

package/bin/create-app.js

@@ -43,8 +43,8 @@ module.exports = function(appName,{projectRoot:root}){
           "scripts" : {
             start : "npx expo start -c",
             "dev" : "npx expo start --no-dev --minify -c",
-            "serve-web" : "npx serve web-build --single",
-            "build-web" : "npx expo export:web",
+            "serve-web" : "npx serve dist --single",
+            "build-web" : "npx expo export",
             "build-android" : "npx eas build --platform android --profile preview",
             "build-ios" : "eas build --platform ios",
             "generate-getTable" : "npx @fto-consult/expo-ui generate-getTable",

package/common-path.js

@@ -0,0 +1,3 @@
+module.exports = (projectRoot)=>{
+    return require("./fto-consult-path")(projectRoot,"@fto-consult/common","commonRootPath");
+}

package/fto-consult-path.js

@@ -0,0 +1,7 @@
+// 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.
+///retourne le chemin vers le package @expo-ui
+module.exports = function (projectRoot){
+    return require("./fto-consult-path")(projectRoot,"@fto-consult/expo-ui","expoUIRootPath");
+};

package/metro.config.js

@@ -40,9 +40,13 @@ module.exports = function(opts){
   ]
   config.watchFolders = Array.isArray(config.watchFolders)? config.watchFolders : [];
   const expoUIP = require("./expo-ui-path")(projectRoot);
+  const cPath = require("./common-path")(projectRoot);
   if(!config.watchFolders.includes(expoUIP)){
     config.watchFolders.push(expoUIP);
   }
+  if(cPath && !config.watchFolders.includes(cPath)){
+      config.watchFolders.push(cPath);
+  }
   let hasFTO = false;
   for(let i in config.watchFolders){
       if(typeof config.watchFolders[i] ==="string" && config.watchFolders[i].includes("@fto-consult")){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "9.0.1",
+  "version": "9.0.3",
   "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": {
@@ -22,7 +22,7 @@
     "web-c": "npx expo start --web -c",
     "eject": "expo eject",
     "emulator": "npm run android-emulator",
-    "web-server": "npx serve web-build",
+    "web-server": "npx serve dist",
     "build-android": "eas build --clear-cache -p android --profile preview",
     "build-android-local": "eas build --platform android --local",
     "build-android-dist": "eas build --clear-cache -p android",
@@ -67,7 +67,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.52.1",
+    "@fto-consult/common": "^4.53.0",
     "apexcharts": "^3.49.0",
     "file-saver": "^2.0.5",
     "google-libphonenumber": "^3.2.34",
@@ -89,7 +89,6 @@
   "devDependencies": {
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
     "@expo/metro-config": "~0.17.1",
-    "babel-plugin-inline-dotenv": "^1.7.0",
     "babel-plugin-module-resolver": "^5.0.0",
     "sharp-cli": "^2.1.1"
   }

package/src/components/Chart/utils.js

@@ -1,8 +1,8 @@
 // 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.
-import {isObj,defaultNumber} from "$cutils";
-import appConfig from "$app/config";
+import {defaultNumber} from "$cutils";
+import appConfig from "$capp/config";
 
 /*** retourne le nombre maximal de courbes pouvant s'afficher sur un même graphe
  * exempt  du graphe de type pie/donut

package/src/components/Menu/Menu.js

@@ -17,7 +17,7 @@ import { withTheme,Surface,Portal} from 'react-native-paper';
 import { NativeModules} from 'react-native';
 import {defaultDecimal,extendObj} from "$cutils";
 import theme,{StylePropTypes} from "$theme";
-import APP from "$app/instance";
+import APP from "$capp/instance";
 import MenuItem from "./Item";
 import { MIN_WIDTH } from './utils';
 

package/src/components/SelectCurrency/index.js

@@ -5,7 +5,7 @@ import React from "$react";
 import {defaultStr} from "$cutils";
 import SimpleSelect from "$ecomponents/SimpleSelect";
 import {currencies} from "$ccurrency";
-import appConfig from "$app/config";
+import appConfig from "$capp/config";
 import Format from "./Format";
 
 const CurrencySelector = React.forwardRef((props,ref)=>{

package/src/layouts/Screen/TableData.js

@@ -9,8 +9,8 @@ import PropTypes from "prop-types";
 import notify from "$notify";
 import Auth from "$cauth";
 import {open as showPreloader,close as hidePreloader} from "$preloader";
-import {canMakePhoneCall, makePhoneCall as makePCall} from "$app/makePhoneCall";
-import copyToClipboard from "$app/clipboard";
+import {canMakePhoneCall, makePhoneCall as makePCall} from "$capp/makePhoneCall";
+import copyToClipboard from "$capp/clipboard";
 import {isMobileOrTabletMedia} from "$platform/dimensions";
 import Tab  from "$ecomponents/Tab";
 import View from "$ecomponents/View";

package/src/screens/Help/About.js

@@ -12,7 +12,7 @@ import View from "$ecomponents/View";
 import Label from "$ecomponents/Label";
 import {defaultStr} from "$cutils";
 import theme from "$theme";
-import APP from "$app";
+import APP from "$capp";
 import AutoLink from "$ecomponents/AutoLink";
 import getReleaseText from "./getReleaseText";
 import appConfig from "$capp/config";

package/src/screens/Help/getReleaseText.js

@@ -1,7 +1,7 @@
 import View from "$ecomponents/View";
 import Label from "$ecomponents/Label";
 import theme from "$theme";
-import appConfig from "$app/config";
+import appConfig from "$capp/config";
 export default function getReleaseLabel(){
     return <View style={[theme.styles.row]}>
         <Label style={[{color:theme.colors.text,fontSize:16}]}>Version </Label>