fix(runtime): grab location from window

ionic-team · May 29, 2019 · 26fd3cf · 26fd3cf
1 parent acf0f79
commit 26fd3cf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/client/import-shims.ts b/src/client/import-shims.ts
@@ -22,7 +22,7 @@ export const patchBrowser = async () => {
       s.getAttribute('data-namespace') === NAMESPACE
     ));
 
-    const resourcesUrl = new URL('.', new URL(scriptElm.getAttribute('data-resources-url') || scriptElm.src, doc.location.href));
+    const resourcesUrl = new URL('.', new URL(scriptElm.getAttribute('data-resources-url') || scriptElm.src, win.location.href));
     patchDynamicImport(resourcesUrl.href);
 
     if (!window.customElements) {

diff --git a/src/compiler/transformers/test/parse-comments.spec.ts b/src/compiler/transformers/test/parse-comments.spec.ts
@@ -65,9 +65,9 @@ describe('parse comments', () => {
             'text': '',
           },
         ],
-        'return': '{}',
+        'return': 'unknown',
         'references': {},
-        'signature': '(prop: string) => {}',
+        'signature': '(prop: string) => unknown',
       },
       'docs': {
         'tags': [],

diff --git a/src/mock-doc/document.ts b/src/mock-doc/document.ts
@@ -43,6 +43,18 @@ export class MockDocument extends MockElement {
     }
   }
 
+  get location() {
+    if (this.defaultView != null) {
+      return (this.defaultView as Window).location;
+    }
+    return null;
+  }
+  set location(val: Location) {
+    if (this.defaultView != null) {
+      (this.defaultView as Window).location = val;
+    }
+  }
+
   get baseURI() {
     if (this.defaultView != null) {
       return (this.defaultView as Window).location.href;

diff --git a/src/runtime/bootstrap-lazy.ts b/src/runtime/bootstrap-lazy.ts
@@ -19,7 +19,7 @@ export const bootstrapLazy = (lazyBundles: d.LazyBundlesRuntimeData, options: d.
   const y = /*@__PURE__*/head.querySelector('meta[charset]');
   const visibilityStyle = /*@__PURE__*/doc.createElement('style');
   Object.assign(plt, options);
-  plt.$resourcesUrl$ = new URL(options.resourcesUrl || '/', doc.location.href).href;
+  plt.$resourcesUrl$ = new URL(options.resourcesUrl || '/', win.location.href).href;
   if (options.syncQueue) {
     plt.$flags$ |= PLATFORM_FLAGS.queueSync;
   }