summaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-03-08 07:44:54 -0400
committerGitHub <noreply@github.com>2023-03-08 12:44:54 +0100
commit72fe9bb47005e720444e65a66e91559287137780 (patch)
treed529ee7f3b2c33063ba4496f8fd3dfdbac0d1355 /runtime
parentd24c6ea27f7dea57e3bc0cda342d6cbe59782f7d (diff)
refactor: rename InternalModuleLoader to ExtModuleLoader, use ext: scheme for snapshotted modules (#18041)
This commit renames "deno_core::InternalModuleLoader" to "ExtModuleLoader" and changes the specifiers used by the modules loaded from this loader to "ext:". "internal:" scheme was really ambiguous and it's more characters than "ext:", which should result in slightly smaller snapshot size. Closes https://github.com/denoland/deno/issues/18020
Diffstat (limited to 'runtime')
-rw-r--r--runtime/fmt_errors.rs4
-rw-r--r--runtime/js/10_permissions.js4
-rw-r--r--runtime/js/11_workers.js14
-rw-r--r--runtime/js/13_buffer.js2
-rw-r--r--runtime/js/30_os.js2
-rw-r--r--runtime/js/40_http.js2
-rw-r--r--runtime/js/40_process.js10
-rw-r--r--runtime/js/41_prompt.js4
-rw-r--r--runtime/js/90_deno_ns.js40
-rw-r--r--runtime/js/98_global_scope.js66
-rw-r--r--runtime/js/99_main.js38
-rw-r--r--runtime/web_worker.rs2
12 files changed, 94 insertions, 94 deletions
diff --git a/runtime/fmt_errors.rs b/runtime/fmt_errors.rs
index 398b7c58a..440ee373f 100644
--- a/runtime/fmt_errors.rs
+++ b/runtime/fmt_errors.rs
@@ -45,7 +45,7 @@ pub fn format_location(frame: &JsStackFrame) -> String {
let _internal = frame
.file_name
.as_ref()
- .map_or(false, |f| f.starts_with("internal:"));
+ .map_or(false, |f| f.starts_with("ext:"));
if frame.is_native {
return cyan("native").to_string();
}
@@ -73,7 +73,7 @@ fn format_frame(frame: &JsStackFrame) -> String {
let _internal = frame
.file_name
.as_ref()
- .map_or(false, |f| f.starts_with("internal:"));
+ .map_or(false, |f| f.starts_with("ext:"));
let is_method_call =
!(frame.is_top_level.unwrap_or_default() || frame.is_constructor);
let mut result = String::new();
diff --git a/runtime/js/10_permissions.js b/runtime/js/10_permissions.js
index 13ea9828b..20894beb0 100644
--- a/runtime/js/10_permissions.js
+++ b/runtime/js/10_permissions.js
@@ -2,8 +2,8 @@
const core = globalThis.Deno.core;
const ops = core.ops;
-import { pathFromURL } from "internal:deno_web/00_infra.js";
-import { Event, EventTarget } from "internal:deno_web/02_event.js";
+import { pathFromURL } from "ext:deno_web/00_infra.js";
+import { Event, EventTarget } from "ext:deno_web/02_event.js";
const primordials = globalThis.__bootstrap.primordials;
const {
ArrayIsArray,
diff --git a/runtime/js/11_workers.js b/runtime/js/11_workers.js
index 32994e707..f8ed122b8 100644
--- a/runtime/js/11_workers.js
+++ b/runtime/js/11_workers.js
@@ -11,22 +11,22 @@ const {
SymbolIterator,
SymbolToStringTag,
} = primordials;
-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/10_permissions.js";
-import { log } from "internal:runtime/06_util.js";
+import * as webidl from "ext:deno_webidl/00_webidl.js";
+import { URL } from "ext:deno_url/00_url.js";
+import { getLocationHref } from "ext:deno_web/12_location.js";
+import { serializePermissions } from "ext:runtime/10_permissions.js";
+import { log } from "ext:runtime/06_util.js";
import {
defineEventHandler,
ErrorEvent,
EventTarget,
MessageEvent,
-} from "internal:deno_web/02_event.js";
+} from "ext:deno_web/02_event.js";
import {
deserializeJsMessageData,
MessagePortPrototype,
serializeJsMessageData,
-} from "internal:deno_web/13_message_port.js";
+} from "ext:deno_web/13_message_port.js";
function createWorker(
specifier,
diff --git a/runtime/js/13_buffer.js b/runtime/js/13_buffer.js
index be3aed390..4534152f3 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:deno_web/00_infra.js";
+import { assert } from "ext: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 63e3748d3..76325cfff 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:deno_web/02_event.js";
+import { Event, EventTarget } from "ext:deno_web/02_event.js";
const primordials = globalThis.__bootstrap.primordials;
const {
Error,
diff --git a/runtime/js/40_http.js b/runtime/js/40_http.js
index 026234f79..5ee219360 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:deno_http/01_http.js";
+import { HttpConn } from "ext: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 661f972df..2a5ac86bf 100644
--- a/runtime/js/40_process.js
+++ b/runtime/js/40_process.js
@@ -16,10 +16,10 @@ const {
SymbolFor,
Symbol,
} = primordials;
-import { FsFile } from "internal:deno_fs/30_fs.js";
-import { readAll } from "internal:deno_io/12_io.js";
-import { assert, pathFromURL } from "internal:deno_web/00_infra.js";
-import * as abortSignal from "internal:deno_web/03_abort_signal.js";
+import { FsFile } from "ext:deno_fs/30_fs.js";
+import { readAll } from "ext:deno_io/12_io.js";
+import { assert, pathFromURL } from "ext:deno_web/00_infra.js";
+import * as abortSignal from "ext:deno_web/03_abort_signal.js";
import {
readableStreamCollectIntoUint8Array,
readableStreamForRidUnrefable,
@@ -27,7 +27,7 @@ import {
readableStreamForRidUnrefableUnref,
ReadableStreamPrototype,
writableStreamForRid,
-} from "internal:deno_web/06_streams.js";
+} from "ext:deno_web/06_streams.js";
function opKill(pid, signo, apiName) {
ops.op_kill(pid, signo, apiName);
diff --git a/runtime/js/41_prompt.js b/runtime/js/41_prompt.js
index 66598f755..137f17dcf 100644
--- a/runtime/js/41_prompt.js
+++ b/runtime/js/41_prompt.js
@@ -1,8 +1,8 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
const core = globalThis.Deno.core;
const primordials = globalThis.__bootstrap.primordials;
-import { isatty } from "internal:runtime/40_tty.js";
-import { stdin } from "internal:deno_io/12_io.js";
+import { isatty } from "ext:runtime/40_tty.js";
+import { stdin } from "ext:deno_io/12_io.js";
const { ArrayPrototypePush, StringPrototypeCharCodeAt, Uint8Array } =
primordials;
const LF = StringPrototypeCharCodeAt("\n", 0);
diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js
index 93d327787..7c3a9226d 100644
--- a/runtime/js/90_deno_ns.js
+++ b/runtime/js/90_deno_ns.js
@@ -2,27 +2,27 @@
const core = globalThis.Deno.core;
const ops = core.ops;
-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 errors from "internal:runtime/01_errors.js";
-import * as version from "internal:runtime/01_version.ts";
-import * as permissions from "internal:runtime/10_permissions.js";
-import * as io from "internal:deno_io/12_io.js";
-import * as buffer from "internal:runtime/13_buffer.js";
-import * as fs from "internal:deno_fs/30_fs.js";
-import * as os from "internal:runtime/30_os.js";
-import * as fsEvents from "internal:runtime/40_fs_events.js";
-import * as process from "internal:runtime/40_process.js";
-import * as signals from "internal:runtime/40_signals.js";
-import * as tty from "internal:runtime/40_tty.js";
+import * as timers from "ext:deno_web/02_timers.js";
+import * as httpClient from "ext:deno_fetch/22_http_client.js";
+import * as console from "ext:deno_console/02_console.js";
+import * as ffi from "ext:deno_ffi/00_ffi.js";
+import * as net from "ext:deno_net/01_net.js";
+import * as tls from "ext:deno_net/02_tls.js";
+import * as http from "ext:deno_http/01_http.js";
+import * as flash from "ext:deno_flash/01_http.js";
+import * as errors from "ext:runtime/01_errors.js";
+import * as version from "ext:runtime/01_version.ts";
+import * as permissions from "ext:runtime/10_permissions.js";
+import * as io from "ext:deno_io/12_io.js";
+import * as buffer from "ext:runtime/13_buffer.js";
+import * as fs from "ext:deno_fs/30_fs.js";
+import * as os from "ext:runtime/30_os.js";
+import * as fsEvents from "ext:runtime/40_fs_events.js";
+import * as process from "ext:runtime/40_process.js";
+import * as signals from "ext:runtime/40_signals.js";
+import * as tty from "ext:runtime/40_tty.js";
// TODO(bartlomieju): this is funky we have two `http` imports
-import * as httpRuntime from "internal:runtime/40_http.js";
+import * as httpRuntime from "ext:runtime/40_http.js";
const denoNs = {
metrics: core.metrics,
diff --git a/runtime/js/98_global_scope.js b/runtime/js/98_global_scope.js
index 27ad593ff..67ec9d26a 100644
--- a/runtime/js/98_global_scope.js
+++ b/runtime/js/98_global_scope.js
@@ -7,39 +7,39 @@ const {
SymbolFor,
} = primordials;
-import * as util from "internal:runtime/06_util.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/11_workers.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/41_prompt.js";
+import * as util from "ext:runtime/06_util.js";
+import * as location from "ext:deno_web/12_location.js";
+import * as event from "ext:deno_web/02_event.js";
+import * as timers from "ext:deno_web/02_timers.js";
+import * as base64 from "ext:deno_web/05_base64.js";
+import * as encoding from "ext:deno_web/08_text_encoding.js";
+import * as console from "ext:deno_console/02_console.js";
+import * as caches from "ext:deno_cache/01_cache.js";
+import * as compression from "ext:deno_web/14_compression.js";
+import * as worker from "ext:runtime/11_workers.js";
+import * as performance from "ext:deno_web/15_performance.js";
+import * as crypto from "ext:deno_crypto/00_crypto.js";
+import * as url from "ext:deno_url/00_url.js";
+import * as urlPattern from "ext:deno_url/01_urlpattern.js";
+import * as headers from "ext:deno_fetch/20_headers.js";
+import * as streams from "ext:deno_web/06_streams.js";
+import * as fileReader from "ext:deno_web/10_filereader.js";
+import * as webgpu from "ext:deno_webgpu/01_webgpu.js";
+import * as webSocket from "ext:deno_websocket/01_websocket.js";
+import * as webSocketStream from "ext:deno_websocket/02_websocketstream.js";
+import * as broadcastChannel from "ext:deno_broadcast_channel/01_broadcast_channel.js";
+import * as file from "ext:deno_web/09_file.js";
+import * as formData from "ext:deno_fetch/21_formdata.js";
+import * as request from "ext:deno_fetch/23_request.js";
+import * as response from "ext:deno_fetch/23_response.js";
+import * as fetch from "ext:deno_fetch/26_fetch.js";
+import * as messagePort from "ext:deno_web/13_message_port.js";
+import * as webidl from "ext:deno_webidl/00_webidl.js";
+import DOMException from "ext:deno_web/01_dom_exception.js";
+import * as abortSignal from "ext:deno_web/03_abort_signal.js";
+import * as globalInterfaces from "ext:deno_web/04_global_interfaces.js";
+import * as webStorage from "ext:deno_webstorage/01_webstorage.js";
+import * as prompt from "ext:runtime/41_prompt.js";
// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope
const windowOrWorkerGlobalScope = {
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index d90e186d9..e3e7e64d8 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -39,28 +39,28 @@ const {
WeakMapPrototypeGet,
WeakMapPrototypeSet,
} = primordials;
-import * as util from "internal:runtime/06_util.js";
-import * as event from "internal:deno_web/02_event.js";
-import * as location from "internal:deno_web/12_location.js";
-import * as version from "internal:runtime/01_version.ts";
-import * as os from "internal:runtime/30_os.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 * as util from "ext:runtime/06_util.js";
+import * as event from "ext:deno_web/02_event.js";
+import * as location from "ext:deno_web/12_location.js";
+import * as version from "ext:runtime/01_version.ts";
+import * as os from "ext:runtime/30_os.js";
+import * as timers from "ext:deno_web/02_timers.js";
+import * as colors from "ext:deno_console/01_colors.js";
+import * as net from "ext:deno_net/01_net.js";
import {
inspectArgs,
quoteString,
wrapConsole,
-} 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/90_deno_ns.js";
-import { errors } from "internal:runtime/01_errors.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";
+} from "ext:deno_console/02_console.js";
+import * as performance from "ext:deno_web/15_performance.js";
+import * as url from "ext:deno_url/00_url.js";
+import * as fetch from "ext:deno_fetch/26_fetch.js";
+import * as messagePort from "ext:deno_web/13_message_port.js";
+import { denoNs, denoNsUnstable } from "ext:runtime/90_deno_ns.js";
+import { errors } from "ext:runtime/01_errors.js";
+import * as webidl from "ext:deno_webidl/00_webidl.js";
+import DOMException from "ext:deno_web/01_dom_exception.js";
+import * as flash from "ext:deno_flash/01_http.js";
import {
mainRuntimeGlobalProperties,
setLanguage,
@@ -69,7 +69,7 @@ import {
unstableWindowOrWorkerGlobalScope,
windowOrWorkerGlobalScope,
workerRuntimeGlobalProperties,
-} from "internal:runtime/98_global_scope.js";
+} from "ext:runtime/98_global_scope.js";
let windowIsClosing = false;
let globalThis_;
diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
index 4417c13ef..7948dca0a 100644
--- a/runtime/web_worker.rs
+++ b/runtime/web_worker.rs
@@ -97,7 +97,7 @@ impl Serialize for WorkerControlEvent {
let value = match error.downcast_ref::<JsError>() {
Some(js_error) => {
let frame = js_error.frames.iter().find(|f| match &f.file_name {
- Some(s) => !s.trim_start_matches('[').starts_with("internal:"),
+ Some(s) => !s.trim_start_matches('[').starts_with("ext:"),
None => false,
});
json!({