1 files changed, 64 insertions, 60 deletions
diff --git a/ext/web/04_global_interfaces.js b/ext/web/04_global_interfaces.js
index 840f93ba9..6a42968db 100644
--- a/ext/web/04_global_interfaces.js
+++ b/ext/web/04_global_interfaces.js
@@ -1,79 +1,83 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-"use strict";
 
 // @ts-check
 /// <reference path="../../core/internal.d.ts" />
 
-((window) => {
-  const { EventTarget } = window.__bootstrap.eventTarget;
-  const {
-    Symbol,
-    SymbolToStringTag,
-    TypeError,
-  } = window.__bootstrap.primordials;
+import { EventTarget } from "internal:ext/web/02_event.js";
+const primordials = globalThis.__bootstrap.primordials;
+const {
+  Symbol,
+  SymbolToStringTag,
+  TypeError,
+} = primordials;
 
-  const illegalConstructorKey = Symbol("illegalConstructorKey");
+const illegalConstructorKey = Symbol("illegalConstructorKey");
 
-  class Window extends EventTarget {
-    constructor(key = null) {
-      if (key !== illegalConstructorKey) {
-        throw new TypeError("Illegal constructor.");
-      }
-      super();
+class Window extends EventTarget {
+  constructor(key = null) {
+    if (key !== illegalConstructorKey) {
+      throw new TypeError("Illegal constructor.");
     }
+    super();
+  }
 
-    get [SymbolToStringTag]() {
-      return "Window";
-    }
+  get [SymbolToStringTag]() {
+    return "Window";
   }
+}
 
-  class WorkerGlobalScope extends EventTarget {
-    constructor(key = null) {
-      if (key != illegalConstructorKey) {
-        throw new TypeError("Illegal constructor.");
-      }
-      super();
+class WorkerGlobalScope extends EventTarget {
+  constructor(key = null) {
+    if (key != illegalConstructorKey) {
+      throw new TypeError("Illegal constructor.");
     }
+    super();
+  }
 
-    get [SymbolToStringTag]() {
-      return "WorkerGlobalScope";
-    }
+  get [SymbolToStringTag]() {
+    return "WorkerGlobalScope";
   }
+}
 
-  class DedicatedWorkerGlobalScope extends WorkerGlobalScope {
-    constructor(key = null) {
-      if (key != illegalConstructorKey) {
-        throw new TypeError("Illegal constructor.");
-      }
-      super();
+class DedicatedWorkerGlobalScope extends WorkerGlobalScope {
+  constructor(key = null) {
+    if (key != illegalConstructorKey) {
+      throw new TypeError("Illegal constructor.");
     }
+    super();
+  }
 
-    get [SymbolToStringTag]() {
-      return "DedicatedWorkerGlobalScope";
-    }
+  get [SymbolToStringTag]() {
+    return "DedicatedWorkerGlobalScope";
   }
+}
+
+const dedicatedWorkerGlobalScopeConstructorDescriptor = {
+  configurable: true,
+  enumerable: false,
+  value: DedicatedWorkerGlobalScope,
+  writable: true,
+};
+
+const windowConstructorDescriptor = {
+  configurable: true,
+  enumerable: false,
+  value: Window,
+  writable: true,
+};
+
+const workerGlobalScopeConstructorDescriptor = {
+  configurable: true,
+  enumerable: false,
+  value: WorkerGlobalScope,
+  writable: true,
+};
 
-  window.__bootstrap.globalInterfaces = {
-    DedicatedWorkerGlobalScope,
-    Window,
-    WorkerGlobalScope,
-    dedicatedWorkerGlobalScopeConstructorDescriptor: {
-      configurable: true,
-      enumerable: false,
-      value: DedicatedWorkerGlobalScope,
-      writable: true,
-    },
-    windowConstructorDescriptor: {
-      configurable: true,
-      enumerable: false,
-      value: Window,
-      writable: true,
-    },
-    workerGlobalScopeConstructorDescriptor: {
-      configurable: true,
-      enumerable: false,
-      value: WorkerGlobalScope,
-      writable: true,
-    },
-  };
-})(this);
+export {
+  DedicatedWorkerGlobalScope,
+  dedicatedWorkerGlobalScopeConstructorDescriptor,
+  Window,
+  windowConstructorDescriptor,
+  WorkerGlobalScope,
+  workerGlobalScopeConstructorDescriptor,
+};