esoftplay 0.0.110 → 0.0.111

package/bin/build.js

@@ -27,7 +27,7 @@ if (fs.existsSync(packjson)) {
 	/* ADD SCRIPTS.PRESTART AND SCRIPTS.POSTSTOP */
 
 	if (args[0] == "install") {
-		$package.scripts.start = "esp start && expo start"
+		$package.scripts.start = "esp start && expo start --dev-client"
 		fs.writeFile(packjson, JSON.stringify($package, null, 2), (err) => {
 			if (err) throw err;
 			console.log('package.json has been updated');
@@ -210,9 +210,10 @@ yarn-error.log\n\
 import * as ErrorReport from 'esoftplay/error';
 import * as Notifications from 'expo-notifications';
 import React, { useEffect, useRef } from 'react';
-import { enableScreens } from 'react-native-screens';
+import { enableScreens, enableFreeze } from 'react-native-screens';
 const { globalIdx } = require('esoftplay/global');
 enableScreens();
+enableFreeze(true);
 
 Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x));
 
@@ -253,11 +254,11 @@ export default function App() {
 			'expo-status-bar',
 			'expo-secure-store',
 			'expo-updates',
-			'firebase',
 			'immhelper',
 			'dayjs',
 			'react-fast-compare',
 			'react-native-gesture-handler',
+			'react-native-fast-image',
 			'react-native-awesome-gallery',
 			'react-native-picker-scrollview',
 			'react-native-pinch-zoom-view-movable',
@@ -310,8 +311,11 @@ export default function App() {
 				cmd += "&& yarn add " + installDevLibs.join(" ") + " --dev "
 			if (installExpoLibs.length > 0)
 				cmd += "&& expo install " + installExpoLibs.join(" ")
-			// cmd += " && npm i -s esoftplay"
+			cmd += " && node ./node_modules/esoftplay/bin/router.js"
 			execSync(cmd)
+			// if (fs.existsSync("../../node_modules/esoftplay/bin/router.js")) {
+			// 	execSync("node ../../node_modules/esoftplay/bin/router.js")
+			// }
 			console.log('App.js has been replace to App.tsx');
 			// /* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
 			// if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {

package/bin/router.js

@@ -383,7 +383,7 @@ declare module "esoftplay" {
   function useGlobalState<S>(initialState?: S, option?: useGlobalOption): useGlobalReturn<S>;
   function usePersistState<S>(key: string, initialState?: S | (() => S)): [S, (a: S | ((b: S )=> S)) => S | undefined, (a?: (x: S) => void) => void, () => void];
   function useSafeState<S>(initialState?: S | (() => S)): [S, (a: S | ((b: S )=> S)) => S | undefined];
-  function applyStyle(style: any): any;
+  function applyStyle<T>(style: T): T;
   function usePersistState<S>(key: string, initialState?: S | (() => S)): [S, (a: S) => void, (a?: (x: S)=> void) => void, () => void];
   namespace esp {
     function appjson(): any;

package/error.ts

@@ -1,8 +1,7 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { LibCurl, UserClass } from 'esoftplay';
+import { LibCurl, UserClass, esp } from 'esoftplay';
 import Constants from 'expo-constants';
 import { Platform } from 'react-native';
-import esp from './esp';
 import { default as UserRoutes } from './modules/user/routes';
 let pack = require('../../package.json');
 let app = require('../../app.json');
@@ -42,7 +41,7 @@ export function reportApiError(fetch: any, error: any) {
     'fetch: ' + String(JSON.stringify(fetch || {}, undefined, 2)).replace(/[\[\]\{\}\"]+/g, ''),
     'error: ' + error
   ].join('\n')
-  
+
   if (manifest?.packagerOpts) {
     let post = {
       text: msg,

package/esp.ts

@@ -10,25 +10,28 @@ LogBox.ignoreLogs(['YellowBox has been replaced with LogBox. Please call LogBox.
 LogBox.ignoreLogs(['VirtualizedLists should never be nested inside plain ScrollViews with the same orientation - use another VirtualizedList-backed container instead.']);
 let app = require('../../app.json');
 let conf = require('../../config.json');
-let lconf = require('../../config.live.json');
+let lconf
+try {
+  lconf = require('../../config.live.json');
+} catch (error) {
+
+}
 
 export default (() => {
-  function mergeDeep(target: any, source: any): any {
-    const isObject = (obj) => obj && typeof obj === 'object';
-    if (!isObject(target) || !isObject(source)) {
-      return source;
-    }
-    Object.keys(source).forEach(key => {
-      const targetValue = target[key];
-      const sourceValue = source[key];
-      if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
-        target[key] = targetValue.concat(sourceValue);
-      } else if (isObject(targetValue) && isObject(sourceValue)) {
-        target[key] = mergeDeep(Object.assign({}, targetValue), sourceValue);
-      } else {
-        target[key] = sourceValue;
+  function mergeDeep(target, ...sources) {
+    target = Object(target);
+    for (let source of sources) {
+      source = Object(source);
+      for (let key in source) {
+        if (source.hasOwnProperty(key)) {
+          if (source[key] && typeof source[key] === 'object') {
+            target[key] = mergeDeep(target[key], source[key]);
+          } else {
+            target[key] = source[key];
+          }
+        }
       }
-    });
+    }
     return target;
   }
   app = mergeDeep(app, conf)
@@ -89,7 +92,7 @@ export default (() => {
   function lang(moduleTask: string, langName: string, ...stringToBe: string[]): string {
     let string = esp.assets("locale/" + langId() + ".json")?.[moduleTask]?.[langName]
     if (!string) {
-      string = esp.assets("locale/id.json")?.[moduleTask]?.[langName]
+      string = esp.assets("locale/id.json")[moduleTask][langName]
     }
     function sprintf(string: string, index: number) {
       if (stringToBe[index] != undefined) {