@fto-consult/expo-ui 7.5.7 → 7.5.9

package/babel.config.alias.js

@@ -110,15 +110,21 @@ module.exports = (opts)=>{
         }
     }
     const jsonPath = path.resolve(projectRoot,'package.json');
-    if(fs.existsSync(jsonPath)){
+    const localElectronDir = path.resolve(dir,"electron");
+    const expoUIElectronPath = path.resolve(projectRoot,"electron")
+    if(fs.existsSync(jsonPath) && fs.existsSync(localElectronDir)){
         try {
-            require("./electron/utils/copy")(jsonPath,path.resolve(dir,"electron","expo-ui.json"))
+            require("./electron/utils/copy")(jsonPath,path.resolve(localElectronDir,"expo-ui.json"))
         } catch{}
     }
+    const pathsSringified = JSON.stringify(electronPaths, null, "\t");
     ///on sauvegarde les chemins des fichiers utiles, qui seront utilisées par la variable electron plus tard
     try {
-        writeFile(paths(projectRoot),JSON.stringify(electronPaths, null, "\t"));
+        writeFile(paths(projectRoot),pathsSringified);
     } catch{}
+    if(fs.existsSync(expoUIElectronPath)){
+        writeFile(path.resolve(expoUIElectronPath,"paths.json"),pathsSringified);
+    }
     r["$erealm"] = path.resolve(expo,'realm');
     if(!r.$realm){
         r.$realm = r.$erealm;

package/bin/init.js

@@ -16,20 +16,21 @@ module.exports = ({projectRoot,electronProjectRoot,paths,pathsJSON})=>{
         if(!createDir(electronProjectRoot)){
             throw "Unable to create electron project root directory at "+electronProjectRoot;
         }
-        const projectRootPackage = require(`${path.resolve(projectRoot,'package.json')}`);
+        const mPackageJSON = Object.assign({},require(`${path.resolve(projectRoot,'package.json')}`));
         const electronPackagePath = path.resolve(electronProjectRoot,"package.json");
         const electronPackageJSON = Object.assign({},fs.existsSync(electronPackagePath)? require(electronPackagePath) : {});
+        const projectRootPackage = {...mPackageJSON,...electronPackageJSON};
         const dependencies = require("../electron/dependencies");
         const electronProjectRootPackage = path.resolve(electronProjectRoot,"package.json");
         projectRootPackage.main = `node_modules/${mainPackageName}/electron/index.js`;
         projectRootPackage.dependencies = {...dependencies.main,...Object.assign(electronPackageJSON.dependencies)};
+        projectRootPackage.dependencies[mainPackage.name] = mainPackage.version;
         projectRootPackage.devDependencies = {...dependencies.dev,...Object.assign({},electronPackageJSON.devDependencies)};
         projectRootPackage.scripts = {
             "build" : `npx ${mainPackageName} electron build`,
             "start" : `npx ${mainPackageName} electron start`,
             "run-dev" : `npx ${mainPackageName} electron start`,
             "compile2start" : `npx ${mainPackageName} electron start --build`,
-            ...electronPackageJSON,
         }
         projectRootPackage.name = projectRootPackage.name;
         projectRootPackage.realAppName = typeof projectRootPackage.realAppName =="string" && projectRootPackage.realAppName || projectRootPackage.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.5.7",
+  "version": "7.5.9",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",