fix: subapp ssr initial load (electrode-io#1719)

yishengjiang99 · Aug 20, 2020 · 159f45c · 159f45c
1 parent 3430de2
commit 159f45c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/subapp-web/lib/load.js b/packages/subapp-web/lib/load.js
@@ -220,7 +220,6 @@ Response: ${err || body}`
 
       context.user.numOfSubapps = context.user.numOfSubapps || 0;
 
-
       let { group = "_" } = props;
       group = [].concat(group);
       const ssrGroups = group.map(grp =>
@@ -352,10 +351,11 @@ ${stack}`,
           }
 
           if (
+            subAppLoadTime === 0 || // subapp has not been loaded yet, so must load once
             !request.app.webpackDev ||
             (request.app.webpackDev && subAppLoadTime < request.app.webpackDev.compileTime)
           ) {
-            subAppLoadTime = _.get(request, "app.webpackDev.compileTime", 0);
+            subAppLoadTime = _.get(request, "app.webpackDev.compileTime", Date.now());
             loadSubApp();
           }
           const ref = {

diff --git a/packages/xarc-app-dev/src/lib/app-dev-middleware.ts b/packages/xarc-app-dev/src/lib/app-dev-middleware.ts
@@ -12,7 +12,7 @@ class AppDevMiddleware {
   webpackDev: any;
 
   constructor() {
-    this.webpackDev = { valid: false, hasErrors: false, hasWarnings: false };
+    this.webpackDev = { valid: false, hasErrors: false, hasWarnings: false, compileTime: Date.now() };
   }
 
   handleWebpackReport(data) {

diff --git a/packages/xarc-app-dev/src/lib/dev-admin/admin-server.ts b/packages/xarc-app-dev/src/lib/dev-admin/admin-server.ts
@@ -770,7 +770,7 @@ ${info.name} - assuming it started.</>`);
     info._child.on("message", messageHandler);
 
     if (info.options.noTimeoutCheck !== true) {
-      startTimeout = setTimeout(handleTimeout, 5000);
+      startTimeout = setTimeout(handleTimeout, 20000);
     }
 
     return defer.promise;