1 files changed, 14 insertions, 47 deletions
diff --git a/js/globals.ts b/js/globals.ts
index 2e6b24305..11a172633 100644
--- a/js/globals.ts
+++ b/js/globals.ts
@@ -1,55 +1,22 @@
 // Copyright 2018 the Deno authors. All rights reserved. MIT license.
 
-import { Console } from "./console";
-import * as timers from "./timers";
-import * as textEncoding from "./text_encoding";
+import * as blob from "./blob";
+import * as console from "./console";
 import * as fetch_ from "./fetch";
-import { libdeno } from "./libdeno";
 import { globalEval } from "./global_eval";
-import { DenoHeaders } from "./fetch";
-import { DenoBlob } from "./blob";
-
-declare global {
-  interface Window {
-    define: Readonly<unknown>;
-
-    clearTimeout: typeof clearTimeout;
-    clearInterval: typeof clearInterval;
-    setTimeout: typeof setTimeout;
-    setInterval: typeof setInterval;
-
-    console: typeof console;
-    window: typeof window;
-
-    fetch: typeof fetch;
-
-    TextEncoder: typeof TextEncoder;
-    TextDecoder: typeof TextDecoder;
-    atob: typeof atob;
-    btoa: typeof btoa;
+import { libdeno } from "./libdeno";
+import * as textEncoding from "./text_encoding";
+import * as timers from "./timers";
 
-    Headers: typeof Headers;
-    Blob: typeof Blob;
-  }
+// During the build process, augmentations to the variable `window` in this
+// file are tracked and created as part of default library that is built into
+// deno, we only need to declare the enough to compile deno.
 
-  const clearTimeout: typeof timers.clearTimer;
-  const clearInterval: typeof timers.clearTimer;
+declare global {
+  const console: console.Console;
   const setTimeout: typeof timers.setTimeout;
-  const setInterval: typeof timers.setInterval;
-
-  const console: Console;
-  const window: Window;
-
-  const fetch: typeof fetch_.fetch;
-
-  // tslint:disable:variable-name
+  // tslint:disable-next-line:variable-name
   const TextEncoder: typeof textEncoding.TextEncoder;
-  const TextDecoder: typeof textEncoding.TextDecoder;
-  const atob: typeof textEncoding.atob;
-  const btoa: typeof textEncoding.btoa;
-  const Headers: typeof DenoHeaders;
-  const Blob: typeof DenoBlob;
-  // tslint:enable:variable-name
 }
 
 // A reference to the global object.
@@ -61,7 +28,7 @@ window.setInterval = timers.setInterval;
 window.clearTimeout = timers.clearTimer;
 window.clearInterval = timers.clearTimer;
 
-window.console = new Console(libdeno.print);
+window.console = new console.Console(libdeno.print);
 window.TextEncoder = textEncoding.TextEncoder;
 window.TextDecoder = textEncoding.TextDecoder;
 window.atob = textEncoding.atob;
@@ -69,5 +36,5 @@ window.btoa = textEncoding.btoa;
 
 window.fetch = fetch_.fetch;
 
-window.Headers = DenoHeaders;
-window.Blob = DenoBlob;
+window.Headers = fetch_.DenoHeaders;
+window.Blob = blob.DenoBlob;