refactor: use web utils and lazy load utils from core (#22289)

1 files changed, 6 insertions, 7 deletions

diff --git a/runtime/js/98_global_scope_worker.js b/runtime/js/98_global_scope_worker.js
index df08f7b15..8e292108f 100644
--- a/runtime/js/98_global_scope_worker.js
+++ b/runtime/js/98_global_scope_worker.js
@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { primordials } from "ext:core/mod.js";
+import { core, primordials } from "ext:core/mod.js";
 import {
   op_bootstrap_language,
   op_bootstrap_numcpus,
@@ -12,12 +12,11 @@ const {
   SymbolFor,
 } = primordials;
 
-import * as util from "ext:runtime/06_util.js";
 import * as location from "ext:deno_web/12_location.js";
 import * as console from "ext:deno_console/01_console.js";
 import * as webidl from "ext:deno_webidl/00_webidl.js";
 import * as globalInterfaces from "ext:deno_web/04_global_interfaces.js";
-import { loadWebGPU, webgpu } from "ext:deno_webgpu/00_init.js";
+import { loadWebGPU } from "ext:deno_webgpu/00_init.js";
 
 function memoizeLazy(f) {
   let v_ = null;
@@ -63,7 +62,7 @@ ObjectDefineProperties(WorkerNavigator.prototype, {
     enumerable: true,
     get() {
       webidl.assertBranded(this, WorkerNavigatorPrototype);
-      loadWebGPU();
+      const webgpu = loadWebGPU();
       return webgpu.gpu;
     },
   },
@@ -108,9 +107,9 @@ const workerRuntimeGlobalProperties = {
   WorkerGlobalScope: globalInterfaces.workerGlobalScopeConstructorDescriptor,
   DedicatedWorkerGlobalScope:
     globalInterfaces.dedicatedWorkerGlobalScopeConstructorDescriptor,
-  WorkerNavigator: util.nonEnumerable(WorkerNavigator),
-  navigator: util.getterOnly(() => workerNavigator),
-  self: util.getterOnly(() => globalThis),
+  WorkerNavigator: core.propNonEnumerable(WorkerNavigator),
+  navigator: core.propGetterOnly(() => workerNavigator),
+  self: core.propGetterOnly(() => globalThis),
 };
 
 export { workerRuntimeGlobalProperties };