@fto-consult/expo-ui 6.21.15 → 6.21.17

package/bin/create-app.js

@@ -1,4 +1,4 @@
-const {exec,thowError,copy,writeFile,createDirSync} = require("./utils");
+const {exec,thowError,copy,writeFile,createDirSync,getDependencyVersion} = require("./utils");
 const fs = require("fs"), path = require("path");
 const createAppDir = path.resolve(__dirname,"create-app");
 module.exports = function(parsedArgs,{projectRoot:root}){
@@ -21,6 +21,8 @@ module.exports = function(parsedArgs,{projectRoot:root}){
       ...defaultDevDependencies,
       ...(devDependencies && typeof devDependencies ==='object'? devDependencies : {}),
     };
+    const reactNativeVersion = getDependencyVersion(packageObj,"react-native");
+    const expoVersion = getDependencyVersion(packageObj,"expo");
     const euModule = "@fto-consult/expo-ui";
     let hasUpdateDeps = false;
     if(!hasPackage){
@@ -36,12 +38,16 @@ module.exports = function(parsedArgs,{projectRoot:root}){
           },
           "dependencies" : {
             [euModule] : "latest",
+            //"expo" : expoVersion,
+            //"react-native" : reactNativeVersion,
           },
           devDependencies : devDeps
         }
      } else {
       mainPackage.devDependencies = typeof mainPackage.devDependencies =='object' && mainPackage.devDependencies || {};
       mainPackage.dependencies = typeof mainPackage.dependencies ==="object" && mainPackage.dependencies || {};
+      mainPackage.dependencies["react-native"] = reactNativeVersion;
+      mainPackage.dependencies["expo"] = expoVersion;
       for(let i in devDeps){
         if(!(i in mainPackage.devDependencies)){
             hasUpdateDeps = true;

package/bin/utils.js

@@ -1,14 +1 @@
-const path = require("path");
-const fs = require("fs");
-module.exports = {
-    createDir : require("../electron/utils/createDir"),
-    writeFile : require("../electron/utils/writeFile"),
-    copy : require("../electron/utils/copy"),
-    electronDir : path.resolve(__dirname, "..","electron"),
-    exec : require("../electron/utils/exec"),
-    thowError : (...args)=>{
-        console.error(...args);
-        process.exit(-1);
-    },
-    createDirSync : require("../electron/utils/createDirSync"),
-}
+module.exports = require("../electron/utils");

package/electron/utils/dependencies.js

@@ -0,0 +1,10 @@
+module.exports = {
+    getDependencyVersion : (obj,packageName)=>{
+        if(!obj || typeof obj !=='object' || !obj?.dependencies) return "";
+        return obj.dependencies[packageName] || "";
+    },
+    getDevDependencyVersion : (obj,packageName)=>{
+        if(!obj || typeof obj !=='object' || !obj?.devDependencies) return "";
+        return obj.devDependencies[packageName] || "";
+    }
+}

package/electron/utils/index.js

@@ -0,0 +1,15 @@
+const path = require("path");
+module.exports = {
+    createDir : require("./createDir"),
+    writeFile : require("./writeFile"),
+    copy : require("./copy"),
+    electronDir : path.resolve(__dirname, ".."),
+    exec : require("./exec"),
+    thowError : (...args)=>{
+        console.error(...args);
+        process.exit(-1);
+    },
+    createDirSync : require("./createDirSync"),
+    ...require("./dependencies"),
+    isObj : x=> typeof x =="object" && x && !Array.isArray(x),
+}

package/metro.config.js

@@ -1,11 +1,11 @@
 const path = require("path");
 const fs = require("fs");
-const writeFile = require("./electron/utils/writeFile");
+const {writeFile,isObj,getDependencyVersion} = require("./electron/utils");
+const { getDefaultConfig } = require('expo/metro-config');
 module.exports = function(opts){
-  const nodeModulePath = `${process.cwd()}/node_modules`;
-  const mConfigPath = fs.existsSync(`${nodeModulePath}/@expo/metro-config`) && `${nodeModulePath}/@expo/metro-config` || "@expo/metro-config";
-  const { getDefaultConfig } = require(`${mConfigPath}`);
-  
+  //const nodeModulePath = `${process.cwd()}/node_modules`;
+  //const mConfigPath = fs.existsSync(`${nodeModulePath}/@expo/metro-config`) && `${nodeModulePath}/@expo/metro-config` || "@expo/metro-config";
+  //const { getDefaultConfig } = require(`${mConfigPath}`);
   opts = opts && typeof opts =='object'? opts : {};
   let {assetExts,sourceExts} = opts;
   assetExts = Array.isArray(assetExts)? assetExts: [];
@@ -22,18 +22,15 @@ module.exports = function(opts){
     config.watchFolders.push(localDir);
   }
   config.projectRoot = projectRoot;
-  const appJSONPath = path.resolve(projectRoot,"app.json");
+  const mainPackagePath = path.resolve(projectRoot,"package.json");
+  const mainPackage = fs.existsSync() && require(`${mainPackagePath}`) || null;
   const packageJSON = require("./package.json");
-  if(fs.existsSync(appJSONPath)){
-    const appJSON = require(`${appJSONPath}`);
-    const expoVersion  = packageJSON?.dependencies?.expo;
-    const expoJSON = appJSON?.expo;
-    if(expoJSON){
-      const sdkVersion = typeof expoVersion =="string" && expoVersion && expoVersion.trim() || ''//.split(".")[0]||"";
-      if(!expoJSON?.sdkVersion || typeof expoJSON?.sdkVersion !="string" || sdkVersion && !expoVersion.startsWith(sdkVersion)){
-          expoJSON.sdkVersion = sdkVersion;
-          writeFile(appJSONPath,JSON.stringify(appJSON,null,2),{overrite:true});
-      }
+  const expoVersion = null;//getDependencyVersion(packageJSON,"expo");
+  if(isObj(mainPackage) && isObj(mainPackage.dependencies)){
+    if(expoVersion && mainPackage.dependencies["expo"] !== expoVersion){
+        console.log("fix expo  dependencies to ",expoVersion);
+        mainPackage.dependencies["expo"] = expoVersion;
+        writeFile(mainPackagePath,JSON.stringify(mainPackage,null,2),{overrite:true});
     }
   }
   config.resolver.assetExts = [
@@ -49,11 +46,11 @@ module.exports = function(opts){
   ]
   // Remove all console logs in production...
   config.transformer.minifierConfig.compress.drop_console = false;
-  /*config.platforms = Array.isArray(config.platforms) && config.platforms || [];
+  config.platforms = Array.isArray(config.platforms) && config.platforms || [];
   ['ios', 'android', 'windows', 'web',"electron"].map(p=>{
     if(!config.platforms.includes(p)){
        config.platforms.push(p);
     }
-  });*/
+  });
   return config;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.21.15",
+  "version": "6.21.17",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -40,6 +40,7 @@
     "update-app-version": "node ./update-app-version.js",
     "find-licenses": "node ./find-licenses.js",
     "fix-dependencies": "expo-cli doctor --fix-dependencies",
+    "expo-fix":"npx expo install --fix",
     "delete-node-modules": "rimraf ./**/node_modules",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
     "update": "npm i expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-safe-area-context@latest react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-native-screens@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
@@ -65,7 +66,7 @@
     "@emotion/native": "^11.11.0",
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.23.13",
+    "@fto-consult/common": "^3.24.0",
     "@gorhom/portal": "^1.0.14",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
@@ -76,9 +77,9 @@
     "@react-navigation/native-stack": "^6.9.13",
     "@shopify/flash-list": "1.4.3",
     "apexcharts": "^3.41.1",
-    "expo": "^49.0.6",
+    "expo": "^49.0.7",
     "expo-camera": "~13.4.2",
-    "expo-clipboard": "~4.3.0",
+    "expo-clipboard": "~4.3.1",
     "expo-font": "~11.4.0",
     "expo-image-picker": "~14.3.2",
     "expo-linking": "~5.0.2",
@@ -88,7 +89,7 @@
     "expo-web-browser": "~12.3.2",
     "file-saver": "^2.0.5",
     "fs-extra": "^11.1.1",
-    "google-libphonenumber": "^3.2.32",
+    "google-libphonenumber": "^3.2.33",
     "htmlparser2-without-node-native": "^3.9.2",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",
@@ -101,7 +102,7 @@
     "react-native-gesture-handler": "^2.12.1",
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-mime-types": "^2.4.0",
-    "react-native-paper": "^5.10.0",
+    "react-native-paper": "^5.10.1",
     "react-native-paper-dates": "^0.18.13",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",
@@ -109,7 +110,7 @@
     "react-native-svg": "13.9.0",
     "react-native-web": "~0.19.6",
     "react-native-webview": "13.2.2",
-    "react-virtuoso": "^4.4.2",
+    "react-virtuoso": "^4.5.0",
     "sharp-cli": "^4.1.1",
     "tippy.js": "^6.3.7",
     "websql": "^2.0.3",