@fto-consult/expo-ui 6.20.17 → 6.20.19

package/babel.config.alias.js

@@ -3,12 +3,12 @@ const fs = require("fs");
 const writeFile = require("./electron/utils/writeFile");
 module.exports = (opts)=>{
     const dir = path.resolve(__dirname);
-    const base = opts.base || process.cwd();
+    const projectRoot = typeof opts.projectRoot =='string' && fs.existsSync(opts.projectRoot.trim()) && opts.projectRoot.trim() || process.cwd();
     const assets = path.resolve(dir,"assets");
     opts = typeof opts =='object' && opts ? opts : {};
     opts.platform = "expo";
     opts.assets = opts.assets || opts.alias && typeof opts.alias =='object' && opts.alias.$assets || assets;
-    opts.base = opts.base || base;
+    opts.projectRoot = opts.projectRoot || projectRoot;
     opts.withPouchDB = opts.withPouchDB !== false && opts.withPouchdb !== false ? true : false;
     delete opts.withPouchdb;
     const expoUI = require("./expo-ui-path")();
@@ -77,7 +77,7 @@ module.exports = (opts)=>{
     const HelpScreen = path.resolve(r["$escreens"],"Help");
     ///on génère les librairies open sources utilisées par l'application
     const root = path.resolve(r.$src,"..");
-    const nModulePath = fs.existsSync(path.resolve(root,"node_modules")) && path.resolve(root,"node_modules") || fs.existsSync(path.resolve(r.$src,"node_modules")) && path.resolve(r.$src,"node_modules") || path.resolve(base,"node_modules");
+    const nModulePath = fs.existsSync(path.resolve(root,"node_modules")) && path.resolve(root,"node_modules") || fs.existsSync(path.resolve(r.$src,"node_modules")) && path.resolve(r.$src,"node_modules") || path.resolve(projectRoot,"node_modules");
     const nodeModulesPath = fs.existsSync(nModulePath) ? nModulePath : path.resolve(process.cwd(),"node_modules");
     const outputPath = path.resolve(HelpScreen,"openLibraries.js");
     r.$nodeModulesPath = r.$enodeModulesPath= nodeModulesPath;
@@ -93,12 +93,13 @@ module.exports = (opts)=>{
         sourceCode : r.$src,
         assets : $assets,
         images : r.$images,
-        projectRoot : base,//la racine au projet
+        projectRoot : projectRoot,//la racine au projet
         electron : $electron,//le chemin racine electron
     };
     //le chemin ver le repertoire electron
     r.$eelectron = r["$e-electron"] = $electron;
     r.$electron = r.$electron || r.$eelectron;
+    r.$projectRoot = r.$eprojectRoot = projectRoot;
     r.$econtext = path.resolve(expo,"context");
     if(!r.$context){
         r.$context = r.$econtext;
@@ -113,7 +114,7 @@ module.exports = (opts)=>{
             electronPaths.logo = logoPath;
         }
     }
-    const jsonPath = path.resolve(base,'package.json');
+    const jsonPath = path.resolve(projectRoot,'package.json');
     if(fs.existsSync(jsonPath)){
         require("./electron/utils/copy")(jsonPath,path.resolve(dir,"electron","package.app.json"));
     }

package/bin/create-app.js

@@ -31,6 +31,8 @@ module.exports = function(parsedArgs,{projectRoot:root}){
           "main": "index.js",
           "scripts" : {
             start : "npx expo start -c",
+            "serve-web" : "npx serve web-build --single",
+            "build-web" : "npx expo export:web",
           },
           "dependencies" : {
             [euModule] : "latest",
@@ -117,7 +119,8 @@ const createAPPJSONFile = (projectRoot,{name,version})=>{
         }
       },
       "web": {
-        "favicon": "./assets/favicon.png"
+        "favicon": "./assets/favicon.png",
+        "bundler": "metro"
       }
     }
   }

package/index.js

@@ -1,5 +1,6 @@
 import { registerRootComponent } from "expo";
-import {Platform } from 'react-native';
+import {Platform,AppRegistry } from 'react-native';
+import apConfig from '$capp/config';
 import App from "./src/App";
 import Provider from "$econtext/Provider";
 const isWeb = Platform.OS === "web";
@@ -17,10 +18,14 @@ const isWeb = Platform.OS === "web";
  * }
  */
 export default function registerApp ({onMount,onUnmount,onRender,render,swrConfig,init,...rest}){
+    console.log("will register heeein ",appConfing.name);
+    return AppRegistry.registerComponent('main',()=>{
+        return <Provider {...rest} swrConfig={isObj(swrConfig) && swrConfig || {}} children={<App init={init} render={render} onMount={onMount} onUnmount={onUnmount} onRender={onRender}/>}/>
+    });
     return registerRootComponent(function(props){
         return <Provider {...props} {...rest} swrConfig={isObj(swrConfig) && swrConfig || {}} children={<App init={init} render={render} onMount={onMount} onUnmount={onUnmount} onRender={onRender}/>}/>
     });
 }
 
 ///fix bug lié au fait que l'application stuck on splashscreen en environnement mobile
-!isWeb && registerRootComponent(x=>null);
+//!isWeb && registerRootComponent(x=>null);

package/package.json

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