diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-12-07 14:21:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-07 14:21:01 +0100 |
commit | c1fc7b2cd511ce83566f696c8880d6718e5c6885 (patch) | |
tree | 6430faa4996b1022c0e1ae1e78cb3b9e196029eb /ext/web | |
parent | 5dd9b26155ceed514364f92fe4fdacb6b8cc8182 (diff) |
refactor: pull 'core', 'internals', 'primordials' from ES module (#21462)
This commit refactors how we access "core", "internals" and
"primordials" objects coming from `deno_core`, in our internal JavaScript code.
Instead of capturing them from "globalThis.__bootstrap" namespace, we
import them from recently added "ext:core/mod.js" file.
Diffstat (limited to 'ext/web')
-rw-r--r-- | ext/web/00_infra.js | 4 | ||||
-rw-r--r-- | ext/web/01_dom_exception.js | 2 | ||||
-rw-r--r-- | ext/web/01_mimesniff.js | 2 | ||||
-rw-r--r-- | ext/web/02_event.js | 3 | ||||
-rw-r--r-- | ext/web/02_structured_clone.js | 3 | ||||
-rw-r--r-- | ext/web/02_timers.js | 3 | ||||
-rw-r--r-- | ext/web/03_abort_signal.js | 2 | ||||
-rw-r--r-- | ext/web/04_global_interfaces.js | 2 | ||||
-rw-r--r-- | ext/web/05_base64.js | 3 | ||||
-rw-r--r-- | ext/web/06_streams.js | 4 | ||||
-rw-r--r-- | ext/web/08_text_encoding.js | 3 | ||||
-rw-r--r-- | ext/web/09_file.js | 3 | ||||
-rw-r--r-- | ext/web/10_filereader.js | 3 | ||||
-rw-r--r-- | ext/web/12_location.js | 2 | ||||
-rw-r--r-- | ext/web/13_message_port.js | 3 | ||||
-rw-r--r-- | ext/web/14_compression.js | 3 | ||||
-rw-r--r-- | ext/web/15_performance.js | 2 |
17 files changed, 17 insertions, 30 deletions
diff --git a/ext/web/00_infra.js b/ext/web/00_infra.js index 441081604..91bacb9e9 100644 --- a/ext/web/00_infra.js +++ b/ext/web/00_infra.js @@ -6,10 +6,8 @@ /// <reference path="../web/internal.d.ts" /> /// <reference path="../web/lib.deno_web.d.ts" /> -const core = globalThis.Deno.core; -const internals = globalThis.__bootstrap.internals; +import { core, internals, primordials } from "ext:core/mod.js"; const ops = core.ops; -const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeJoin, ArrayPrototypeMap, diff --git a/ext/web/01_dom_exception.js b/ext/web/01_dom_exception.js index 941b057e4..fcf96e77a 100644 --- a/ext/web/01_dom_exception.js +++ b/ext/web/01_dom_exception.js @@ -7,7 +7,7 @@ /// <reference path="../web/internal.d.ts" /> /// <reference path="../web/lib.deno_web.d.ts" /> -const primordials = globalThis.__bootstrap.primordials; +import { primordials } from "ext:core/mod.js"; const { ArrayPrototypeSlice, Error, diff --git a/ext/web/01_mimesniff.js b/ext/web/01_mimesniff.js index 7d402e080..66cc41e2c 100644 --- a/ext/web/01_mimesniff.js +++ b/ext/web/01_mimesniff.js @@ -6,7 +6,7 @@ /// <reference path="../web/internal.d.ts" /> /// <reference path="../web/lib.deno_web.d.ts" /> -const primordials = globalThis.__bootstrap.primordials; +import { primordials } from "ext:core/mod.js"; const { ArrayPrototypeIncludes, MapPrototypeGet, diff --git a/ext/web/02_event.js b/ext/web/02_event.js index f0c24f353..a171a1991 100644 --- a/ext/web/02_event.js +++ b/ext/web/02_event.js @@ -5,11 +5,10 @@ // parts still exists. This means you will observe a lot of strange structures // and impossible logic branches based on what Deno currently supports. -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; import * as webidl from "ext:deno_webidl/00_webidl.js"; import DOMException from "ext:deno_web/01_dom_exception.js"; import { createFilteredInspectProxy } from "ext:deno_console/01_console.js"; -const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeFilter, ArrayPrototypeIncludes, diff --git a/ext/web/02_structured_clone.js b/ext/web/02_structured_clone.js index b0c7559c0..53e146616 100644 --- a/ext/web/02_structured_clone.js +++ b/ext/web/02_structured_clone.js @@ -6,9 +6,8 @@ /// <reference path="../web/internal.d.ts" /> /// <reference path="../web/lib.deno_web.d.ts" /> -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; import DOMException from "ext:deno_web/01_dom_exception.js"; -const primordials = globalThis.__bootstrap.primordials; const { ArrayBuffer, ArrayBufferPrototype, diff --git a/ext/web/02_timers.js b/ext/web/02_timers.js index ee974345b..27a9fcbde 100644 --- a/ext/web/02_timers.js +++ b/ext/web/02_timers.js @@ -1,8 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; -const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypePush, ArrayPrototypeShift, diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js index f534ec04f..acde8b42e 100644 --- a/ext/web/03_abort_signal.js +++ b/ext/web/03_abort_signal.js @@ -13,7 +13,7 @@ import { listenerCount, setIsTrusted, } from "ext:deno_web/02_event.js"; -const primordials = globalThis.__bootstrap.primordials; +import { primordials } from "ext:core/mod.js"; const { ArrayPrototypeEvery, ArrayPrototypePush, diff --git a/ext/web/04_global_interfaces.js b/ext/web/04_global_interfaces.js index 375c98198..c68a5d1c3 100644 --- a/ext/web/04_global_interfaces.js +++ b/ext/web/04_global_interfaces.js @@ -4,7 +4,7 @@ /// <reference path="../../core/internal.d.ts" /> import { EventTarget } from "ext:deno_web/02_event.js"; -const primordials = globalThis.__bootstrap.primordials; +import { primordials } from "ext:core/mod.js"; const { Symbol, SymbolToStringTag, diff --git a/ext/web/05_base64.js b/ext/web/05_base64.js index 3971b2e58..65792bd27 100644 --- a/ext/web/05_base64.js +++ b/ext/web/05_base64.js @@ -6,11 +6,10 @@ /// <reference path="../web/internal.d.ts" /> /// <reference lib="esnext" /> -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; import * as webidl from "ext:deno_webidl/00_webidl.js"; import DOMException from "ext:deno_web/01_dom_exception.js"; -const primordials = globalThis.__bootstrap.primordials; const { ObjectPrototypeIsPrototypeOf, TypeErrorPrototype, diff --git a/ext/web/06_streams.js b/ext/web/06_streams.js index 9fc15d1ad..1df375328 100644 --- a/ext/web/06_streams.js +++ b/ext/web/06_streams.js @@ -6,8 +6,7 @@ /// <reference path="./lib.deno_web.d.ts" /> /// <reference lib="esnext" /> -const core = globalThis.Deno.core; -const internals = globalThis.__bootstrap.internals; +import { core, internals, primordials } from "ext:core/mod.js"; const { op_arraybuffer_was_detached, op_transfer_arraybuffer, @@ -29,7 +28,6 @@ import { remove, signalAbort, } from "ext:deno_web/03_abort_signal.js"; -const primordials = globalThis.__bootstrap.primordials; const { ArrayBuffer, ArrayBufferIsView, diff --git a/ext/web/08_text_encoding.js b/ext/web/08_text_encoding.js index 81a3425ed..e942fadea 100644 --- a/ext/web/08_text_encoding.js +++ b/ext/web/08_text_encoding.js @@ -9,11 +9,10 @@ /// <reference path="../web/lib.deno_web.d.ts" /> /// <reference lib="esnext" /> -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; import * as webidl from "ext:deno_webidl/00_webidl.js"; import { createFilteredInspectProxy } from "ext:deno_console/01_console.js"; -const primordials = globalThis.__bootstrap.primordials; const { DataViewPrototypeGetBuffer, DataViewPrototypeGetByteLength, diff --git a/ext/web/09_file.js b/ext/web/09_file.js index 7ee029d8a..6e91e2492 100644 --- a/ext/web/09_file.js +++ b/ext/web/09_file.js @@ -10,12 +10,11 @@ /// <reference path="./internal.d.ts" /> /// <reference lib="esnext" /> -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; import * as webidl from "ext:deno_webidl/00_webidl.js"; import { ReadableStream } from "ext:deno_web/06_streams.js"; import { URL } from "ext:deno_url/00_url.js"; -const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, ArrayBufferPrototypeSlice, diff --git a/ext/web/10_filereader.js b/ext/web/10_filereader.js index 07a5a38ec..437086861 100644 --- a/ext/web/10_filereader.js +++ b/ext/web/10_filereader.js @@ -10,11 +10,10 @@ /// <reference path="./internal.d.ts" /> /// <reference lib="esnext" /> -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; import * as webidl from "ext:deno_webidl/00_webidl.js"; import { createFilteredInspectProxy } from "ext:deno_console/01_console.js"; -const primordials = globalThis.__bootstrap.primordials; import { forgivingBase64Encode } from "ext:deno_web/00_infra.js"; import { EventTarget, ProgressEvent } from "ext:deno_web/02_event.js"; import { decode, TextDecoder } from "ext:deno_web/08_text_encoding.js"; diff --git a/ext/web/12_location.js b/ext/web/12_location.js index f469e9093..ed44d7c51 100644 --- a/ext/web/12_location.js +++ b/ext/web/12_location.js @@ -4,7 +4,7 @@ import { URL } from "ext:deno_url/00_url.js"; import DOMException from "ext:deno_web/01_dom_exception.js"; -const primordials = globalThis.__bootstrap.primordials; +import { primordials } from "ext:core/mod.js"; const { Error, ObjectDefineProperties, diff --git a/ext/web/13_message_port.js b/ext/web/13_message_port.js index 2a0d864ba..c1ba3f4c4 100644 --- a/ext/web/13_message_port.js +++ b/ext/web/13_message_port.js @@ -6,7 +6,7 @@ /// <reference path="./internal.d.ts" /> /// <reference path="./lib.deno_web.d.ts" /> -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; const { InterruptedPrototype, ops } = core; import * as webidl from "ext:deno_webidl/00_webidl.js"; import { createFilteredInspectProxy } from "ext:deno_console/01_console.js"; @@ -18,7 +18,6 @@ import { setIsTrusted, } from "ext:deno_web/02_event.js"; import DOMException from "ext:deno_web/01_dom_exception.js"; -const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, ArrayBufferPrototypeGetByteLength, diff --git a/ext/web/14_compression.js b/ext/web/14_compression.js index 0563861c2..d992c33f2 100644 --- a/ext/web/14_compression.js +++ b/ext/web/14_compression.js @@ -5,9 +5,8 @@ /// <reference path="./internal.d.ts" /> /// <reference path="./lib.deno_web.d.ts" /> -const core = globalThis.Deno.core; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; -const primordials = globalThis.__bootstrap.primordials; const { SymbolFor, ObjectPrototypeIsPrototypeOf, diff --git a/ext/web/15_performance.js b/ext/web/15_performance.js index 4527ff00c..4a5b42ef6 100644 --- a/ext/web/15_performance.js +++ b/ext/web/15_performance.js @@ -1,6 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -const primordials = globalThis.__bootstrap.primordials; +import { primordials } from "ext:core/mod.js"; const { ArrayPrototypeFilter, ArrayPrototypeFind, |