Move browser globals not present in Citizen out of browser globals flow

citizenfx · Oct 12, 2021 · 409b4a7 · 409b4a7
1 parent 502c055
commit 409b4a7
Showing 1 changed file with 36 additions and 36 deletions.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -189,49 +189,49 @@ const {
   queueMicrotask
 } = require('internal/process/task_queues');
 
+const { URL, URLSearchParams } = require('internal/url');
+// https://url.spec.whatwg.org/#url
+exposeInterface(globalThis, 'URL', URL);
+// https://url.spec.whatwg.org/#urlsearchparams
+exposeInterface(globalThis, 'URLSearchParams', URLSearchParams);
+
+const {
+  TextEncoder, TextDecoder
+} = require('internal/encoding');
+// https://encoding.spec.whatwg.org/#textencoder
+exposeInterface(globalThis, 'TextEncoder', TextEncoder);
+// https://encoding.spec.whatwg.org/#textdecoder
+exposeInterface(globalThis, 'TextDecoder', TextDecoder);
+
+const {
+  AbortController,
+  AbortSignal,
+} = require('internal/abort_controller');
+exposeInterface(globalThis, 'AbortController', AbortController);
+exposeInterface(globalThis, 'AbortSignal', AbortSignal);
+
+const {
+  EventTarget,
+  Event,
+} = require('internal/event_target');
+exposeInterface(globalThis, 'EventTarget', EventTarget);
+exposeInterface(globalThis, 'Event', Event);
+const {
+  MessageChannel,
+  MessagePort,
+  MessageEvent,
+} = require('internal/worker/io');
+exposeInterface(globalThis, 'MessageChannel', MessageChannel);
+exposeInterface(globalThis, 'MessagePort', MessagePort);
+exposeInterface(globalThis, 'MessageEvent', MessageEvent);
+
 if (!config.noBrowserGlobals || process.isCitizenAltMode) {
   // Override global console from the one provided by the VM
   // to the one implemented by Node.js
   // https://console.spec.whatwg.org/#console-namespace
   exposeNamespace(globalThis, 'console',
                   createGlobalConsole(globalThis.console));
 
-  const { URL, URLSearchParams } = require('internal/url');
-  // https://url.spec.whatwg.org/#url
-  exposeInterface(globalThis, 'URL', URL);
-  // https://url.spec.whatwg.org/#urlsearchparams
-  exposeInterface(globalThis, 'URLSearchParams', URLSearchParams);
-
-  const {
-    TextEncoder, TextDecoder
-  } = require('internal/encoding');
-  // https://encoding.spec.whatwg.org/#textencoder
-  exposeInterface(globalThis, 'TextEncoder', TextEncoder);
-  // https://encoding.spec.whatwg.org/#textdecoder
-  exposeInterface(globalThis, 'TextDecoder', TextDecoder);
-
-  const {
-    AbortController,
-    AbortSignal,
-  } = require('internal/abort_controller');
-  exposeInterface(globalThis, 'AbortController', AbortController);
-  exposeInterface(globalThis, 'AbortSignal', AbortSignal);
-
-  const {
-    EventTarget,
-    Event,
-  } = require('internal/event_target');
-  exposeInterface(globalThis, 'EventTarget', EventTarget);
-  exposeInterface(globalThis, 'Event', Event);
-  const {
-    MessageChannel,
-    MessagePort,
-    MessageEvent,
-  } = require('internal/worker/io');
-  exposeInterface(globalThis, 'MessageChannel', MessageChannel);
-  exposeInterface(globalThis, 'MessagePort', MessagePort);
-  exposeInterface(globalThis, 'MessageEvent', MessageEvent);
-
   // https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope
   const timers = require('timers');
   defineOperation(globalThis, 'clearInterval', timers.clearInterval);