From 409b4a73560ae7d3828667dc442f29aebe12ebe9 Mon Sep 17 00:00:00 2001 From: blattersturm Date: Tue, 12 Oct 2021 12:35:36 +0200 Subject: [PATCH] Move browser globals not present in Citizen out of browser globals flow --- lib/internal/bootstrap/node.js | 72 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 88bf244bd52cf0..38639446a1c441 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -189,6 +189,42 @@ 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 @@ -196,42 +232,6 @@ if (!config.noBrowserGlobals || process.isCitizenAltMode) { 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);