@fto-consult/expo-ui 2.49.5 → 2.49.6

package/electron/webpack.config.js

@@ -1,45 +1,84 @@
-const createExpoWebpackConfigAsync = require('@expo/webpack-config');
-const envManager = require("@expo/webpack-config/env");
-const addons = require("@expo/webpack-config/addons");
-const jsonfile = require('jsonfile');
+/**@see : https://www.npmjs.com/package/@expo/webpack-config/v/0.11.4 */
+const createExpoWebpackConfigAsync = require('@expo/webpack-config')
 const path = require("path");
-const mode = 'development';
 const isObj = x => x && typeof x =='object' && !Array.isArray(x);
-/***@see : https://www.npmjs.com/package/@expo/webpack-config */
-module.exports = async function(env, argv) {
-  const projectRoot = process.cwd()
-  const electronPath = path.join(projectRoot,'electron');
-  env = env || {};
-  env.projectRoot = projectRoot;
-  env.platform = "electron";//isObj(env.platform)? env.platform : {};//'web'///electron;
-  //env.platform.type = "electron";
-  env.locations = (0, envManager.getPaths)(projectRoot)
-  env.pwa = false;
-  let config = (0, addons.withAlias)({}, (0, envManager.getAliases)(projectRoot));
-  if(argv && typeof argv =='object' && (argv.mode =='production' || argv.mode =="development")){
-    env.mode = argv.mode;
-  } else {
-      env.mode = mode;
-  }
-  config = await createExpoWebpackConfigAsync(env, argv);
-  config.output = config.output || {};
-  config.output.publicPath = "./";
-  config.output.path = path.join(electronPath,"dist");
-  if (!config.plugins) config.plugins = [];
-  if (!config.resolve) config.resolve = {}; 
-  for(let i in config.plugins){
-      let pl = config.plugins[i];
-      //on recherche le fichier html build de webpack
-      if(pl && typeof pl =='object' && pl.options && typeof pl.options =='object'){
-          if(typeof pl.options.filename =="string" && pl.options.filename.toLowerCase().includes("index.html")){
-               pl.options.filename = path.join(config.output.path,"index.html");
-               break;
-          }
+// Expo CLI will await this method so you can optionally return a promise.
+module.exports = async function(env, argv,opts) {
+    const dir = path.resolve(__dirname);
+    env = env || {};
+    opts = typeof opts =="object" && opts ? opts : {};
+    const babel = isObj(opts.babel)? opts.babel : {};
+    const isElectron = typeof env.platform =="string" && env.platform.toLowerCase().trim() ==='electron';
+    if(isElectron){
+       env.platform = "electron";
+       env.mode = env.mode =="production" && "production" || "development";
+       env.pwa = false;
+    }
+    const transpileModules = Array.isArray(opts.transpileModules)? opts.transpileModules : [];
+    const config = await createExpoWebpackConfigAsync(
+      {
+        ...env,
+        babel: {
+          ...babel,
+          dangerouslyAddModulePathsToTranspile: [
+            // Ensure that all packages starting with @fto-consult are transpiled.
+            '@fto-consult',
+            ...transpileModules,
+          ],
+        },
+      },
+      argv
+    );
+    config.module.rules.push(
+      {
+          test: /.mjs$/,
+          include: /node_modules/,
+          include: /node_modules/,
+          type: "javascript/auto",
+          use: {loader: 'babel-loader'}
+    });
+    //config.resolve.alias['moduleA'] = 'moduleB';
+    config.mode = (config.mode =="development" || config.mode =='production') ? config.mode  : "development";
+    // Maybe you want to turn off compression in dev mode.
+    if (config.mode === 'development') {
+      config.devServer.compress = false;
+    }
+    // Or prevent minimizing the bundle when you build.
+    if (config.mode === 'production') {
+      config.optimization.minimize = true;
+    }
+    config.performance = typeof config.performance =="object" && config.performance ? config.performance : {};
+    config.performance.hints = "hints" in config.performance ? config.performance.hints : false;
+    config.performance.maxEntrypointSize = typeof config.performance.maxEntrypointSize =='number'? config.performance.maxEntrypointSize : 512000;
+    config.performance.maxAssetSize = typeof config.performance.maxAssetSize =='number'? config.performance.maxAssetSize : 512000;
+    config.devtool = (config.mode === 'development') ? 'inline-source-map' : false;
+    require("./compiler.config.js")({config,...opts,dir});
+    if(isElectron){
+      const electronPath = process.cwd();
+      config.output = config.output || {};
+      config.output.publicPath = "./";
+      config.output.path = path.join(electronPath,"dist");
+      if(isObj(config.node)){
+        config.resolve.fallback = isObj(config.resolve.fallback)? config.resolve.fallback : {};
+        for(let i in config.node){
+           if(config.node[i] =="empty"){
+             config.resolve.fallback[i] = false;
+           } else config.resolve.fallback[i] = config.node[i];
+           delete config.node[i];
+        }
+        config.resolve.byDependency = {
+          // ...
+          esm: {
+            mainFields: ['browser', 'module'],
+          },
+          commonjs: {
+            aliasFields: ['browser'],
+          },
+          url: {
+            preferRelative: true,
+          },
+        }
       }
-  }
-  //console.log(config.resolve.extensions, "is r extensions")
-  config.resolve.extensions = (0, envManager.getModuleFileExtensions)('electron', 'web');
-  //jsonfile.writeFileSync("electron/config.back.json", config, {spaces: 4});
-  console.log("******electron config file generated**********");
-  return config;
+    }
+    return config;
 };

package/electron/webpack.config.old.js

@@ -0,0 +1,45 @@
+const createExpoWebpackConfigAsync = require('@expo/webpack-config');
+const envManager = require("@expo/webpack-config/env");
+const addons = require("@expo/webpack-config/addons");
+const jsonfile = require('jsonfile');
+const path = require("path");
+const mode = 'development';
+const isObj = x => x && typeof x =='object' && !Array.isArray(x);
+/***@see : https://www.npmjs.com/package/@expo/webpack-config */
+module.exports = async function(env, argv) {
+  const projectRoot = process.cwd()
+  const electronPath = path.join(projectRoot,'electron');
+  env = env || {};
+  env.projectRoot = projectRoot;
+  env.platform = "electron";//isObj(env.platform)? env.platform : {};//'web'///electron;
+  //env.platform.type = "electron";
+  env.locations = (0, envManager.getPaths)(projectRoot)
+  env.pwa = false;
+  let config = (0, addons.withAlias)({}, (0, envManager.getAliases)(projectRoot));
+  if(argv && typeof argv =='object' && (argv.mode =='production' || argv.mode =="development")){
+    env.mode = argv.mode;
+  } else {
+      env.mode = mode;
+  }
+  config = await createExpoWebpackConfigAsync(env, argv);
+  config.output = config.output || {};
+  config.output.publicPath = "./";
+  config.output.path = path.join(electronPath,"dist");
+  if (!config.plugins) config.plugins = [];
+  if (!config.resolve) config.resolve = {}; 
+  for(let i in config.plugins){
+      let pl = config.plugins[i];
+      //on recherche le fichier html build de webpack
+      if(pl && typeof pl =='object' && pl.options && typeof pl.options =='object'){
+          if(typeof pl.options.filename =="string" && pl.options.filename.toLowerCase().includes("index.html")){
+               pl.options.filename = path.join(config.output.path,"index.html");
+               break;
+          }
+      }
+  }
+  //console.log(config.resolve.extensions, "is r extensions")
+  config.resolve.extensions = (0, envManager.getModuleFileExtensions)('electron', 'web');
+  //jsonfile.writeFileSync("electron/config.back.json", config, {spaces: 4});
+  console.log("******electron config file generated**********");
+  return config;
+};

package/metro.config.js

@@ -2,11 +2,10 @@ const { getDefaultConfig } = require('@expo/metro-config');
 const path = require("path");
 module.exports = (opts)=>{
   opts = opts && typeof opts =='object'? opts : {};
-  let {dir,assetExts,sourceExts} = opts;
+  let {assetExts,sourceExts} = opts;
   assetExts = Array.isArray(assetExts)? assetExts: [];
   sourceExts= Array.isArray(sourceExts)?sourceExts : [];
-  dir = dir || path.resolve(__dirname);
-  const projectRoot = path.resolve(dir);
+  const projectRoot = process.cwd();
   const localDir = path.resolve(__dirname);
   const config = getDefaultConfig(projectRoot);
   config.watchFolders = [projectRoot];
@@ -23,7 +22,7 @@ module.exports = (opts)=>{
       ...config.resolver.sourceExts,
       ...sourceExts,"txt",
       'jsx', 'js','tsx',
-      //"mjs","cjs",
+      "mjs","cjs",
   ]
   // Remove all console logs in production...
   config.transformer.minifierConfig.compress.drop_console = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.49.5",
+  "version": "2.49.6",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -28,9 +28,8 @@
     "install-apk": "adb -s emulator-5554 install myapp.apk",
     "android-emulator": "emulator -avd EMULATOR",
     "flipper": "npx cross-env METRO_SERVER_PORT=19000 E:\\Studies\\react-native\\debugger\\Flipper-win\\Flipper.exe",
-    "build-electron": "electron-webpack && electron-builder --dir -c.compression=store",
     "test:build": "electron-webpack && electron-builder --dir -c.compression=store -c.mac.identity=null",
-    "compile-electron": "webpack --config ./electron/webpack.config.js",
+    "compile-electron": "webpack --env platform=electron",
     "compile-electron-p": "webpack --config ./electron/webpack.config.js --mode=production",
     "electron": "electron ./electron",
     "logcat": "adb -d logcat com.ftc.apps.salite1:E > errors.txt",

package/webpack.config.js

@@ -1,15 +1,25 @@
 /**@see : https://www.npmjs.com/package/@expo/webpack-config/v/0.11.4 */
 const createExpoWebpackConfigAsync = require('@expo/webpack-config')
+const path = require("path");
+const isObj = x => x && typeof x =='object' && !Array.isArray(x);
 // Expo CLI will await this method so you can optionally return a promise.
 module.exports = async function(env, argv,opts) {
-    const path = require("path");
     const dir = path.resolve(__dirname);
+    env = env || {};
     opts = typeof opts =="object" && opts ? opts : {};
+    const babel = isObj(opts.babel)? opts.babel : {};
+    const isElectron = typeof env.platform =="string" && env.platform.toLowerCase().trim() ==='electron';
+    if(isElectron){
+       env.platform = "electron";
+       env.mode = env.mode =="production" && "production" || "development";
+       env.pwa = false;
+    }
     const transpileModules = Array.isArray(opts.transpileModules)? opts.transpileModules : [];
     const config = await createExpoWebpackConfigAsync(
       {
         ...env,
         babel: {
+          ...babel,
           dangerouslyAddModulePathsToTranspile: [
             // Ensure that all packages starting with @fto-consult are transpiled.
             '@fto-consult',
@@ -28,7 +38,7 @@ module.exports = async function(env, argv,opts) {
           use: {loader: 'babel-loader'}
     });
     //config.resolve.alias['moduleA'] = 'moduleB';
-    config.mode = config.mode =="development" || config.mode =='production' ? config.mode  : "development";
+    config.mode = (config.mode =="development" || config.mode =='production') ? config.mode  : "development";
     // Maybe you want to turn off compression in dev mode.
     if (config.mode === 'development') {
       config.devServer.compress = false;
@@ -37,6 +47,17 @@ module.exports = async function(env, argv,opts) {
     if (config.mode === 'production') {
       config.optimization.minimize = true;
     }
-    require("./compiler.config.js")({config,...opts,dir})
+    config.performance = typeof config.performance =="object" && config.performance ? config.performance : {};
+    config.performance.hints = "hints" in config.performance ? config.performance.hints : false;
+    config.performance.maxEntrypointSize = typeof config.performance.maxEntrypointSize =='number'? config.performance.maxEntrypointSize : 512000;
+    config.performance.maxAssetSize = typeof config.performance.maxAssetSize =='number'? config.performance.maxAssetSize : 512000;
+    config.devtool = (config.mode === 'development') ? 'inline-source-map' : false;
+    require("./compiler.config.js")({config,...opts,dir});
+    if(isElectron){
+      const electronPath = process.cwd();
+      config.output = config.output || {};
+      config.output.publicPath = "./";
+      config.output.path = path.join(electronPath,"dist");
+    }
     return config;
 };