diff options
Diffstat (limited to 'ext/web')
-rw-r--r-- | ext/web/01_dom_exception.js | 4 | ||||
-rw-r--r-- | ext/web/01_mimesniff.js | 2 | ||||
-rw-r--r-- | ext/web/02_event.js | 6 | ||||
-rw-r--r-- | ext/web/02_structured_clone.js | 2 | ||||
-rw-r--r-- | ext/web/02_timers.js | 6 | ||||
-rw-r--r-- | ext/web/03_abort_signal.js | 6 | ||||
-rw-r--r-- | ext/web/04_global_interfaces.js | 2 | ||||
-rw-r--r-- | ext/web/05_base64.js | 4 | ||||
-rw-r--r-- | ext/web/06_streams.js | 8 | ||||
-rw-r--r-- | ext/web/08_text_encoding.js | 2 | ||||
-rw-r--r-- | ext/web/09_file.js | 4 | ||||
-rw-r--r-- | ext/web/10_filereader.js | 12 | ||||
-rw-r--r-- | ext/web/11_blob_url.js | 6 | ||||
-rw-r--r-- | ext/web/12_location.js | 4 | ||||
-rw-r--r-- | ext/web/13_message_port.js | 6 | ||||
-rw-r--r-- | ext/web/14_compression.js | 4 | ||||
-rw-r--r-- | ext/web/15_performance.js | 12 | ||||
-rw-r--r-- | ext/web/benches/encoding.rs | 2 | ||||
-rw-r--r-- | ext/web/benches/timers_ops.rs | 2 | ||||
-rw-r--r-- | ext/web/internal.d.ts | 18 | ||||
-rw-r--r-- | ext/web/lib.rs | 1 |
21 files changed, 56 insertions, 57 deletions
diff --git a/ext/web/01_dom_exception.js b/ext/web/01_dom_exception.js index cbec9ca22..116fe0490 100644 --- a/ext/web/01_dom_exception.js +++ b/ext/web/01_dom_exception.js @@ -20,8 +20,8 @@ const { Symbol, SymbolFor, } = primordials; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { createFilteredInspectProxy } from "internal:ext/console/02_console.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; const _name = Symbol("name"); const _message = Symbol("message"); diff --git a/ext/web/01_mimesniff.js b/ext/web/01_mimesniff.js index 17d954eb4..40f5c03eb 100644 --- a/ext/web/01_mimesniff.js +++ b/ext/web/01_mimesniff.js @@ -26,7 +26,7 @@ import { HTTP_WHITESPACE, HTTP_WHITESPACE_PREFIX_RE, HTTP_WHITESPACE_SUFFIX_RE, -} from "internal:ext/web/00_infra.js"; +} from "internal:deno_web/00_infra.js"; /** * @typedef MimeType diff --git a/ext/web/02_event.js b/ext/web/02_event.js index de5210d33..37cdab9a2 100644 --- a/ext/web/02_event.js +++ b/ext/web/02_event.js @@ -7,9 +7,9 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; -import { createFilteredInspectProxy } from "internal:ext/console/02_console.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; +import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeFilter, diff --git a/ext/web/02_structured_clone.js b/ext/web/02_structured_clone.js index 373ae0ab2..082b0a80f 100644 --- a/ext/web/02_structured_clone.js +++ b/ext/web/02_structured_clone.js @@ -7,7 +7,7 @@ /// <reference path="../web/lib.deno_web.d.ts" /> const core = globalThis.Deno.core; -import DOMException from "internal:ext/web/01_dom_exception.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBuffer, diff --git a/ext/web/02_timers.js b/ext/web/02_timers.js index 302b6f62c..24ec760bd 100644 --- a/ext/web/02_timers.js +++ b/ext/web/02_timers.js @@ -22,9 +22,9 @@ const { TypeError, indirectEval, } = primordials; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { reportException } from "internal:ext/web/02_event.js"; -import { assert } from "internal:ext/web/00_infra.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { reportException } from "internal:deno_web/02_event.js"; +import { assert } from "internal:deno_web/00_infra.js"; const hrU8 = new Uint8Array(8); const hr = new Uint32Array(hrU8.buffer); diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js index 96757f41f..1842217bb 100644 --- a/ext/web/03_abort_signal.js +++ b/ext/web/03_abort_signal.js @@ -3,14 +3,14 @@ // @ts-check /// <reference path="../../core/internal.d.ts" /> -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; import { defineEventHandler, Event, EventTarget, listenerCount, setIsTrusted, -} from "internal:ext/web/02_event.js"; +} from "internal:deno_web/02_event.js"; const primordials = globalThis.__bootstrap.primordials; const { SafeArrayIterator, @@ -25,7 +25,7 @@ import { refTimer, setTimeout, unrefTimer, -} from "internal:ext/web/02_timers.js"; +} from "internal:deno_web/02_timers.js"; const add = Symbol("[[add]]"); const signalAbort = Symbol("[[signalAbort]]"); diff --git a/ext/web/04_global_interfaces.js b/ext/web/04_global_interfaces.js index 6a42968db..edac0d5b7 100644 --- a/ext/web/04_global_interfaces.js +++ b/ext/web/04_global_interfaces.js @@ -3,7 +3,7 @@ // @ts-check /// <reference path="../../core/internal.d.ts" /> -import { EventTarget } from "internal:ext/web/02_event.js"; +import { EventTarget } from "internal:deno_web/02_event.js"; const primordials = globalThis.__bootstrap.primordials; const { Symbol, diff --git a/ext/web/05_base64.js b/ext/web/05_base64.js index 9f11ec97c..df64eab0d 100644 --- a/ext/web/05_base64.js +++ b/ext/web/05_base64.js @@ -8,8 +8,8 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { ObjectPrototypeIsPrototypeOf, diff --git a/ext/web/06_streams.js b/ext/web/06_streams.js index a88b60893..5dcf64af2 100644 --- a/ext/web/06_streams.js +++ b/ext/web/06_streams.js @@ -8,14 +8,14 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; import { AbortSignalPrototype, add, newSignal, remove, signalAbort, -} from "internal:ext/web/03_abort_signal.js"; +} from "internal:deno_web/03_abort_signal.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBuffer, @@ -68,8 +68,8 @@ const { WeakMapPrototypeHas, WeakMapPrototypeSet, } = primordials; -import { createFilteredInspectProxy } from "internal:ext/console/02_console.js"; -import { assert, AssertionError } from "internal:ext/web/00_infra.js"; +import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; +import { assert, AssertionError } from "internal:deno_web/00_infra.js"; /** @template T */ class Deferred { diff --git a/ext/web/08_text_encoding.js b/ext/web/08_text_encoding.js index f3ad966d0..571b9b628 100644 --- a/ext/web/08_text_encoding.js +++ b/ext/web/08_text_encoding.js @@ -11,7 +11,7 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; const primordials = globalThis.__bootstrap.primordials; const { PromiseReject, diff --git a/ext/web/09_file.js b/ext/web/09_file.js index e1be3b4c2..b44537dd4 100644 --- a/ext/web/09_file.js +++ b/ext/web/09_file.js @@ -12,7 +12,7 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, @@ -38,7 +38,7 @@ const { TypeError, Uint8Array, } = primordials; -import { createFilteredInspectProxy } from "internal:ext/console/02_console.js"; +import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; // TODO(lucacasonato): this needs to not be hardcoded and instead depend on // host os. diff --git a/ext/web/10_filereader.js b/ext/web/10_filereader.js index 7a46dfa9a..8ff36494b 100644 --- a/ext/web/10_filereader.js +++ b/ext/web/10_filereader.js @@ -12,13 +12,13 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; const primordials = globalThis.__bootstrap.primordials; -import { forgivingBase64Encode } from "internal:ext/web/00_infra.js"; -import { EventTarget, ProgressEvent } from "internal:ext/web/02_event.js"; -import { decode, TextDecoder } from "internal:ext/web/08_text_encoding.js"; -import { parseMimeType } from "internal:ext/web/01_mimesniff.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; +import { forgivingBase64Encode } from "internal:deno_web/00_infra.js"; +import { EventTarget, ProgressEvent } from "internal:deno_web/02_event.js"; +import { decode, TextDecoder } from "internal:deno_web/08_text_encoding.js"; +import { parseMimeType } from "internal:deno_web/01_mimesniff.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; const { ArrayPrototypePush, ArrayPrototypeReduce, diff --git a/ext/web/11_blob_url.js b/ext/web/11_blob_url.js index 02551fef6..205d0851f 100644 --- a/ext/web/11_blob_url.js +++ b/ext/web/11_blob_url.js @@ -13,9 +13,9 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { getParts } from "internal:ext/web/09_file.js"; -import { URL } from "internal:ext/url/00_url.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { getParts } from "internal:deno_web/09_file.js"; +import { URL } from "internal:deno_url/00_url.js"; /** * @param {Blob} blob diff --git a/ext/web/12_location.js b/ext/web/12_location.js index da964eae8..6a15c0811 100644 --- a/ext/web/12_location.js +++ b/ext/web/12_location.js @@ -2,8 +2,8 @@ /// <reference path="../../core/internal.d.ts" /> -import { URL } from "internal:ext/url/00_url.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; +import { URL } from "internal:deno_url/00_url.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { Error, diff --git a/ext/web/13_message_port.js b/ext/web/13_message_port.js index 2a784bf3f..dafb2b782 100644 --- a/ext/web/13_message_port.js +++ b/ext/web/13_message_port.js @@ -8,14 +8,14 @@ const core = globalThis.Deno.core; const { InterruptedPrototype, ops } = core; -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; import { defineEventHandler, EventTarget, MessageEvent, setEventTargetData, -} from "internal:ext/web/02_event.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; +} from "internal:deno_web/02_event.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, diff --git a/ext/web/14_compression.js b/ext/web/14_compression.js index 680da757e..3998709ce 100644 --- a/ext/web/14_compression.js +++ b/ext/web/14_compression.js @@ -7,8 +7,8 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { TransformStream } from "internal:ext/web/06_streams.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { TransformStream } from "internal:deno_web/06_streams.js"; webidl.converters.CompressionFormat = webidl.createEnumConverter( "CompressionFormat", diff --git a/ext/web/15_performance.js b/ext/web/15_performance.js index 6a50f45f8..b1c4eb513 100644 --- a/ext/web/15_performance.js +++ b/ext/web/15_performance.js @@ -14,12 +14,12 @@ const { SymbolFor, TypeError, } = primordials; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { structuredClone } from "internal:ext/web/02_structured_clone.js"; -import { createFilteredInspectProxy } from "internal:ext/console/02_console.js"; -import { EventTarget } from "internal:ext/web/02_event.js"; -import { opNow } from "internal:ext/web/02_timers.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { structuredClone } from "internal:deno_web/02_structured_clone.js"; +import { createFilteredInspectProxy } from "internal:deno_console/02_console.js"; +import { EventTarget } from "internal:deno_web/02_event.js"; +import { opNow } from "internal:deno_web/02_timers.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; const illegalConstructorKey = Symbol("illegalConstructorKey"); const customInspect = SymbolFor("Deno.customInspect"); diff --git a/ext/web/benches/encoding.rs b/ext/web/benches/encoding.rs index f8ad57c4f..a96da1bc6 100644 --- a/ext/web/benches/encoding.rs +++ b/ext/web/benches/encoding.rs @@ -32,7 +32,7 @@ fn setup() -> Vec<Extension> { .esm(vec![( "internal:setup", r#" - import { TextDecoder } from "internal:ext/web/08_text_encoding.js"; + import { TextDecoder } from "internal:deno_web/08_text_encoding.js"; globalThis.TextDecoder = TextDecoder; globalThis.hello12k = Deno.core.encode("hello world\n".repeat(1e3)); "#, diff --git a/ext/web/benches/timers_ops.rs b/ext/web/benches/timers_ops.rs index a2af22982..943c73bbc 100644 --- a/ext/web/benches/timers_ops.rs +++ b/ext/web/benches/timers_ops.rs @@ -30,7 +30,7 @@ fn setup() -> Vec<Extension> { Extension::builder("bench_setup") .esm(vec![ ("internal:setup", r#" - import { setTimeout, handleTimerMacrotask } from "internal:ext/web/02_timers.js"; + import { setTimeout, handleTimerMacrotask } from "internal:deno_web/02_timers.js"; globalThis.setTimeout = setTimeout; Deno.core.setMacrotaskCallback(handleTimerMacrotask); "#), diff --git a/ext/web/internal.d.ts b/ext/web/internal.d.ts index fe0c8ac07..9f72b0f5d 100644 --- a/ext/web/internal.d.ts +++ b/ext/web/internal.d.ts @@ -3,7 +3,7 @@ /// <reference no-default-lib="true" /> /// <reference lib="esnext" /> -declare module "internal:ext/web/00_infra.js" { +declare module "internal:deno_web/00_infra.js" { function collectSequenceOfCodepoints( input: string, position: number, @@ -44,11 +44,11 @@ declare module "internal:ext/web/00_infra.js" { function serializeJSValueToJSONString(value: unknown): string; } -declare module "internal:ext/web/01_dom_exception.js" { +declare module "internal:deno_web/01_dom_exception.js" { export = DOMException; } -declare module "internal:ext/web/01_mimesniff.js" { +declare module "internal:deno_web/01_mimesniff.js" { interface MimeType { type: string; subtype: string; @@ -62,7 +62,7 @@ declare module "internal:ext/web/01_mimesniff.js" { ): MimeType | null; } -declare module "internal:ext/web/02_event.js" { +declare module "internal:deno_web/02_event.js" { const EventTarget: typeof EventTarget; const Event: typeof event; const ErrorEvent: typeof ErrorEvent; @@ -74,29 +74,29 @@ declare module "internal:ext/web/02_event.js" { const reportError: typeof reportError; } -declare module "internal:ext/web/12_location.js" { +declare module "internal:deno_web/12_location.js" { function getLocationHref(): string | undefined; } -declare module "internal:ext/web/05_base64.js" { +declare module "internal:deno_web/05_base64.js" { function atob(data: string): string; function btoa(data: string): string; } -declare module "internal:ext/web/09_file.js" { +declare module "internal:deno_web/09_file.js" { function blobFromObjectUrl(url: string): Blob | null; function getParts(blob: Blob): string[]; const Blob: typeof Blob; const File: typeof File; } -declare module "internal:ext/web/06_streams.js" { +declare module "internal:deno_web/06_streams.js" { const ReadableStream: typeof ReadableStream; function isReadableStreamDisturbed(stream: ReadableStream): boolean; function createProxy<T>(stream: ReadableStream<T>): ReadableStream<T>; } -declare module "internal:ext/web/13_message_port.js" { +declare module "internal:deno_web/13_message_port.js" { type Transferable = { kind: "messagePort"; data: number; diff --git a/ext/web/lib.rs b/ext/web/lib.rs index 4fcc06ef4..c1d2c6703 100644 --- a/ext/web/lib.rs +++ b/ext/web/lib.rs @@ -65,7 +65,6 @@ pub fn init<P: TimersPermission + 'static>( Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_console", "deno_url"]) .esm(include_js_files!( - prefix "internal:ext/web", "00_infra.js", "01_dom_exception.js", "01_mimesniff.js", |