@wavemaker/rn-codegen 11.7.0-patch.4 → 11.7.0-patch.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavemaker/rn-codegen",
-  "version": "11.7.0-patch.4",
+  "version": "11.7.0-patch.5",
   "description": "",
   "main": "index.js",
   "bin": {

package/src/templates/app.template

@@ -69,11 +69,11 @@ class App extends BaseApp {
   } 
 
   getServiceDefinitions() {
+    {{#if profile.useLocalMetadata}}
+      return Promise.resolve(require('./metadata/app/service-definitions.json'))
+    {{else}}
     return axios.get(this.baseUrl + '/services/servicedefs')
       .then((response) => response?.data || {})
-      {{#if profile.useLocalMetadata}}
-        .catch(() => import('./metadata/app/service-definitions.json').then(mod => mod.default))
-      {{else}}
         .catch(() => ({}))
       {{/if}}
       .then(data => {
@@ -93,13 +93,14 @@ class App extends BaseApp {
   }
 
   loadWmProperties() {
+    {{#if profile.useLocalMetadata}}
+      return Promise.resolve(require('./src/wmProperties').default)
+    {{else}}
     return axios.get(this.baseUrl + '/services/application/wmProperties.js')
       .then((response) => {
           const data = response.data;
           return JSON.parse(data.substring(data.indexOf('{'), data.length - 1));
       })
-    {{#if profile.useLocalMetadata}}
-      .catch(() => import('./src/wmProperties').then(mod => mod.default))
     {{/if}}
       .then(appProperties => {
         this.appConfig.appProperties = appProperties;
@@ -264,36 +265,39 @@ class App extends BaseApp {
   {{/if}}
 
   componentDidMount() {
+    console.log(moment().format('HH:mm:ss:SSS') + ': Component Did Mount');
     {{#if animatedSplash}}
     SplashScreen.hideAsync().then(() => {});{{/if}}
     this.appConfig.getServiceDefinitions = this.getServiceDefinitions.bind(this);
-    NetworkService.start(this.appConfig)
-    {{#if profile.useLocalMetadata}}
-    {{else}}
-    .then(() => {
-      NetworkService.connect(true);
-    })
-    {{/if}}
-    .then(() => {console.log('NetworkService started')})
-    .then(() => this.loadWmProperties())
-    .then(() => {console.log('WmProperties loaded')})
-    {{#if sslPinning}}
-    .then(() => this.initSSLPininng())
-    .then((flag) => {flag && console.log('SSL Pinning loaded')})
-    {{/if}}
-    .then(() => this.loadTheme())
-    .then(() => {console.log('Theme loaded')})
-    .then(() => AppI18nService.init())
-    .then(() => this.changeLocale())
-    .then(() => {console.log('Locale files loaded')})
-    .then(() => this.getSecurityInfo())
-    .then(() => {console.log('Security info loaded')})
-    .then(() => this.loadFonts())
-    .then(() => {console.log('Font files loaded')})
-    .then(() => initializeDeviceOperations())
-    .then(() => {console.log('Loaded device operations loaded')})
-    .then(() => this.bootstrap())
-    .then(() => {console.log('Bootstrap Complete')})
+    Promise.all([
+      NetworkService.start(this.appConfig)
+      {{#if profile.useLocalMetadata}}
+      {{else}}
+      .then(() => {
+        NetworkService.connect(true);
+      })
+      {{/if}}
+      .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': NetworkService started')}),
+      this.getSecurityInfo()
+        .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': Security info loaded')}),
+      this.loadWmProperties()
+      .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': WmProperties loaded')})
+      {{#if sslPinning}}
+      .then(() => this.initSSLPininng())
+      .then((flag) => {flag && console.log('SSL Pinning loaded')})
+      {{/if}}
+      .then(() => this.loadTheme())
+      .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': Theme loaded')})
+      .then(() => AppI18nService.init())
+      .then(() => this.changeLocale())
+      .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': Locale files loaded')})
+      .then(() => this.loadFonts())
+      .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': Font files loaded')})
+      .then(() => initializeDeviceOperations())
+      .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': Loaded device operations loaded')})
+      .then(() => this.bootstrap())
+      .then(() => {console.log(moment().format('HH:mm:ss:SSS') + ': Bootstrap Complete')})
+    ])
     .then(() => super.componentDidMount())
     .catch(error => {
       console.error(error);
@@ -372,6 +376,9 @@ export default (props) => {
       setVisible(true);
     }, 100);
   }, [visible]);
+  useCallback(() => {
+    console.log(moment().format('HH:mm:ss:SSS') + ': First App Render');
+  }, []);
   return visible ? (
     <>
       {{#if animatedSplash}}

package/src/templates/component/component.template

@@ -89,8 +89,7 @@ export default class {{name}}{{typeLabel}} extends Base{{typeLabel}} {
   componentDidMount() {
     {{#ifEquals lType 'prefab' this}}
       {{#if profile.useLocalMetadata}}
-      import('../../../service-definitions.json')
-      .then(mod => mod.default?.serviceDefs)
+      Promise.resolve(require('../../../service-definitions.json').serviceDefs)
       {{else}}
       this.getServiceDefinitions()
       {{/if}}

package/src/templates/package.web.json

@@ -10,9 +10,9 @@
     },
     "dependencies": {
         "@unimodules/react-native-adapter": "6.3.9",
-        "@wavemaker/app-rn-runtime": "11.7.0-patch.4",
-        "@wavemaker/variables": "11.7.0-patch.4",
-        "@wavemaker/rn-codegen": "11.7.0-patch.4",
+        "@wavemaker/app-rn-runtime": "11.7.0-patch.5",
+        "@wavemaker/variables": "11.7.0-patch.5",
+        "@wavemaker/rn-codegen": "11.7.0-patch.5",
         "axios": "^1.4.0",
         "css-mediaquery": "^0.1.2",
         "deprecated-react-native-prop-types": "~4.1.0",

package/src/templates/project/package.json

@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@unimodules/react-native-adapter": "6.3.9",
-    "@wavemaker/app-rn-runtime": "11.7.0-patch.4",
-    "@wavemaker/variables": "11.7.0-patch.4",
-    "@wavemaker/rn-codegen": "11.7.0-patch.4",
+    "@wavemaker/app-rn-runtime": "11.7.0-patch.5",
+    "@wavemaker/variables": "11.7.0-patch.5",
+    "@wavemaker/rn-codegen": "11.7.0-patch.5",
     "axios": "^1.4.0",
     "css-mediaquery": "^0.1.2",
     "deprecated-react-native-prop-types": "~4.1.0",