fix(mode): ensure multiple component modes can async load

Author: adamdbradley

src/client/platform-main.ts

@@ -84,16 +84,7 @@ export const createPlatformMain = (namespace: string, Context: d.CoreContext, wi
         perf.mark(`request_bundle_start:${elm.nodeName.toLowerCase()}:${elm['s-id']}`);
       }
 
-      if (cmpMeta.componentConstructor) {
-        // we're already all loaded up :)
-        queueUpdate(plt, elm, perf);
-
-        if (_BUILD_.profile) {
-          perf.mark(`request_bundle_end:${elm.nodeName.toLowerCase()}:${elm['s-id']}`);
-          perf.measure(`request_bundle:${elm.nodeName.toLowerCase()}:${elm['s-id']}`, `request_bundle_start:${elm.nodeName.toLowerCase()}:${elm['s-id']}`, `request_bundle_end:${elm.nodeName.toLowerCase()}:${elm['s-id']}`);
-        }
-
-      } else if (_BUILD_.externalModuleLoader) {
+      if (_BUILD_.externalModuleLoader) {
         // using a 3rd party bundler to import modules
         // at this point the cmpMeta will already have a
         // static function as a the bundleIds that returns the module

src/core/host-snapshot.ts

@@ -8,11 +8,11 @@ export const initHostSnapshot = (domApi: d.DomApi, cmpMeta: d.ComponentMeta, hos
   // have finished adding attributes and child nodes to the host
   // before we go all out and hydrate this beast
   // let's first take a snapshot of its original layout before render
-  if (_BUILD_.hasMode && !hostElm.mode) {
+  if (_BUILD_.hasMode) {
     // looks like mode wasn't set as a property directly yet
     // first check if there's an attribute
     // next check the app's global
-    hostElm.mode = domApi.$getMode(hostElm);
+    hostElm.mode = hostElm.mode || domApi.$getMode(hostElm);
   } else {
     hostElm.mode = DEFAULT_STYLE_MODE;
   }