1 files changed, 114 insertions, 115 deletions
diff --git a/runtime/js/30_os.js b/runtime/js/30_os.js
index 8069c3a34..720545b40 100644
--- a/runtime/js/30_os.js
+++ b/runtime/js/30_os.js
@@ -1,123 +1,122 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-"use strict";
-
-((window) => {
-  const core = window.Deno.core;
-  const ops = core.ops;
-  const { Event } = window.__bootstrap.event;
-  const { EventTarget } = window.__bootstrap.eventTarget;
-  const {
-    Error,
-    SymbolFor,
-  } = window.__bootstrap.primordials;
-
-  const windowDispatchEvent = EventTarget.prototype.dispatchEvent.bind(window);
-
-  function loadavg() {
-    return ops.op_loadavg();
-  }
-
-  function hostname() {
-    return ops.op_hostname();
-  }
-
-  function osRelease() {
-    return ops.op_os_release();
-  }
-
-  function createOsUptime(opFn) {
-    return function osUptime() {
-      return opFn();
-    };
-  }
-
-  function systemMemoryInfo() {
-    return ops.op_system_memory_info();
-  }
-
-  function networkInterfaces() {
-    return ops.op_network_interfaces();
-  }
-
-  function gid() {
-    return ops.op_gid();
-  }
 
-  function uid() {
-    return ops.op_uid();
-  }
-
-  // This is an internal only method used by the test harness to override the
-  // behavior of exit when the exit sanitizer is enabled.
-  let exitHandler = null;
-  function setExitHandler(fn) {
-    exitHandler = fn;
-  }
-
-  function exit(code) {
-    // Set exit code first so unload event listeners can override it.
-    if (typeof code === "number") {
-      ops.op_set_exit_code(code);
-    } else {
-      code = 0;
-    }
-
-    // Dispatches `unload` only when it's not dispatched yet.
-    if (!window[SymbolFor("isUnloadDispatched")]) {
-      // Invokes the `unload` hooks before exiting
-      // ref: https://github.com/denoland/deno/issues/3603
-      windowDispatchEvent(new Event("unload"));
-    }
-
-    if (exitHandler) {
-      exitHandler(code);
-      return;
-    }
-
-    ops.op_exit();
-    throw new Error("Code not reachable");
-  }
-
-  function setEnv(key, value) {
-    ops.op_set_env(key, value);
-  }
-
-  function getEnv(key) {
-    return ops.op_get_env(key) ?? undefined;
+const core = globalThis.Deno.core;
+const ops = core.ops;
+import { Event, EventTarget } from "internal:ext/web/02_event.js";
+const primordials = globalThis.__bootstrap.primordials;
+const {
+  Error,
+  SymbolFor,
+} = primordials;
+
+const windowDispatchEvent = EventTarget.prototype.dispatchEvent.bind(
+  globalThis,
+);
+
+function loadavg() {
+  return ops.op_loadavg();
+}
+
+function hostname() {
+  return ops.op_hostname();
+}
+
+function osRelease() {
+  return ops.op_os_release();
+}
+
+function createOsUptime(opFn) {
+  return function osUptime() {
+    return opFn();
+  };
+}
+
+function systemMemoryInfo() {
+  return ops.op_system_memory_info();
+}
+
+function networkInterfaces() {
+  return ops.op_network_interfaces();
+}
+
+function gid() {
+  return ops.op_gid();
+}
+
+function uid() {
+  return ops.op_uid();
+}
+
+// This is an internal only method used by the test harness to override the
+// behavior of exit when the exit sanitizer is enabled.
+let exitHandler = null;
+function setExitHandler(fn) {
+  exitHandler = fn;
+}
+
+function exit(code) {
+  // Set exit code first so unload event listeners can override it.
+  if (typeof code === "number") {
+    ops.op_set_exit_code(code);
+  } else {
+    code = 0;
   }
 
-  function deleteEnv(key) {
-    ops.op_delete_env(key);
+  // Dispatches `unload` only when it's not dispatched yet.
+  if (!globalThis[SymbolFor("isUnloadDispatched")]) {
+    // Invokes the `unload` hooks before exiting
+    // ref: https://github.com/denoland/deno/issues/3603
+    windowDispatchEvent(new Event("unload"));
   }
 
-  const env = {
-    get: getEnv,
-    toObject() {
-      return ops.op_env();
-    },
-    set: setEnv,
-    has(key) {
-      return getEnv(key) !== undefined;
-    },
-    delete: deleteEnv,
-  };
-
-  function execPath() {
-    return ops.op_exec_path();
+  if (exitHandler) {
+    exitHandler(code);
+    return;
   }
 
-  window.__bootstrap.os = {
-    env,
-    execPath,
-    exit,
-    gid,
-    hostname,
-    loadavg,
-    networkInterfaces,
-    osRelease,
-    createOsUptime,
-    setExitHandler,
-    systemMemoryInfo,
-    uid,
-  };
-})(this);
+  ops.op_exit();
+  throw new Error("Code not reachable");
+}
+
+function setEnv(key, value) {
+  ops.op_set_env(key, value);
+}
+
+function getEnv(key) {
+  return ops.op_get_env(key) ?? undefined;
+}
+
+function deleteEnv(key) {
+  ops.op_delete_env(key);
+}
+
+const env = {
+  get: getEnv,
+  toObject() {
+    return ops.op_env();
+  },
+  set: setEnv,
+  has(key) {
+    return getEnv(key) !== undefined;
+  },
+  delete: deleteEnv,
+};
+
+function execPath() {
+  return ops.op_exec_path();
+}
+
+export {
+  createOsUptime,
+  env,
+  execPath,
+  exit,
+  gid,
+  hostname,
+  loadavg,
+  networkInterfaces,
+  osRelease,
+  setExitHandler,
+  systemMemoryInfo,
+  uid,
+};