fix(build): fix mode and resourceUrl

Author: adamdbradley

src/compiler/app/app-global-scripts.ts

@@ -157,7 +157,7 @@ async function wrapGlobalJs(config: Config, compilerCtx: CompilerCtx, buildCtx:
     jsContent = await minifyJs(config, compilerCtx, buildCtx.diagnostics, jsContent, sourceTarget, false);
   }
 
-  return `\n(function(resourcesUrl){${jsContent}\n})(resourcesUrl);\n`;
+  return `\n(function(Context, resourcesUrl){${jsContent}\n})(x,r);\n`;
 }
 
 

src/compiler/app/test/app-core.spec.ts

@@ -35,9 +35,9 @@ describe('app-core', () => {
 
     it('wraps the JS content in an IFEE, arrow function', () => {
       const lines = core.wrapCoreJs(config, 'this is JavaScript code, really it is', cmpRegistry, {} as any).split('\n');
-      expect(lines[1]).toEqual(`((w,d,x,n,h,c,r)=>{"use strict";`);
-      expect(lines[3]).toEqual('this is JavaScript code, really it is');
-      expect(lines[4]).toEqual(`})(window,document,{},"${config.namespace}","${config.hydratedCssClass}",[]);`);
+      expect(lines[1].toString().startsWith(`((w,d,x,n,h,c,r)=>{`)).toBe(true);
+      expect(lines[2]).toEqual('this is JavaScript code, really it is');
+      expect(lines[3]).toEqual(`})(window,document,{},"${config.namespace}","${config.hydratedCssClass}",[]);`);
     });
 
     it('wraps the JS content in an IFEE, es5', () => {
@@ -50,7 +50,7 @@ describe('app-core', () => {
 
     it('trims the JS content', () => {
       const lines = core.wrapCoreJs(config, '  this is JavaScript code, really it is     ', cmpRegistry, {} as any).split('\n');
-      expect(lines[3]).toEqual('this is JavaScript code, really it is');
+      expect(lines[2]).toEqual('this is JavaScript code, really it is');
     });
 
   });

src/core/host-snapshot.ts

@@ -8,7 +8,7 @@ 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 (!hostElm.mode) {
     // looks like mode wasn't set as a property directly yet
     // first check if there's an attribute
     // next check the app's global

src/renderer/dom-api.ts

@@ -92,6 +92,9 @@ export const createDomApi = (App: AppGlobal, win: any, doc: Document): DomApi =>
     $hasAttribute: (elm: Element, key) =>
       elm.hasAttribute(key),
 
+    $getMode: (elm: Element) =>
+      elm.getAttribute('mode') || (App.Context || {}).mode,
+
     $elementRef: (elm: any, referenceName: string) => {
       if (referenceName === 'child') {
         return elm.firstElementChild;
@@ -260,11 +263,6 @@ export const createDomApi = (App: AppGlobal, win: any, doc: Document): DomApi =>
     domApi.$attachShadow = (elm, shadowRootInit) => elm.attachShadow(shadowRootInit);
   }
 
-  if (_BUILD_.hasMode) {
-    domApi.$getMode = (elm: Element) =>
-      domApi.$getAttribute(elm, 'mode') || (App.Context || {}).mode;
-  }
-
   if (!App.ael) {
     App.ael = (elm, eventName, cb, opts) => elm.addEventListener(eventName, cb, opts);
     App.rel = (elm, eventName, cb, opts) => elm.removeEventListener(eventName, cb, opts);

src/util/test/build-conditionals.spec.ts

@@ -362,7 +362,8 @@ describe('build conditionals', () => {
         prop: true,
         event: false,
         listener: false,
-        hostTheme: false
+        hostTheme: false,
+        updatable: true
       });
     });
 
@@ -379,7 +380,8 @@ describe('build conditionals', () => {
         propMutable: true,
         event: false,
         listener: false,
-        hostTheme: false
+        hostTheme: false,
+        updatable: true
       });
     });
 
@@ -395,7 +397,8 @@ describe('build conditionals', () => {
         state: true,
         event: false,
         listener: false,
-        hostTheme: false
+        hostTheme: false,
+        updatable: true
       });
     });
 
@@ -413,7 +416,8 @@ describe('build conditionals', () => {
         event: false,
         listener: false,
         hostTheme: false,
-        observeAttr: true
+        observeAttr: true,
+        updatable: true
       });
     });
 
@@ -431,7 +435,8 @@ describe('build conditionals', () => {
         event: false,
         listener: false,
         hostTheme: false,
-        observeAttr: true
+        observeAttr: true,
+        updatable: true
       });
     });
 
@@ -449,7 +454,8 @@ describe('build conditionals', () => {
         prop: true,
         listener: false,
         hostTheme: false,
-        observeAttr: true
+        observeAttr: true,
+        updatable: true
       });
     });
 
@@ -467,7 +473,8 @@ describe('build conditionals', () => {
         event: false,
         listener: false,
         hostTheme: false,
-        observeAttr: true
+        observeAttr: true,
+        updatable: true
       });
     });