From 49af1ab18da02f09e65506c873526c40d005c4ed Mon Sep 17 00:00:00 2001 From: Leo Kettmeir Date: Tue, 7 Feb 2023 22:09:50 +0100 Subject: [PATCH] refactor: remove prefix from include_js_files & use extension name (#17683) --- cli/js/40_testing.js | 4 +- .../run/error_009_extensions_error.js.out | 2 +- .../run/wasm_streaming_panic_test.js.out | 2 +- .../run/worker_drop_handle_race.js.out | 4 +- core/extensions.rs | 27 ++++++--- core/ops_builtin.rs | 3 +- ext/broadcast_channel/01_broadcast_channel.js | 6 +- ext/broadcast_channel/lib.rs | 5 +- ext/cache/01_cache.js | 12 ++-- ext/cache/lib.rs | 5 +- ext/console/02_console.js | 2 +- ext/console/internal.d.ts | 2 +- ext/console/lib.rs | 6 +- ext/crypto/00_crypto.js | 4 +- ext/crypto/01_webidl.js | 4 +- ext/crypto/lib.rs | 6 +- ext/fetch/20_headers.js | 4 +- ext/fetch/21_formdata.js | 4 +- ext/fetch/22_body.js | 12 ++-- ext/fetch/23_request.js | 22 +++---- ext/fetch/23_response.js | 16 ++--- ext/fetch/26_fetch.js | 16 ++--- ext/fetch/internal.d.ts | 8 +-- ext/fetch/lib.rs | 1 - ext/ffi/lib.rs | 5 +- ext/flash/01_http.js | 16 ++--- ext/flash/lib.rs | 5 +- ext/http/01_http.js | 22 +++---- ext/http/lib.rs | 5 +- ext/net/01_net.js | 2 +- ext/net/02_tls.js | 2 +- ext/net/lib.rs | 6 +- ext/node/lib.rs | 6 +- ext/url/00_url.js | 2 +- ext/url/01_urlpattern.js | 2 +- ext/url/benches/url_ops.rs | 2 +- ext/url/internal.d.ts | 4 +- ext/url/lib.rs | 6 +- ext/web/01_dom_exception.js | 4 +- ext/web/01_mimesniff.js | 2 +- ext/web/02_event.js | 6 +- ext/web/02_structured_clone.js | 2 +- ext/web/02_timers.js | 6 +- ext/web/03_abort_signal.js | 6 +- ext/web/04_global_interfaces.js | 2 +- ext/web/05_base64.js | 4 +- ext/web/06_streams.js | 8 +-- ext/web/08_text_encoding.js | 2 +- ext/web/09_file.js | 4 +- ext/web/10_filereader.js | 12 ++-- ext/web/11_blob_url.js | 6 +- ext/web/12_location.js | 4 +- ext/web/13_message_port.js | 6 +- ext/web/14_compression.js | 4 +- ext/web/15_performance.js | 12 ++-- ext/web/benches/encoding.rs | 2 +- ext/web/benches/timers_ops.rs | 2 +- ext/web/internal.d.ts | 18 +++--- ext/web/lib.rs | 1 - ext/webgpu/src/01_webgpu.js | 6 +- ext/webgpu/src/02_idl_types.js | 4 +- ext/webgpu/src/03_surface.js | 4 +- ext/webgpu/src/04_surface_idl_types.js | 4 +- ext/webgpu/src/lib.rs | 6 +- ext/webgpu/src/surface.rs | 1 - ext/webidl/benches/dict.js | 2 +- ext/webidl/internal.d.ts | 2 +- ext/webidl/lib.rs | 5 +- ext/websocket/01_websocket.js | 12 ++-- ext/websocket/02_websocketstream.js | 10 ++-- ext/websocket/lib.rs | 1 - ext/webstorage/01_webstorage.js | 2 +- ext/webstorage/lib.rs | 5 +- runtime/js/06_util.js | 2 +- runtime/js/10_permissions.js | 2 +- runtime/js/11_workers.js | 10 ++-- runtime/js/13_buffer.js | 2 +- runtime/js/30_os.js | 2 +- runtime/js/40_files.js | 2 +- runtime/js/40_http.js | 2 +- runtime/js/40_process.js | 2 +- runtime/js/40_read_file.js | 2 +- runtime/js/40_spawn.js | 4 +- runtime/js/40_write_file.js | 4 +- runtime/js/90_deno_ns.js | 16 ++--- runtime/js/98_global_scope.js | 60 +++++++++---------- runtime/js/99_main.js | 26 ++++---- tools/wgpu_sync.js | 4 +- 88 files changed, 271 insertions(+), 308 deletions(-) diff --git a/cli/js/40_testing.js b/cli/js/40_testing.js index 374dc10ee0..7ea52a5fcb 100644 --- a/cli/js/40_testing.js +++ b/cli/js/40_testing.js @@ -4,9 +4,9 @@ const core = globalThis.Deno.core; const ops = core.ops; const internals = globalThis.__bootstrap.internals; import { setExitHandler } from "internal:runtime/js/30_os.js"; -import { Console } from "internal:ext/console/02_console.js"; +import { Console } from "internal:deno_console/02_console.js"; import { serializePermissions } from "internal:runtime/js/10_permissions.js"; -import { assert } from "internal:ext/web/00_infra.js"; +import { assert } from "internal:deno_web/00_infra.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayFrom, diff --git a/cli/tests/testdata/run/error_009_extensions_error.js.out b/cli/tests/testdata/run/error_009_extensions_error.js.out index 558eedbe15..36fc6af26f 100644 --- a/cli/tests/testdata/run/error_009_extensions_error.js.out +++ b/cli/tests/testdata/run/error_009_extensions_error.js.out @@ -2,5 +2,5 @@ new Event(); ^ at [WILDCARD] - at new Event (internal:ext/web/[WILDCARD]) + at new Event (internal:deno_web/[WILDCARD]) at [WILDCARD] diff --git a/cli/tests/testdata/run/wasm_streaming_panic_test.js.out b/cli/tests/testdata/run/wasm_streaming_panic_test.js.out index 72237df6fa..eec1e3b968 100644 --- a/cli/tests/testdata/run/wasm_streaming_panic_test.js.out +++ b/cli/tests/testdata/run/wasm_streaming_panic_test.js.out @@ -1,2 +1,2 @@ error: Uncaught (in promise) TypeError: Invalid WebAssembly content type. - at handleWasmStreaming (internal:ext/fetch/26_fetch.js:[WILDCARD]) + at handleWasmStreaming (internal:deno_fetch/26_fetch.js:[WILDCARD]) diff --git a/cli/tests/testdata/run/worker_drop_handle_race.js.out b/cli/tests/testdata/run/worker_drop_handle_race.js.out index afb522baac..c47db83ace 100644 --- a/cli/tests/testdata/run/worker_drop_handle_race.js.out +++ b/cli/tests/testdata/run/worker_drop_handle_race.js.out @@ -2,7 +2,7 @@ error: Uncaught (in worker "") Error throw new Error(); ^ at [WILDCARD]/workers/drop_handle_race.js:2:9 - at Object.action (internal:ext/web/02_timers.js:[WILDCARD]) - at handleTimerMacrotask (internal:ext/web/02_timers.js:[WILDCARD]) + at Object.action (internal:deno_web/02_timers.js:[WILDCARD]) + at handleTimerMacrotask (internal:deno_web/02_timers.js:[WILDCARD]) error: Uncaught (in promise) Error: Unhandled error in child worker. at Worker.#pollControl (internal:runtime/js/11_workers.js:[WILDCARD]) diff --git a/core/extensions.rs b/core/extensions.rs index b981e6da2a..ba7bdb18ab 100644 --- a/core/extensions.rs +++ b/core/extensions.rs @@ -6,7 +6,7 @@ use std::rc::Rc; use std::task::Context; use v8::fast_api::FastFunction; -pub type SourcePair = (&'static str, &'static str); +pub type SourcePair = (String, &'static str); pub type OpFnRef = v8::FunctionCallback; pub type OpMiddlewareFn = dyn Fn(OpDecl) -> OpDecl; pub type OpStateFn = dyn Fn(&mut OpState) -> Result<(), Error>; @@ -168,13 +168,27 @@ impl ExtensionBuilder { self } - pub fn js(&mut self, js_files: Vec) -> &mut Self { + pub fn js( + &mut self, + js_files: Vec<(&'static str, &'static str)>, + ) -> &mut Self { + let js_files = js_files.into_iter().map(|source_pair| { + let name = format!("internal:{}/{}", self.name, source_pair.0); + (name, source_pair.1) + }); self.js.extend(js_files); self } - pub fn esm(&mut self, js_files: Vec) -> &mut Self { - self.esm.extend(js_files); + pub fn esm( + &mut self, + esm_files: Vec<(&'static str, &'static str)>, + ) -> &mut Self { + let esm_files = esm_files.into_iter().map(|source_pair| { + let name = format!("internal:{}/{}", self.name, source_pair.0); + (name, source_pair.1) + }); + self.esm.extend(esm_files); self } @@ -232,17 +246,16 @@ impl ExtensionBuilder { /// Example: /// ```ignore /// include_js_files!( -/// prefix "internal:extensions/hello", /// "01_hello.js", /// "02_goodbye.js", /// ) /// ``` #[macro_export] macro_rules! include_js_files { - (prefix $prefix:literal, $($file:literal,)+) => { + ($($file:literal,)+) => { vec![ $(( - concat!($prefix, "/", $file), + $file, include_str!($file), ),)+ ] diff --git a/core/ops_builtin.rs b/core/ops_builtin.rs index 87504f41d2..1cc1e8d345 100644 --- a/core/ops_builtin.rs +++ b/core/ops_builtin.rs @@ -19,9 +19,8 @@ use std::io::Write; use std::rc::Rc; pub(crate) fn init_builtins() -> Extension { - Extension::builder("deno_builtins") + Extension::builder("core") .js(include_js_files!( - prefix "internal:core", "00_primordials.js", "01_core.js", "02_error.js", diff --git a/ext/broadcast_channel/01_broadcast_channel.js b/ext/broadcast_channel/01_broadcast_channel.js index fb23554bf5..2ff3016102 100644 --- a/ext/broadcast_channel/01_broadcast_channel.js +++ b/ext/broadcast_channel/01_broadcast_channel.js @@ -4,13 +4,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"; import { defineEventHandler, EventTarget, setTarget, -} 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 { ArrayPrototypeIndexOf, diff --git a/ext/broadcast_channel/lib.rs b/ext/broadcast_channel/lib.rs index 0cd17a0269..85994bf979 100644 --- a/ext/broadcast_channel/lib.rs +++ b/ext/broadcast_channel/lib.rs @@ -112,10 +112,7 @@ pub fn init( ) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web"]) - .esm(include_js_files!( - prefix "internal:ext/broadcast_channel", - "01_broadcast_channel.js", - )) + .esm(include_js_files!("01_broadcast_channel.js",)) .ops(vec![ op_broadcast_subscribe::decl::(), op_broadcast_unsubscribe::decl::(), diff --git a/ext/cache/01_cache.js b/ext/cache/01_cache.js index f49db3b84c..b1e05d0dbf 100644 --- a/ext/cache/01_cache.js +++ b/ext/cache/01_cache.js @@ -1,7 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. const core = globalThis.Deno.core; -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 { Symbol, @@ -12,11 +12,11 @@ import { Request, RequestPrototype, toInnerRequest, -} from "internal:ext/fetch/23_request.js"; -import { toInnerResponse } from "internal:ext/fetch/23_response.js"; -import { URLPrototype } from "internal:ext/url/00_url.js"; -import { getHeader } from "internal:ext/fetch/20_headers.js"; -import { readableStreamForRid } from "internal:ext/web/06_streams.js"; +} from "internal:deno_fetch/23_request.js"; +import { toInnerResponse } from "internal:deno_fetch/23_response.js"; +import { URLPrototype } from "internal:deno_url/00_url.js"; +import { getHeader } from "internal:deno_fetch/20_headers.js"; +import { readableStreamForRid } from "internal:deno_web/06_streams.js"; class CacheStorage { constructor() { diff --git a/ext/cache/lib.rs b/ext/cache/lib.rs index a35ac6246e..b0efbca552 100644 --- a/ext/cache/lib.rs +++ b/ext/cache/lib.rs @@ -27,10 +27,7 @@ pub fn init( ) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web", "deno_url", "deno_fetch"]) - .esm(include_js_files!( - prefix "internal:ext/cache", - "01_cache.js", - )) + .esm(include_js_files!("01_cache.js",)) .ops(vec![ op_cache_storage_open::decl::(), op_cache_storage_has::decl::(), diff --git a/ext/console/02_console.js b/ext/console/02_console.js index 22524e6b9c..0bafd532d8 100644 --- a/ext/console/02_console.js +++ b/ext/console/02_console.js @@ -116,7 +116,7 @@ const { WeakMapPrototype, WeakSetPrototype, } = primordials; -import * as colors from "internal:ext/console/01_colors.js"; +import * as colors from "internal:deno_console/01_colors.js"; function isInvalidDate(x) { return isNaN(DatePrototypeGetTime(x)); diff --git a/ext/console/internal.d.ts b/ext/console/internal.d.ts index 965a879e72..fba711d5a8 100644 --- a/ext/console/internal.d.ts +++ b/ext/console/internal.d.ts @@ -3,7 +3,7 @@ /// /// -declare module "internal:ext/console/02_console.js" { +declare module "internal:deno_console/02_console.js" { function createFilteredInspectProxy(params: { object: TObject; keys: (keyof TObject)[]; diff --git a/ext/console/lib.rs b/ext/console/lib.rs index 31ec884c1d..158a1a05ee 100644 --- a/ext/console/lib.rs +++ b/ext/console/lib.rs @@ -6,11 +6,7 @@ use std::path::PathBuf; pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) - .esm(include_js_files!( - prefix "internal:ext/console", - "01_colors.js", - "02_console.js", - )) + .esm(include_js_files!("01_colors.js", "02_console.js",)) .build() } diff --git a/ext/crypto/00_crypto.js b/ext/crypto/00_crypto.js index c79a1e4e83..7bc62714fe 100644 --- a/ext/crypto/00_crypto.js +++ b/ext/crypto/00_crypto.js @@ -9,8 +9,8 @@ const core = globalThis.Deno.core; const ops = core.ops; const primordials = globalThis.__bootstrap.primordials; -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 { ArrayBufferPrototype, ArrayBufferIsView, diff --git a/ext/crypto/01_webidl.js b/ext/crypto/01_webidl.js index 86d50f8a55..ceb1de0613 100644 --- a/ext/crypto/01_webidl.js +++ b/ext/crypto/01_webidl.js @@ -5,8 +5,8 @@ /// const primordials = globalThis.__bootstrap.primordials; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { CryptoKey } from "internal:ext/crypto/00_crypto.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { CryptoKey } from "internal:deno_crypto/00_crypto.js"; const { ArrayBufferIsView, ArrayBufferPrototype, diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs index de47e467bb..9d6017f39f 100644 --- a/ext/crypto/lib.rs +++ b/ext/crypto/lib.rs @@ -75,11 +75,7 @@ use crate::shared::RawKeyData; pub fn init(maybe_seed: Option) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web"]) - .esm(include_js_files!( - prefix "internal:ext/crypto", - "00_crypto.js", - "01_webidl.js", - )) + .esm(include_js_files!("00_crypto.js", "01_webidl.js",)) .ops(vec![ op_crypto_get_random_values::decl(), op_crypto_generate_key::decl(), diff --git a/ext/fetch/20_headers.js b/ext/fetch/20_headers.js index 9790bb69fd..b8fd8ab835 100644 --- a/ext/fetch/20_headers.js +++ b/ext/fetch/20_headers.js @@ -9,7 +9,7 @@ /// /// -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; import { byteLowerCase, collectHttpQuotedString, @@ -18,7 +18,7 @@ import { HTTP_TAB_OR_SPACE_SUFFIX_RE, HTTP_TOKEN_CODE_POINT_RE, httpTrim, -} from "internal:ext/web/00_infra.js"; +} from "internal:deno_web/00_infra.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayIsArray, diff --git a/ext/fetch/21_formdata.js b/ext/fetch/21_formdata.js index 1639646e03..647c716b3e 100644 --- a/ext/fetch/21_formdata.js +++ b/ext/fetch/21_formdata.js @@ -10,13 +10,13 @@ /// const core = globalThis.Deno.core; -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; import { Blob, BlobPrototype, File, FilePrototype, -} from "internal:ext/web/09_file.js"; +} from "internal:deno_web/09_file.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypePush, diff --git a/ext/fetch/22_body.js b/ext/fetch/22_body.js index 48819650a1..9161a1216b 100644 --- a/ext/fetch/22_body.js +++ b/ext/fetch/22_body.js @@ -12,19 +12,19 @@ /// const core = globalThis.Deno.core; -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; import { parseUrlEncoded, URLSearchParamsPrototype, -} from "internal:ext/url/00_url.js"; +} from "internal:deno_url/00_url.js"; import { formDataFromEntries, FormDataPrototype, formDataToBlob, parseFormData, -} from "internal:ext/fetch/21_formdata.js"; -import * as mimesniff from "internal:ext/web/01_mimesniff.js"; -import { BlobPrototype } from "internal:ext/web/09_file.js"; +} from "internal:deno_fetch/21_formdata.js"; +import * as mimesniff from "internal:deno_web/01_mimesniff.js"; +import { BlobPrototype } from "internal:deno_web/09_file.js"; import { createProxy, errorReadableStream, @@ -34,7 +34,7 @@ import { readableStreamDisturb, ReadableStreamPrototype, readableStreamThrowIfErrored, -} from "internal:ext/web/06_streams.js"; +} from "internal:deno_web/06_streams.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, diff --git a/ext/fetch/23_request.js b/ext/fetch/23_request.js index 1e8d5c1ec0..15e2efb194 100644 --- a/ext/fetch/23_request.js +++ b/ext/fetch/23_request.js @@ -9,30 +9,30 @@ /// /// -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"; import { byteUpperCase, HTTP_TOKEN_CODE_POINT_RE, -} from "internal:ext/web/00_infra.js"; -import { URL } from "internal:ext/url/00_url.js"; +} from "internal:deno_web/00_infra.js"; +import { URL } from "internal:deno_url/00_url.js"; import { extractBody, InnerBody, mixinBody, -} from "internal:ext/fetch/22_body.js"; -import { getLocationHref } from "internal:ext/web/12_location.js"; -import { extractMimeType } from "internal:ext/web/01_mimesniff.js"; -import { blobFromObjectUrl } from "internal:ext/web/09_file.js"; +} from "internal:deno_fetch/22_body.js"; +import { getLocationHref } from "internal:deno_web/12_location.js"; +import { extractMimeType } from "internal:deno_web/01_mimesniff.js"; +import { blobFromObjectUrl } from "internal:deno_web/09_file.js"; import { fillHeaders, getDecodeSplitHeader, guardFromHeaders, headerListFromHeaders, headersFromHeaderList, -} from "internal:ext/fetch/20_headers.js"; -import { HttpClientPrototype } from "internal:ext/fetch/22_http_client.js"; -import * as abortSignal from "internal:ext/web/03_abort_signal.js"; +} from "internal:deno_fetch/20_headers.js"; +import { HttpClientPrototype } from "internal:deno_fetch/22_http_client.js"; +import * as abortSignal from "internal:deno_web/03_abort_signal.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeMap, diff --git a/ext/fetch/23_response.js b/ext/fetch/23_response.js index 46912135ab..4b579a3064 100644 --- a/ext/fetch/23_response.js +++ b/ext/fetch/23_response.js @@ -11,25 +11,25 @@ /// const core = globalThis.Deno.core; -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"; import { byteLowerCase, HTTP_TAB_OR_SPACE, regexMatcher, serializeJSValueToJSONString, -} from "internal:ext/web/00_infra.js"; -import { extractBody, mixinBody } from "internal:ext/fetch/22_body.js"; -import { getLocationHref } from "internal:ext/web/12_location.js"; -import { extractMimeType } from "internal:ext/web/01_mimesniff.js"; -import { URL } from "internal:ext/url/00_url.js"; +} from "internal:deno_web/00_infra.js"; +import { extractBody, mixinBody } from "internal:deno_fetch/22_body.js"; +import { getLocationHref } from "internal:deno_web/12_location.js"; +import { extractMimeType } from "internal:deno_web/01_mimesniff.js"; +import { URL } from "internal:deno_url/00_url.js"; import { fillHeaders, getDecodeSplitHeader, guardFromHeaders, headerListFromHeaders, headersFromHeaderList, -} from "internal:ext/fetch/20_headers.js"; +} from "internal:deno_fetch/20_headers.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeMap, diff --git a/ext/fetch/26_fetch.js b/ext/fetch/26_fetch.js index 9c136f242e..6de68e8d6a 100644 --- a/ext/fetch/26_fetch.js +++ b/ext/fetch/26_fetch.js @@ -12,19 +12,19 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { byteLowerCase } from "internal:ext/web/00_infra.js"; -import { BlobPrototype } from "internal:ext/web/09_file.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { byteLowerCase } from "internal:deno_web/00_infra.js"; +import { BlobPrototype } from "internal:deno_web/09_file.js"; import { errorReadableStream, readableStreamForRid, ReadableStreamPrototype, -} from "internal:ext/web/06_streams.js"; -import { extractBody, InnerBody } from "internal:ext/fetch/22_body.js"; +} from "internal:deno_web/06_streams.js"; +import { extractBody, InnerBody } from "internal:deno_fetch/22_body.js"; import { processUrlList, toInnerRequest, -} from "internal:ext/fetch/23_request.js"; +} from "internal:deno_fetch/23_request.js"; import { abortedNetworkError, fromInnerResponse, @@ -32,8 +32,8 @@ import { nullBodyStatus, redirectStatus, toInnerResponse, -} from "internal:ext/fetch/23_response.js"; -import * as abortSignal from "internal:ext/web/03_abort_signal.js"; +} from "internal:deno_fetch/23_response.js"; +import * as abortSignal from "internal:deno_web/03_abort_signal.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypePush, diff --git a/ext/fetch/internal.d.ts b/ext/fetch/internal.d.ts index 596e3ffcb5..09a7681b01 100644 --- a/ext/fetch/internal.d.ts +++ b/ext/fetch/internal.d.ts @@ -9,7 +9,7 @@ declare var domIterable: { DomIterableMixin(base: any, dataSymbol: symbol): any; }; -declare module "internal:ext/fetch/20_headers.js" { +declare module "internal:deno_fetch/20_headers.js" { class Headers { } type HeaderList = [string, string][]; @@ -33,7 +33,7 @@ declare module "internal:ext/fetch/20_headers.js" { ): "immutable" | "request" | "request-no-cors" | "response" | "none"; } -declare module "internal:ext/fetch/21_formdata.js" { +declare module "internal:deno_fetch/21_formdata.js" { type FormData = typeof FormData; function formDataToBlob( formData: FormData, @@ -45,7 +45,7 @@ declare module "internal:ext/fetch/21_formdata.js" { function formDataFromEntries(entries: FormDataEntry[]): FormData; } -declare module "internal:ext/fetch/22_body.js" { +declare module "internal:deno_fetch/22_body.js" { function mixinBody( prototype: any, bodySymbol: symbol, @@ -66,7 +66,7 @@ declare module "internal:ext/fetch/22_body.js" { }; } -declare module "internal:ext/fetch/26_fetch.js" { +declare module "internal:deno_fetch/26_fetch.js" { function toInnerRequest(request: Request): InnerRequest; function fromInnerRequest( inner: InnerRequest, diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs index 93c624dd65..766dabb620 100644 --- a/ext/fetch/lib.rs +++ b/ext/fetch/lib.rs @@ -98,7 +98,6 @@ where Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web", "deno_url", "deno_console"]) .esm(include_js_files!( - prefix "internal:ext/fetch", "20_headers.js", "21_formdata.js", "22_body.js", diff --git a/ext/ffi/lib.rs b/ext/ffi/lib.rs index 0034a0d336..a14a28a83e 100644 --- a/ext/ffi/lib.rs +++ b/ext/ffi/lib.rs @@ -84,10 +84,7 @@ pub(crate) struct FfiState { pub fn init(unstable: bool) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) - .esm(include_js_files!( - prefix "internal:ext/ffi", - "00_ffi.js", - )) + .esm(include_js_files!("00_ffi.js",)) .ops(vec![ op_ffi_load::decl::

(), op_ffi_get_static::decl(), diff --git a/ext/flash/01_http.js b/ext/flash/01_http.js index d2f967adad..34b158e40d 100644 --- a/ext/flash/01_http.js +++ b/ext/flash/01_http.js @@ -2,18 +2,18 @@ const core = globalThis.Deno.core; const ops = core.ops; const primordials = globalThis.__bootstrap.primordials; -import { BlobPrototype } from "internal:ext/web/09_file.js"; -import { TcpConn } from "internal:ext/net/01_net.js"; -import { toInnerResponse } from "internal:ext/fetch/23_response.js"; -import { _flash, fromFlashRequest } from "internal:ext/fetch/23_request.js"; -import { Event } from "internal:ext/web/02_event.js"; +import { BlobPrototype } from "internal:deno_web/09_file.js"; +import { TcpConn } from "internal:deno_net/01_net.js"; +import { toInnerResponse } from "internal:deno_fetch/23_response.js"; +import { _flash, fromFlashRequest } from "internal:deno_fetch/23_request.js"; +import { Event } from "internal:deno_web/02_event.js"; import { _state, getReadableStreamResourceBacking, ReadableStream, readableStreamClose, ReadableStreamPrototype, -} from "internal:ext/web/06_streams.js"; +} from "internal:deno_web/06_streams.js"; import { _eventLoop, _idleTimeoutDuration, @@ -23,8 +23,8 @@ import { _rid, _serverHandleIdleTimeout, WebSocket, -} from "internal:ext/websocket/01_websocket.js"; -import { _ws } from "internal:ext/http/01_http.js"; +} from "internal:deno_websocket/01_websocket.js"; +import { _ws } from "internal:deno_http/01_http.js"; const { ObjectPrototypeIsPrototypeOf, PromisePrototype, diff --git a/ext/flash/lib.rs b/ext/flash/lib.rs index ab048c9cd8..f92aa3ea33 100644 --- a/ext/flash/lib.rs +++ b/ext/flash/lib.rs @@ -1514,10 +1514,7 @@ pub fn init(unstable: bool) -> Extension { "deno_websocket", "deno_http", ]) - .esm(deno_core::include_js_files!( - prefix "internal:ext/flash", - "01_http.js", - )) + .esm(deno_core::include_js_files!("01_http.js",)) .ops(vec![ op_flash_serve::decl::

(), op_node_unstable_flash_serve::decl::

(), diff --git a/ext/http/01_http.js b/ext/http/01_http.js index 7ce5f91723..6807ad973d 100644 --- a/ext/http/01_http.js +++ b/ext/http/01_http.js @@ -2,22 +2,22 @@ const core = globalThis.Deno.core; const primordials = globalThis.__bootstrap.primordials; const { BadResourcePrototype, InterruptedPrototype, ops } = core; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { InnerBody } from "internal:ext/fetch/22_body.js"; -import { Event, setEventTargetData } from "internal:ext/web/02_event.js"; -import { BlobPrototype } from "internal:ext/web/09_file.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { InnerBody } from "internal:deno_fetch/22_body.js"; +import { Event, setEventTargetData } from "internal:deno_web/02_event.js"; +import { BlobPrototype } from "internal:deno_web/09_file.js"; import { fromInnerResponse, newInnerResponse, ResponsePrototype, toInnerResponse, -} from "internal:ext/fetch/23_response.js"; +} from "internal:deno_fetch/23_response.js"; import { _flash, fromInnerRequest, newInnerRequest, -} from "internal:ext/fetch/23_request.js"; -import * as abortSignal from "internal:ext/web/03_abort_signal.js"; +} from "internal:deno_fetch/23_request.js"; +import * as abortSignal from "internal:deno_web/03_abort_signal.js"; import { _eventLoop, _idleTimeoutDuration, @@ -28,16 +28,16 @@ import { _server, _serverHandleIdleTimeout, WebSocket, -} from "internal:ext/websocket/01_websocket.js"; -import { TcpConn, UnixConn } from "internal:ext/net/01_net.js"; -import { TlsConn } from "internal:ext/net/02_tls.js"; +} from "internal:deno_websocket/01_websocket.js"; +import { TcpConn, UnixConn } from "internal:deno_net/01_net.js"; +import { TlsConn } from "internal:deno_net/02_tls.js"; import { Deferred, getReadableStreamResourceBacking, readableStreamClose, readableStreamForRid, ReadableStreamPrototype, -} from "internal:ext/web/06_streams.js"; +} from "internal:deno_web/06_streams.js"; const { ArrayPrototypeIncludes, ArrayPrototypePush, diff --git a/ext/http/lib.rs b/ext/http/lib.rs index a0593de8c9..eb73817735 100644 --- a/ext/http/lib.rs +++ b/ext/http/lib.rs @@ -80,10 +80,7 @@ mod reader_stream; pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_web", "deno_net", "deno_fetch", "deno_websocket"]) - .esm(include_js_files!( - prefix "internal:ext/http", - "01_http.js", - )) + .esm(include_js_files!("01_http.js",)) .ops(vec![ op_http_accept::decl(), op_http_write_headers::decl(), diff --git a/ext/net/01_net.js b/ext/net/01_net.js index 46561cae5e..7b427ef5ed 100644 --- a/ext/net/01_net.js +++ b/ext/net/01_net.js @@ -7,7 +7,7 @@ import { readableStreamForRidUnrefableRef, readableStreamForRidUnrefableUnref, writableStreamForRid, -} from "internal:ext/web/06_streams.js"; +} from "internal:deno_web/06_streams.js"; const primordials = globalThis.__bootstrap.primordials; const { Error, diff --git a/ext/net/02_tls.js b/ext/net/02_tls.js index 4701d3da7f..14bf3dce86 100644 --- a/ext/net/02_tls.js +++ b/ext/net/02_tls.js @@ -2,7 +2,7 @@ const core = globalThis.Deno.core; const ops = core.ops; -import { Conn, Listener } from "internal:ext/net/01_net.js"; +import { Conn, Listener } from "internal:deno_net/01_net.js"; const primordials = globalThis.__bootstrap.primordials; const { TypeError } = primordials; diff --git a/ext/net/lib.rs b/ext/net/lib.rs index ed620fcdd9..0536f32334 100644 --- a/ext/net/lib.rs +++ b/ext/net/lib.rs @@ -86,11 +86,7 @@ pub fn init( ops.extend(ops_tls::init::

()); Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_web"]) - .esm(include_js_files!( - prefix "internal:ext/net", - "01_net.js", - "02_tls.js", - )) + .esm(include_js_files!("01_net.js", "02_tls.js",)) .ops(ops) .state(move |state| { state.put(DefaultTlsOptions { diff --git a/ext/node/lib.rs b/ext/node/lib.rs index 8db2bb3a7a..d012bf83a7 100644 --- a/ext/node/lib.rs +++ b/ext/node/lib.rs @@ -85,11 +85,7 @@ pub fn init( maybe_npm_resolver: Option>, ) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) - .esm(include_js_files!( - prefix "internal:ext/node", - "01_node.js", - "02_require.js", - )) + .esm(include_js_files!("01_node.js", "02_require.js",)) .ops(vec![ op_require_init_paths::decl(), op_require_node_module_paths::decl::

(), diff --git a/ext/url/00_url.js b/ext/url/00_url.js index faaba2911e..da5849d43e 100644 --- a/ext/url/00_url.js +++ b/ext/url/00_url.js @@ -7,7 +7,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 { ArrayIsArray, diff --git a/ext/url/01_urlpattern.js b/ext/url/01_urlpattern.js index 1c5882553c..c311b5abca 100644 --- a/ext/url/01_urlpattern.js +++ b/ext/url/01_urlpattern.js @@ -9,7 +9,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 { ArrayPrototypeMap, diff --git a/ext/url/benches/url_ops.rs b/ext/url/benches/url_ops.rs index 4b41eb3a04..fd8cac7ef0 100644 --- a/ext/url/benches/url_ops.rs +++ b/ext/url/benches/url_ops.rs @@ -14,7 +14,7 @@ fn setup() -> Vec { Extension::builder("bench_setup") .esm(vec![( "internal:setup", - r#"import { URL } from "internal:ext/url/00_url.js"; + r#"import { URL } from "internal:deno_url/00_url.js"; globalThis.URL = URL; "#, )]) diff --git a/ext/url/internal.d.ts b/ext/url/internal.d.ts index b8a2a000aa..5859996699 100644 --- a/ext/url/internal.d.ts +++ b/ext/url/internal.d.ts @@ -3,12 +3,12 @@ /// /// -declare module "internal:ext/url/00_url.js" { +declare module "internal:deno_url/00_url.js" { const URL: typeof URL; const URLSearchParams: typeof URLSearchParams; function parseUrlEncoded(bytes: Uint8Array): [string, string][]; } -declare module "internal:ext/url/01_urlpattern.js" { +declare module "internal:deno_url/01_urlpattern.js" { const URLPattern: typeof URLPattern; } diff --git a/ext/url/lib.rs b/ext/url/lib.rs index 95ca326c45..087ccbfe72 100644 --- a/ext/url/lib.rs +++ b/ext/url/lib.rs @@ -20,11 +20,7 @@ use crate::urlpattern::op_urlpattern_process_match_input; pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl"]) - .esm(include_js_files!( - prefix "internal:ext/url", - "00_url.js", - "01_urlpattern.js", - )) + .esm(include_js_files!("00_url.js", "01_urlpattern.js",)) .ops(vec![ op_url_reparse::decl(), op_url_parse::decl(), diff --git a/ext/web/01_dom_exception.js b/ext/web/01_dom_exception.js index cbec9ca22b..116fe0490e 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 17d954eb4c..40f5c03ebb 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 de5210d33b..37cdab9a2c 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 373ae0ab2e..082b0a80f4 100644 --- a/ext/web/02_structured_clone.js +++ b/ext/web/02_structured_clone.js @@ -7,7 +7,7 @@ /// 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 302b6f62cd..24ec760bd0 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 96757f41f9..1842217bb4 100644 --- a/ext/web/03_abort_signal.js +++ b/ext/web/03_abort_signal.js @@ -3,14 +3,14 @@ // @ts-check /// -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 6a42968dbe..edac0d5b77 100644 --- a/ext/web/04_global_interfaces.js +++ b/ext/web/04_global_interfaces.js @@ -3,7 +3,7 @@ // @ts-check /// -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 9f11ec97c3..df64eab0d7 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 a88b608936..5dcf64af24 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 f3ad966d09..571b9b6282 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 e1be3b4c21..b44537dd49 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 7a46dfa9ae..8ff36494b9 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 02551fef69..205d0851fb 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 da964eae85..6a15c08115 100644 --- a/ext/web/12_location.js +++ b/ext/web/12_location.js @@ -2,8 +2,8 @@ /// -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 2a784bf3f0..dafb2b782d 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 680da757e0..3998709cec 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 6a50f45f80..b1c4eb513c 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 f8ad57c4f6..a96da1bc63 100644 --- a/ext/web/benches/encoding.rs +++ b/ext/web/benches/encoding.rs @@ -32,7 +32,7 @@ fn setup() -> Vec { .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 a2af22982b..943c73bbc0 100644 --- a/ext/web/benches/timers_ops.rs +++ b/ext/web/benches/timers_ops.rs @@ -30,7 +30,7 @@ fn setup() -> Vec { 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 fe0c8ac077..9f72b0f5d8 100644 --- a/ext/web/internal.d.ts +++ b/ext/web/internal.d.ts @@ -3,7 +3,7 @@ /// /// -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(stream: ReadableStream): ReadableStream; } -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 4fcc06ef4f..c1d2c6703f 100644 --- a/ext/web/lib.rs +++ b/ext/web/lib.rs @@ -65,7 +65,6 @@ pub fn init( 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", diff --git a/ext/webgpu/src/01_webgpu.js b/ext/webgpu/src/01_webgpu.js index 58b7130997..10243db2f0 100644 --- a/ext/webgpu/src/01_webgpu.js +++ b/ext/webgpu/src/01_webgpu.js @@ -9,9 +9,9 @@ const core = globalThis.Deno.core; const ops = core.ops; const primordials = globalThis.__bootstrap.primordials; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { EventTarget } from "internal:ext/web/02_event.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { EventTarget } from "internal:deno_web/02_event.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; const { ArrayBuffer, ArrayBufferIsView, diff --git a/ext/webgpu/src/02_idl_types.js b/ext/webgpu/src/02_idl_types.js index daafdfa4b2..e3ae7fb03d 100644 --- a/ext/webgpu/src/02_idl_types.js +++ b/ext/webgpu/src/02_idl_types.js @@ -3,7 +3,7 @@ // @ts-check /// -import * as webidl from "internal:ext/webidl/00_webidl.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; import { GPU, GPUAdapter, @@ -35,7 +35,7 @@ import { GPUTextureUsage, GPUTextureView, GPUValidationError, -} from "internal:ext/webgpu/01_webgpu.js"; +} from "internal:deno_webgpu/01_webgpu.js"; const primordials = globalThis.__bootstrap.primordials; const { SymbolIterator, TypeError } = primordials; diff --git a/ext/webgpu/src/03_surface.js b/ext/webgpu/src/03_surface.js index b46db047c5..12b919a271 100644 --- a/ext/webgpu/src/03_surface.js +++ b/ext/webgpu/src/03_surface.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"; const primordials = globalThis.__bootstrap.primordials; const { Symbol } = primordials; import { _device, assertDevice, createGPUTexture, -} from "internal:ext/webgpu/01_webgpu.js"; +} from "internal:deno_webgpu/01_webgpu.js"; const _surfaceRid = Symbol("[[surfaceRid]]"); const _configuration = Symbol("[[configuration]]"); diff --git a/ext/webgpu/src/04_surface_idl_types.js b/ext/webgpu/src/04_surface_idl_types.js index f9665afa68..cd6dabffc4 100644 --- a/ext/webgpu/src/04_surface_idl_types.js +++ b/ext/webgpu/src/04_surface_idl_types.js @@ -6,8 +6,8 @@ /// /// -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { GPUTextureUsage } from "internal:ext/webgpu/01_webgpu.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { GPUTextureUsage } from "internal:deno_webgpu/01_webgpu.js"; // ENUM: GPUCanvasAlphaMode webidl.converters["GPUCanvasAlphaMode"] = webidl.createEnumConverter( diff --git a/ext/webgpu/src/lib.rs b/ext/webgpu/src/lib.rs index 83326b71ac..68069c133d 100644 --- a/ext/webgpu/src/lib.rs +++ b/ext/webgpu/src/lib.rs @@ -119,11 +119,7 @@ impl Resource for WebGpuQuerySet { pub fn init(unstable: bool) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web"]) - .esm(include_js_files!( - prefix "internal:ext/webgpu", - "01_webgpu.js", - "02_idl_types.js", - )) + .esm(include_js_files!("01_webgpu.js", "02_idl_types.js",)) .ops(declare_webgpu_ops()) .state(move |state| { // TODO: check & possibly streamline this diff --git a/ext/webgpu/src/surface.rs b/ext/webgpu/src/surface.rs index 84d17b38d0..8304427b9b 100644 --- a/ext/webgpu/src/surface.rs +++ b/ext/webgpu/src/surface.rs @@ -16,7 +16,6 @@ pub fn init_surface(unstable: bool) -> Extension { Extension::builder("deno_webgpu_surface") .dependencies(vec!["deno_webidl", "deno_web", "deno_webgpu"]) .esm(include_js_files!( - prefix "internal:ext/webgpu", "03_surface.js", "04_surface_idl_types.js", )) diff --git a/ext/webidl/benches/dict.js b/ext/webidl/benches/dict.js index b53326de9c..b009a3c947 100644 --- a/ext/webidl/benches/dict.js +++ b/ext/webidl/benches/dict.js @@ -5,7 +5,7 @@ import { converters, createDictionaryConverter, -} from "internal:ext/webidl/00_webidl.js"; +} from "internal:deno_webidl/00_webidl.js"; const TextDecodeOptions = createDictionaryConverter( "TextDecodeOptions", diff --git a/ext/webidl/internal.d.ts b/ext/webidl/internal.d.ts index 9f47c42e50..22a9a693da 100644 --- a/ext/webidl/internal.d.ts +++ b/ext/webidl/internal.d.ts @@ -4,7 +4,7 @@ /// /// -declare module "internal:ext/webidl/00_webidl.js" { +declare module "internal:deno_webidl/00_webidl.js" { interface ConverterOpts { /** * The prefix for error messages created by this converter. diff --git a/ext/webidl/lib.rs b/ext/webidl/lib.rs index 4e21ef7963..1c3d760d37 100644 --- a/ext/webidl/lib.rs +++ b/ext/webidl/lib.rs @@ -6,9 +6,6 @@ use deno_core::Extension; /// Load and execute the javascript code. pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) - .esm(include_js_files!( - prefix "internal:ext/webidl", - "00_webidl.js", - )) + .esm(include_js_files!("00_webidl.js",)) .build() } diff --git a/ext/websocket/01_websocket.js b/ext/websocket/01_websocket.js index 305cf75a77..45e3f00e7d 100644 --- a/ext/websocket/01_websocket.js +++ b/ext/websocket/01_websocket.js @@ -4,10 +4,10 @@ const core = globalThis.Deno.core; const ops = core.ops; -import { URL } from "internal:ext/url/00_url.js"; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { HTTP_TOKEN_CODE_POINT_RE } from "internal:ext/web/00_infra.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; +import { URL } from "internal:deno_url/00_url.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { HTTP_TOKEN_CODE_POINT_RE } from "internal:deno_web/00_infra.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; import { _skipInternalInit, CloseEvent, @@ -16,8 +16,8 @@ import { Event, EventTarget, MessageEvent, -} from "internal:ext/web/02_event.js"; -import { Blob, BlobPrototype } from "internal:ext/web/09_file.js"; +} from "internal:deno_web/02_event.js"; +import { Blob, BlobPrototype } from "internal:deno_web/09_file.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayBufferPrototype, diff --git a/ext/websocket/02_websocketstream.js b/ext/websocket/02_websocketstream.js index b3d21297f2..1418da1ffb 100644 --- a/ext/websocket/02_websocketstream.js +++ b/ext/websocket/02_websocketstream.js @@ -4,15 +4,15 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { Deferred, writableStreamClose } from "internal:ext/web/06_streams.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; -import { add, remove } from "internal:ext/web/03_abort_signal.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { Deferred, writableStreamClose } from "internal:deno_web/06_streams.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; +import { add, remove } from "internal:deno_web/03_abort_signal.js"; import { fillHeaders, headerListFromHeaders, headersFromHeaderList, -} from "internal:ext/fetch/20_headers.js"; +} from "internal:deno_fetch/20_headers.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeJoin, diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index da6a48e45c..0ae2ada63f 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -505,7 +505,6 @@ pub fn init( Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_url", "deno_webidl"]) .esm(include_js_files!( - prefix "internal:ext/websocket", "01_websocket.js", "02_websocketstream.js", )) diff --git a/ext/webstorage/01_webstorage.js b/ext/webstorage/01_webstorage.js index d7abdfbd8f..d0e75faf7a 100644 --- a/ext/webstorage/01_webstorage.js +++ b/ext/webstorage/01_webstorage.js @@ -4,7 +4,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 { SafeArrayIterator, diff --git a/ext/webstorage/lib.rs b/ext/webstorage/lib.rs index d878ad7015..852ce229ef 100644 --- a/ext/webstorage/lib.rs +++ b/ext/webstorage/lib.rs @@ -24,10 +24,7 @@ const MAX_STORAGE_BYTES: u32 = 10 * 1024 * 1024; pub fn init(origin_storage_dir: Option) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl"]) - .esm(include_js_files!( - prefix "internal:ext/webstorage", - "01_webstorage.js", - )) + .esm(include_js_files!("01_webstorage.js",)) .ops(vec![ op_webstorage_length::decl(), op_webstorage_key::decl(), diff --git a/runtime/js/06_util.js b/runtime/js/06_util.js index 6ad1b3ce15..435a55a61f 100644 --- a/runtime/js/06_util.js +++ b/runtime/js/06_util.js @@ -11,7 +11,7 @@ const { TypeError, } = primordials; import { build } from "internal:runtime/js/01_build.js"; -import { URLPrototype } from "internal:ext/url/00_url.js"; +import { URLPrototype } from "internal:deno_url/00_url.js"; let logDebug = false; let logSource = "JS"; diff --git a/runtime/js/10_permissions.js b/runtime/js/10_permissions.js index 6019302e4d..e8243153d7 100644 --- a/runtime/js/10_permissions.js +++ b/runtime/js/10_permissions.js @@ -2,7 +2,7 @@ const core = globalThis.Deno.core; const ops = core.ops; -import { Event, EventTarget } from "internal:ext/web/02_event.js"; +import { Event, EventTarget } from "internal:deno_web/02_event.js"; import { pathFromURL } from "internal:runtime/js/06_util.js"; const primordials = globalThis.__bootstrap.primordials; const { diff --git a/runtime/js/11_workers.js b/runtime/js/11_workers.js index 56ceb92f39..7b5090dc54 100644 --- a/runtime/js/11_workers.js +++ b/runtime/js/11_workers.js @@ -11,9 +11,9 @@ const { SymbolIterator, SymbolToStringTag, } = primordials; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import { URL } from "internal:ext/url/00_url.js"; -import { getLocationHref } from "internal:ext/web/12_location.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import { URL } from "internal:deno_url/00_url.js"; +import { getLocationHref } from "internal:deno_web/12_location.js"; import { serializePermissions } from "internal:runtime/js/10_permissions.js"; import { log } from "internal:runtime/js/06_util.js"; import { @@ -21,12 +21,12 @@ import { ErrorEvent, EventTarget, MessageEvent, -} from "internal:ext/web/02_event.js"; +} from "internal:deno_web/02_event.js"; import { deserializeJsMessageData, MessagePortPrototype, serializeJsMessageData, -} from "internal:ext/web/13_message_port.js"; +} from "internal:deno_web/13_message_port.js"; function createWorker( specifier, diff --git a/runtime/js/13_buffer.js b/runtime/js/13_buffer.js index 8e87eefa52..be3aed390e 100644 --- a/runtime/js/13_buffer.js +++ b/runtime/js/13_buffer.js @@ -4,7 +4,7 @@ // Copyright 2009 The Go Authors. All rights reserved. BSD license. // https://github.com/golang/go/blob/master/LICENSE -import { assert } from "internal:ext/web/00_infra.js"; +import { assert } from "internal:deno_web/00_infra.js"; const primordials = globalThis.__bootstrap.primordials; const { TypedArrayPrototypeSubarray, diff --git a/runtime/js/30_os.js b/runtime/js/30_os.js index 720545b40f..b09f257972 100644 --- a/runtime/js/30_os.js +++ b/runtime/js/30_os.js @@ -2,7 +2,7 @@ const core = globalThis.Deno.core; const ops = core.ops; -import { Event, EventTarget } from "internal:ext/web/02_event.js"; +import { Event, EventTarget } from "internal:deno_web/02_event.js"; const primordials = globalThis.__bootstrap.primordials; const { Error, diff --git a/runtime/js/40_files.js b/runtime/js/40_files.js index 98c569a095..f380ca7ebe 100644 --- a/runtime/js/40_files.js +++ b/runtime/js/40_files.js @@ -13,7 +13,7 @@ import { pathFromURL } from "internal:runtime/js/06_util.js"; import { readableStreamForRid, writableStreamForRid, -} from "internal:ext/web/06_streams.js"; +} from "internal:deno_web/06_streams.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeFilter, diff --git a/runtime/js/40_http.js b/runtime/js/40_http.js index afacf7b278..026234f79e 100644 --- a/runtime/js/40_http.js +++ b/runtime/js/40_http.js @@ -1,7 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. const core = globalThis.Deno.core; const ops = core.ops; -import { HttpConn } from "internal:ext/http/01_http.js"; +import { HttpConn } from "internal:deno_http/01_http.js"; function serveHttp(conn) { const rid = ops.op_http_start(conn.rid); diff --git a/runtime/js/40_process.js b/runtime/js/40_process.js index 87e898b56a..a949e48ed6 100644 --- a/runtime/js/40_process.js +++ b/runtime/js/40_process.js @@ -5,7 +5,7 @@ const ops = core.ops; import { FsFile } from "internal:runtime/js/40_files.js"; import { readAll } from "internal:runtime/js/12_io.js"; import { pathFromURL } from "internal:runtime/js/06_util.js"; -import { assert } from "internal:ext/web/00_infra.js"; +import { assert } from "internal:deno_web/00_infra.js"; const primordials = globalThis.__bootstrap.primordials; const { ArrayPrototypeMap, diff --git a/runtime/js/40_read_file.js b/runtime/js/40_read_file.js index b7f0a70124..317875f736 100644 --- a/runtime/js/40_read_file.js +++ b/runtime/js/40_read_file.js @@ -3,7 +3,7 @@ const core = globalThis.Deno.core; const ops = core.ops; import { pathFromURL } from "internal:runtime/js/06_util.js"; -import * as abortSignal from "internal:ext/web/03_abort_signal.js"; +import * as abortSignal from "internal:deno_web/03_abort_signal.js"; function readFileSync(path) { return ops.op_readfile_sync(pathFromURL(path)); diff --git a/runtime/js/40_spawn.js b/runtime/js/40_spawn.js index dfccec5d7f..f153b93a5c 100644 --- a/runtime/js/40_spawn.js +++ b/runtime/js/40_spawn.js @@ -4,7 +4,7 @@ const core = globalThis.Deno.core; const ops = core.ops; const primordials = globalThis.__bootstrap.primordials; import { pathFromURL } from "internal:runtime/js/06_util.js"; -import { add, remove } from "internal:ext/web/03_abort_signal.js"; +import { add, remove } from "internal:deno_web/03_abort_signal.js"; const { ArrayPrototypeMap, ObjectEntries, @@ -23,7 +23,7 @@ import { readableStreamForRidUnrefableUnref, ReadableStreamPrototype, writableStreamForRid, -} from "internal:ext/web/06_streams.js"; +} from "internal:deno_web/06_streams.js"; const illegalConstructorKey = Symbol("illegalConstructorKey"); diff --git a/runtime/js/40_write_file.js b/runtime/js/40_write_file.js index a9c870ca37..255def09f2 100644 --- a/runtime/js/40_write_file.js +++ b/runtime/js/40_write_file.js @@ -2,10 +2,10 @@ const core = globalThis.Deno.core; const ops = core.ops; const primordials = globalThis.__bootstrap.primordials; -import * as abortSignal from "internal:ext/web/03_abort_signal.js"; +import * as abortSignal from "internal:deno_web/03_abort_signal.js"; import { pathFromURL } from "internal:runtime/js/06_util.js"; import { open } from "internal:runtime/js/40_files.js"; -import { ReadableStreamPrototype } from "internal:ext/web/06_streams.js"; +import { ReadableStreamPrototype } from "internal:deno_web/06_streams.js"; const { ObjectPrototypeIsPrototypeOf } = primordials; function writeFileSync( diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js index 7b791017b1..5321bf1d3f 100644 --- a/runtime/js/90_deno_ns.js +++ b/runtime/js/90_deno_ns.js @@ -2,14 +2,14 @@ const core = globalThis.Deno.core; const ops = core.ops; -import * as timers from "internal:ext/web/02_timers.js"; -import * as httpClient from "internal:ext/fetch/22_http_client.js"; -import * as console from "internal:ext/console/02_console.js"; -import * as ffi from "internal:ext/ffi/00_ffi.js"; -import * as net from "internal:ext/net/01_net.js"; -import * as tls from "internal:ext/net/02_tls.js"; -import * as http from "internal:ext/http/01_http.js"; -import * as flash from "internal:ext/flash/01_http.js"; +import * as timers from "internal:deno_web/02_timers.js"; +import * as httpClient from "internal:deno_fetch/22_http_client.js"; +import * as console from "internal:deno_console/02_console.js"; +import * as ffi from "internal:deno_ffi/00_ffi.js"; +import * as net from "internal:deno_net/01_net.js"; +import * as tls from "internal:deno_net/02_tls.js"; +import * as http from "internal:deno_http/01_http.js"; +import * as flash from "internal:deno_flash/01_http.js"; import * as build from "internal:runtime/js/01_build.js"; import * as errors from "internal:runtime/js/01_errors.js"; import * as version from "internal:runtime/js/01_version.js"; diff --git a/runtime/js/98_global_scope.js b/runtime/js/98_global_scope.js index dcb3bd4869..da892f44ae 100644 --- a/runtime/js/98_global_scope.js +++ b/runtime/js/98_global_scope.js @@ -8,37 +8,37 @@ const { } = primordials; import * as util from "internal:runtime/js/06_util.js"; -import * as location from "internal:ext/web/12_location.js"; -import * as event from "internal:ext/web/02_event.js"; -import * as timers from "internal:ext/web/02_timers.js"; -import * as base64 from "internal:ext/web/05_base64.js"; -import * as encoding from "internal:ext/web/08_text_encoding.js"; -import * as console from "internal:ext/console/02_console.js"; -import * as caches from "internal:ext/cache/01_cache.js"; -import * as compression from "internal:ext/web/14_compression.js"; +import * as location from "internal:deno_web/12_location.js"; +import * as event from "internal:deno_web/02_event.js"; +import * as timers from "internal:deno_web/02_timers.js"; +import * as base64 from "internal:deno_web/05_base64.js"; +import * as encoding from "internal:deno_web/08_text_encoding.js"; +import * as console from "internal:deno_console/02_console.js"; +import * as caches from "internal:deno_cache/01_cache.js"; +import * as compression from "internal:deno_web/14_compression.js"; import * as worker from "internal:runtime/js/11_workers.js"; -import * as performance from "internal:ext/web/15_performance.js"; -import * as crypto from "internal:ext/crypto/00_crypto.js"; -import * as url from "internal:ext/url/00_url.js"; -import * as urlPattern from "internal:ext/url/01_urlpattern.js"; -import * as headers from "internal:ext/fetch/20_headers.js"; -import * as streams from "internal:ext/web/06_streams.js"; -import * as fileReader from "internal:ext/web/10_filereader.js"; -import * as webgpu from "internal:ext/webgpu/01_webgpu.js"; -import * as webSocket from "internal:ext/websocket/01_websocket.js"; -import * as webSocketStream from "internal:ext/websocket/02_websocketstream.js"; -import * as broadcastChannel from "internal:ext/broadcast_channel/01_broadcast_channel.js"; -import * as file from "internal:ext/web/09_file.js"; -import * as formData from "internal:ext/fetch/21_formdata.js"; -import * as request from "internal:ext/fetch/23_request.js"; -import * as response from "internal:ext/fetch/23_response.js"; -import * as fetch from "internal:ext/fetch/26_fetch.js"; -import * as messagePort from "internal:ext/web/13_message_port.js"; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; -import * as abortSignal from "internal:ext/web/03_abort_signal.js"; -import * as globalInterfaces from "internal:ext/web/04_global_interfaces.js"; -import * as webStorage from "internal:ext/webstorage/01_webstorage.js"; +import * as performance from "internal:deno_web/15_performance.js"; +import * as crypto from "internal:deno_crypto/00_crypto.js"; +import * as url from "internal:deno_url/00_url.js"; +import * as urlPattern from "internal:deno_url/01_urlpattern.js"; +import * as headers from "internal:deno_fetch/20_headers.js"; +import * as streams from "internal:deno_web/06_streams.js"; +import * as fileReader from "internal:deno_web/10_filereader.js"; +import * as webgpu from "internal:deno_webgpu/01_webgpu.js"; +import * as webSocket from "internal:deno_websocket/01_websocket.js"; +import * as webSocketStream from "internal:deno_websocket/02_websocketstream.js"; +import * as broadcastChannel from "internal:deno_broadcast_channel/01_broadcast_channel.js"; +import * as file from "internal:deno_web/09_file.js"; +import * as formData from "internal:deno_fetch/21_formdata.js"; +import * as request from "internal:deno_fetch/23_request.js"; +import * as response from "internal:deno_fetch/23_response.js"; +import * as fetch from "internal:deno_fetch/26_fetch.js"; +import * as messagePort from "internal:deno_web/13_message_port.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; +import * as abortSignal from "internal:deno_web/03_abort_signal.js"; +import * as globalInterfaces from "internal:deno_web/04_global_interfaces.js"; +import * as webStorage from "internal:deno_webstorage/01_webstorage.js"; import * as prompt from "internal:runtime/js/41_prompt.js"; // https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index 7970071681..5d9012bc4c 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -40,28 +40,28 @@ const { WeakMapPrototypeSet, } = primordials; import * as util from "internal:runtime/js/06_util.js"; -import * as event from "internal:ext/web/02_event.js"; -import * as location from "internal:ext/web/12_location.js"; +import * as event from "internal:deno_web/02_event.js"; +import * as location from "internal:deno_web/12_location.js"; import * as build from "internal:runtime/js/01_build.js"; import * as version from "internal:runtime/js/01_version.js"; import * as os from "internal:runtime/js/30_os.js"; -import * as timers from "internal:ext/web/02_timers.js"; -import * as colors from "internal:ext/console/01_colors.js"; -import * as net from "internal:ext/net/01_net.js"; +import * as timers from "internal:deno_web/02_timers.js"; +import * as colors from "internal:deno_console/01_colors.js"; +import * as net from "internal:deno_net/01_net.js"; import { inspectArgs, quoteString, wrapConsole, -} from "internal:ext/console/02_console.js"; -import * as performance from "internal:ext/web/15_performance.js"; -import * as url from "internal:ext/url/00_url.js"; -import * as fetch from "internal:ext/fetch/26_fetch.js"; -import * as messagePort from "internal:ext/web/13_message_port.js"; +} from "internal:deno_console/02_console.js"; +import * as performance from "internal:deno_web/15_performance.js"; +import * as url from "internal:deno_url/00_url.js"; +import * as fetch from "internal:deno_fetch/26_fetch.js"; +import * as messagePort from "internal:deno_web/13_message_port.js"; import { denoNs, denoNsUnstable } from "internal:runtime/js/90_deno_ns.js"; import { errors } from "internal:runtime/js/01_errors.js"; -import * as webidl from "internal:ext/webidl/00_webidl.js"; -import DOMException from "internal:ext/web/01_dom_exception.js"; -import * as flash from "internal:ext/flash/01_http.js"; +import * as webidl from "internal:deno_webidl/00_webidl.js"; +import DOMException from "internal:deno_web/01_dom_exception.js"; +import * as flash from "internal:deno_flash/01_http.js"; import * as spawn from "internal:runtime/js/40_spawn.js"; import { mainRuntimeGlobalProperties, diff --git a/tools/wgpu_sync.js b/tools/wgpu_sync.js index 4d14f43cf0..4c374e5743 100755 --- a/tools/wgpu_sync.js +++ b/tools/wgpu_sync.js @@ -87,7 +87,7 @@ async function patchSrcLib() { (data) => data.replace( `prefix "internal:deno_webgpu",`, - `prefix "internal:ext/webgpu",`, + `prefix "internal:deno_webgpu",`, ), ); } @@ -98,7 +98,7 @@ async function patchSurface() { (data) => data.replace( `prefix "internal:deno_webgpu",`, - `prefix "internal:ext/webgpu",`, + `prefix "internal:deno_webgpu",`, ), ); }