diff --git a/cli/args/config_file.rs b/cli/args/config_file.rs index 160b02317a..7bf568d55a 100644 --- a/cli/args/config_file.rs +++ b/cli/args/config_file.rs @@ -925,7 +925,7 @@ pub fn get_ts_config_for_emit( "sourceMap": false, "strict": true, "target": "esnext", - "tsBuildInfoFile": "deno:///.tsbuildinfo", + "tsBuildInfoFile": "internal:///.tsbuildinfo", "useDefineForClassFields": true, // TODO(@kitsonk) remove for Deno 2.0 "useUnknownInCatchVariables": false, diff --git a/cli/args/flags_allow_net.rs b/cli/args/flags_allow_net.rs index 88d9d3c027..94699cc8bc 100644 --- a/cli/args/flags_allow_net.rs +++ b/cli/args/flags_allow_net.rs @@ -27,7 +27,7 @@ impl FromStr for BarePort { } pub fn validator(host_and_port: &str) -> Result<(), String> { - if Url::parse(&format!("deno://{host_and_port}")).is_ok() + if Url::parse(&format!("internal://{host_and_port}")).is_ok() || host_and_port.parse::().is_ok() || host_and_port.parse::().is_ok() { @@ -43,7 +43,7 @@ pub fn validator(host_and_port: &str) -> Result<(), String> { pub fn parse(paths: Vec) -> clap::Result> { let mut out: Vec = vec![]; for host_and_port in paths.iter() { - if Url::parse(&format!("deno://{host_and_port}")).is_ok() + if Url::parse(&format!("internal://{host_and_port}")).is_ok() || host_and_port.parse::().is_ok() { out.push(host_and_port.to_owned()) diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 13eb614120..70bbb1210f 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -1050,7 +1050,7 @@ impl Inner { async fn did_close(&mut self, params: DidCloseTextDocumentParams) { let mark = self.performance.mark("did_close", Some(¶ms)); - if params.text_document.uri.scheme() == "deno" { + if params.text_document.uri.scheme() == "internal" { // we can ignore virtual text documents closing, as they don't need to // be tracked in memory, as they are static assets that won't change // already managed by the language service @@ -2609,7 +2609,7 @@ impl tower_lsp::LanguageServer for LanguageServer { } async fn did_open(&self, params: DidOpenTextDocumentParams) { - if params.text_document.uri.scheme() == "deno" { + if params.text_document.uri.scheme() == "internal" { // we can ignore virtual text documents opening, as they don't need to // be tracked in memory, as they are static assets that won't change // already managed by the language service @@ -3121,7 +3121,7 @@ impl Inner { .performance .mark("virtual_text_document", Some(¶ms)); let specifier = self.url_map.normalize_url(¶ms.text_document.uri); - let contents = if specifier.as_str() == "deno:/status.md" { + let contents = if specifier.as_str() == "internal:/status.md" { let mut contents = String::new(); let mut documents_specifiers = self .documents diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs index 2f66e2d2db..e6e2581a81 100644 --- a/cli/lsp/tsc.rs +++ b/cli/lsp/tsc.rs @@ -1154,11 +1154,15 @@ impl ImplementationLocation { language_server: &language_server::Inner, ) -> lsp::Location { let specifier = normalize_specifier(&self.document_span.file_name) - .unwrap_or_else(|_| ModuleSpecifier::parse("deno://invalid").unwrap()); + .unwrap_or_else(|_| { + ModuleSpecifier::parse("internal://invalid").unwrap() + }); let uri = language_server .url_map .normalize_specifier(&specifier) - .unwrap_or_else(|_| ModuleSpecifier::parse("deno://invalid").unwrap()); + .unwrap_or_else(|_| { + ModuleSpecifier::parse("internal://invalid").unwrap() + }); lsp::Location { uri, range: self.document_span.text_span.to_range(line_index), diff --git a/cli/lsp/urls.rs b/cli/lsp/urls.rs index 4fba0c9ff3..1eb011c547 100644 --- a/cli/lsp/urls.rs +++ b/cli/lsp/urls.rs @@ -17,7 +17,7 @@ use std::sync::Arc; /// Used in situations where a default URL needs to be used where otherwise a /// panic is undesired. pub static INVALID_SPECIFIER: Lazy = - Lazy::new(|| ModuleSpecifier::parse("deno://invalid").unwrap()); + Lazy::new(|| ModuleSpecifier::parse("internal://invalid").unwrap()); /// Matches the `encodeURIComponent()` encoding from JavaScript, which matches /// the component percent encoding set. @@ -81,7 +81,7 @@ impl LspUrlMapInner { } /// A bi-directional map of URLs sent to the LSP client and internal module -/// specifiers. We need to map internal specifiers into `deno:` schema URLs +/// specifiers. We need to map internal specifiers into `internal:` schema URLs /// to allow the Deno language server to manage these as virtual documents. #[derive(Debug, Default, Clone)] pub struct LspUrlMap(Arc>); @@ -101,7 +101,7 @@ impl LspUrlMap { specifier.clone() } else { let specifier_str = if specifier.scheme() == "asset" { - format!("deno:/asset{}", specifier.path()) + format!("internal:/asset{}", specifier.path()) } else if specifier.scheme() == "data" { let data_url = DataUrl::process(specifier.as_str()) .map_err(|e| uri_error(format!("{e:?}")))?; @@ -114,7 +114,7 @@ impl LspUrlMap { media_type.as_ts_extension() }; format!( - "deno:/{}/data_url{}", + "internal:/{}/data_url{}", hash_data_specifier(specifier), extension ) @@ -128,7 +128,7 @@ impl LspUrlMap { }) .collect(); path.push_str(&parts.join("/")); - format!("deno:/{path}") + format!("internal:/{path}") }; let url = Url::parse(&specifier_str)?; inner.put(specifier.clone(), url.clone()); @@ -138,7 +138,7 @@ impl LspUrlMap { } } - /// Normalize URLs from the client, where "virtual" `deno:///` URLs are + /// Normalize URLs from the client, where "virtual" `internal:///` URLs are /// converted into proper module specifiers, as well as handle situations /// where the client encodes a file URL differently than Rust does by default /// causing issues with string matching of URLs. @@ -178,7 +178,7 @@ mod tests { .normalize_specifier(&fixture) .expect("could not handle specifier"); let expected_url = - Url::parse("deno:/https/deno.land/x/pkg%401.0.0/mod.ts").unwrap(); + Url::parse("internal:/https/deno.land/x/pkg%401.0.0/mod.ts").unwrap(); assert_eq!(actual_url, expected_url); let actual_specifier = map.normalize_url(&actual_url); @@ -193,7 +193,7 @@ mod tests { let actual_url = map .normalize_specifier(&fixture) .expect("could not handle specifier"); - let expected_url = Url::parse("deno:/https/cdn.skypack.dev/-/postcss%40v8.2.9-E4SktPp9c0AtxrJHp8iV/dist%3Des2020%2Cmode%3Dtypes/lib/postcss.d.ts").unwrap(); + let expected_url = Url::parse("internal:/https/cdn.skypack.dev/-/postcss%40v8.2.9-E4SktPp9c0AtxrJHp8iV/dist%3Des2020%2Cmode%3Dtypes/lib/postcss.d.ts").unwrap(); assert_eq!(actual_url, expected_url); let actual_specifier = map.normalize_url(&actual_url); @@ -207,7 +207,7 @@ mod tests { let actual_url = map .normalize_specifier(&fixture) .expect("could not handle specifier"); - let expected_url = Url::parse("deno:/c21c7fc382b2b0553dc0864aa81a3acacfb7b3d1285ab5ae76da6abec213fb37/data_url.ts").unwrap(); + let expected_url = Url::parse("internal:/c21c7fc382b2b0553dc0864aa81a3acacfb7b3d1285ab5ae76da6abec213fb37/data_url.ts").unwrap(); assert_eq!(actual_url, expected_url); let actual_specifier = map.normalize_url(&actual_url); diff --git a/cli/node/mod.rs b/cli/node/mod.rs index 8d599923b3..9ab593304a 100644 --- a/cli/node/mod.rs +++ b/cli/node/mod.rs @@ -101,7 +101,7 @@ impl NodeResolution { } Some(resolution) => (resolution.into_url(), MediaType::Dts), None => ( - ModuleSpecifier::parse("deno:///missing_dependency.d.ts").unwrap(), + ModuleSpecifier::parse("internal:///missing_dependency.d.ts").unwrap(), MediaType::Dts, ), } diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs index bca327e96e..128f9903bd 100644 --- a/cli/tests/integration/lsp_tests.rs +++ b/cli/tests/integration/lsp_tests.rs @@ -1073,7 +1073,7 @@ fn lsp_hover_asset() { "deno/virtualTextDocument", json!({ "textDocument": { - "uri": "deno:/asset/lib.deno.shared_globals.d.ts" + "uri": "internal:/asset/lib.deno.shared_globals.d.ts" } }), ) @@ -1084,7 +1084,7 @@ fn lsp_hover_asset() { "textDocument/hover", json!({ "textDocument": { - "uri": "deno:/asset/lib.es2015.symbol.wellknown.d.ts" + "uri": "internal:/asset/lib.es2015.symbol.wellknown.d.ts" }, "position": { "line": 109, @@ -3103,7 +3103,7 @@ fn lsp_code_lens_non_doc_nav_tree() { "deno/virtualTextDocument", json!({ "textDocument": { - "uri": "deno:/asset/lib.deno.shared_globals.d.ts" + "uri": "internal:/asset/lib.deno.shared_globals.d.ts" } }), ) @@ -3115,7 +3115,7 @@ fn lsp_code_lens_non_doc_nav_tree() { "textDocument/codeLens", json!({ "textDocument": { - "uri": "deno:/asset/lib.deno.shared_globals.d.ts" + "uri": "internal:/asset/lib.deno.shared_globals.d.ts" } }), ) 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 8510980f64..558eedbe15 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 (deno:ext/web/[WILDCARD]) + at new Event (internal:ext/web/[WILDCARD]) at [WILDCARD] diff --git a/cli/tests/testdata/run/fetch_async_error_stack.ts.out b/cli/tests/testdata/run/fetch_async_error_stack.ts.out index 0a7b353e24..8ca6708470 100644 --- a/cli/tests/testdata/run/fetch_async_error_stack.ts.out +++ b/cli/tests/testdata/run/fetch_async_error_stack.ts.out @@ -1,5 +1,5 @@ error: Uncaught (in promise) TypeError: error sending request for url[WILDCARD] await fetch("https://nonexistent.deno.land/"); ^[WILDCARD] - at async fetch (deno:[WILDCARD]) + at async fetch (internal:[WILDCARD]) at async file:///[WILDCARD]/fetch_async_error_stack.ts:1:1 diff --git a/cli/tests/testdata/run/queue_microtask_error.ts.out b/cli/tests/testdata/run/queue_microtask_error.ts.out index 6c4d419364..c1af4fec92 100644 --- a/cli/tests/testdata/run/queue_microtask_error.ts.out +++ b/cli/tests/testdata/run/queue_microtask_error.ts.out @@ -3,4 +3,4 @@ error: Uncaught Error: foo throw new Error("foo"); ^ at [WILDCARD]/queue_microtask_error.ts:2:9 - at deno:core/[WILDCARD] + at internal:core/[WILDCARD] diff --git a/cli/tests/testdata/run/queue_microtask_error_handled.ts.out b/cli/tests/testdata/run/queue_microtask_error_handled.ts.out index 7f3f7f84a5..9105570b37 100644 --- a/cli/tests/testdata/run/queue_microtask_error_handled.ts.out +++ b/cli/tests/testdata/run/queue_microtask_error_handled.ts.out @@ -7,9 +7,9 @@ colno: 9, error: Error: foo at [WILDCARD]/queue_microtask_error_handled.ts:18:9 - at deno:core/[WILDCARD] + at internal:core/[WILDCARD] } onerror() called Error: foo at [WILDCARD]/queue_microtask_error_handled.ts:18:9 - at deno:core/[WILDCARD] + at internal:core/[WILDCARD] 2 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 3e93f643a9..72237df6fa 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 (deno:ext/fetch/26_fetch.js:[WILDCARD]) + at handleWasmStreaming (internal:ext/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 a81684bfa7..afb522baac 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 (deno:ext/web/02_timers.js:[WILDCARD]) - at handleTimerMacrotask (deno:ext/web/02_timers.js:[WILDCARD]) + at Object.action (internal:ext/web/02_timers.js:[WILDCARD]) + at handleTimerMacrotask (internal:ext/web/02_timers.js:[WILDCARD]) error: Uncaught (in promise) Error: Unhandled error in child worker. - at Worker.#pollControl (deno:runtime/js/11_workers.js:[WILDCARD]) + at Worker.#pollControl (internal:runtime/js/11_workers.js:[WILDCARD]) diff --git a/cli/tests/testdata/test/steps/failing_steps.out b/cli/tests/testdata/test/steps/failing_steps.out index 4df104bd70..998c70aa27 100644 --- a/cli/tests/testdata/test/steps/failing_steps.out +++ b/cli/tests/testdata/test/steps/failing_steps.out @@ -37,13 +37,13 @@ failing step in failing test ... FAILED ([WILDCARD]) nested failure => ./test/steps/failing_steps.ts:[WILDCARD] error: Error: 1 test step failed. - at runTest (deno:cli/js/40_testing.js:[WILDCARD]) - at async runTests (deno:cli/js/40_testing.js:[WILDCARD]) + at runTest (internal:cli/js/40_testing.js:[WILDCARD]) + at async runTests (internal:cli/js/40_testing.js:[WILDCARD]) multiple test step failures => ./test/steps/failing_steps.ts:[WILDCARD] error: Error: 2 test steps failed. - at runTest (deno:cli/js/40_testing.js:[WILDCARD]) - at async runTests (deno:cli/js/40_testing.js:[WILDCARD]) + at runTest (internal:cli/js/40_testing.js:[WILDCARD]) + at async runTests (internal:cli/js/40_testing.js:[WILDCARD]) failing step in failing test => ./test/steps/failing_steps.ts:[WILDCARD] error: Error: Fail test. diff --git a/cli/tests/unit/opcall_test.ts b/cli/tests/unit/opcall_test.ts index 3f4f4472c2..fb7766e4f8 100644 --- a/cli/tests/unit/opcall_test.ts +++ b/cli/tests/unit/opcall_test.ts @@ -16,8 +16,8 @@ Deno.test(async function sendAsyncStackTrace() { assertStringIncludes(s, "opcall_test.ts"); assertStringIncludes(s, "read"); assert( - !s.includes("deno:core"), - "opcall stack traces should NOT include deno:core internals such as unwrapOpResult", + !s.includes("internal:core"), + "opcall stack traces should NOT include internal:core internals such as unwrapOpResult", ); } }); diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs index 4b2bcd49d0..1bd2779bfc 100644 --- a/cli/tools/coverage/mod.rs +++ b/cli/tools/coverage/mod.rs @@ -594,7 +594,7 @@ fn filter_coverages( coverages .into_iter() .filter(|e| { - let is_internal = e.url.starts_with("deno:") + let is_internal = e.url.starts_with("internal:") || e.url.ends_with("__anonymous__") || e.url.ends_with("$deno$test.js") || e.url.ends_with(".snap"); diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs index e27e495704..3e19d6df20 100644 --- a/cli/tools/doc.rs +++ b/cli/tools/doc.rs @@ -26,7 +26,7 @@ pub async fn print_docs( let mut doc_nodes = match doc_flags.source_file { DocSourceFileFlag::Builtin => { let source_file_specifier = - ModuleSpecifier::parse("deno://lib.deno.d.ts").unwrap(); + ModuleSpecifier::parse("internal://lib.deno.d.ts").unwrap(); let content = get_types_declaration_file_text(ps.options.unstable()); let mut loader = deno_graph::source::MemoryLoader::new( vec![( diff --git a/cli/tools/test.rs b/cli/tools/test.rs index e680d57187..cd2ac6ba53 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -655,7 +655,8 @@ fn abbreviate_test_error(js_error: &JsError) -> JsError { // check if there are any stack frames coming from user code let should_filter = frames.iter().any(|f| { if let Some(file_name) = &f.file_name { - !(file_name.starts_with("[deno:") || file_name.starts_with("deno:")) + !(file_name.starts_with("[internal:") + || file_name.starts_with("internal:")) } else { true } @@ -667,7 +668,8 @@ fn abbreviate_test_error(js_error: &JsError) -> JsError { .rev() .skip_while(|f| { if let Some(file_name) = &f.file_name { - file_name.starts_with("[deno:") || file_name.starts_with("deno:") + file_name.starts_with("[internal:") + || file_name.starts_with("internal:") } else { false } diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs index 3e7fbfb152..d9f1bad9bd 100644 --- a/cli/tsc/mod.rs +++ b/cli/tsc/mod.rs @@ -446,7 +446,7 @@ struct EmitArgs { fn op_emit(state: &mut OpState, args: EmitArgs) -> bool { let state = state.borrow_mut::(); match args.file_name.as_ref() { - "deno:///.tsbuildinfo" => state.maybe_tsbuildinfo = Some(args.data), + "internal:///.tsbuildinfo" => state.maybe_tsbuildinfo = Some(args.data), _ => { if cfg!(debug_assertions) { panic!("Unhandled emit write: {}", args.file_name); @@ -518,11 +518,11 @@ fn op_load(state: &mut OpState, args: Value) -> Result { let mut hash: Option = None; let mut media_type = MediaType::Unknown; let graph_data = state.graph_data.read(); - let data = if &v.specifier == "deno:///.tsbuildinfo" { + let data = if &v.specifier == "internal:///.tsbuildinfo" { state.maybe_tsbuildinfo.as_deref().map(Cow::Borrowed) // in certain situations we return a "blank" module to tsc and we need to // handle the request for that module here. - } else if &v.specifier == "deno:///missing_dependency.d.ts" { + } else if &v.specifier == "internal:///missing_dependency.d.ts" { hash = Some("1".to_string()); media_type = MediaType::Dts; Some(Cow::Borrowed("declare const __: any;\nexport = __;\n")) @@ -726,7 +726,7 @@ fn op_resolve( (specifier_str, media_type.as_ts_extension().into()) } None => ( - "deno:///missing_dependency.d.ts".to_string(), + "internal:///missing_dependency.d.ts".to_string(), ".d.ts".to_string(), ), }; @@ -983,10 +983,10 @@ mod tests { "lib": ["deno.window"], "module": "esnext", "noEmit": true, - "outDir": "deno:///", + "outDir": "internal:///", "strict": true, "target": "esnext", - "tsBuildInfoFile": "deno:///.tsbuildinfo", + "tsBuildInfoFile": "internal:///.tsbuildinfo", })); let request = Request { config, @@ -1075,7 +1075,7 @@ mod tests { &mut state, EmitArgs { data: "some file content".to_string(), - file_name: "deno:///.tsbuildinfo".to_string(), + file_name: "internal:///.tsbuildinfo".to_string(), }, ); assert!(actual); @@ -1146,9 +1146,11 @@ mod tests { Some("some content".to_string()), ) .await; - let actual = - op_load::call(&mut state, json!({ "specifier": "deno:///.tsbuildinfo"})) - .expect("should have invoked op"); + let actual = op_load::call( + &mut state, + json!({ "specifier": "internal:///.tsbuildinfo"}), + ) + .expect("should have invoked op"); assert_eq!( actual, json!({ @@ -1217,7 +1219,7 @@ mod tests { .expect("should have not errored"); assert_eq!( actual, - vec![("deno:///missing_dependency.d.ts".into(), ".d.ts".into())] + vec![("internal:///missing_dependency.d.ts".into(), ".d.ts".into())] ); } diff --git a/core/error.rs b/core/error.rs index 79b37d5290..4b560fb5b2 100644 --- a/core/error.rs +++ b/core/error.rs @@ -272,7 +272,7 @@ impl JsError { if let (Some(file_name), Some(line_number)) = (&frame.file_name, frame.line_number) { - if !file_name.trim_start_matches('[').starts_with("deno:") { + if !file_name.trim_start_matches('[').starts_with("internal:") { source_line = get_source_line( file_name, line_number, @@ -424,7 +424,7 @@ impl JsError { if let (Some(file_name), Some(line_number)) = (&frame.file_name, frame.line_number) { - if !file_name.trim_start_matches('[').starts_with("deno:") { + if !file_name.trim_start_matches('[').starts_with("internal:") { source_line = get_source_line( file_name, line_number, @@ -438,7 +438,7 @@ impl JsError { } } else if let Some(frame) = frames.first() { if let Some(file_name) = &frame.file_name { - if !file_name.trim_start_matches('[').starts_with("deno:") { + if !file_name.trim_start_matches('[').starts_with("internal:") { source_line = msg .get_source_line(scope) .map(|v| v.to_rust_string_lossy(scope)); diff --git a/core/extensions.rs b/core/extensions.rs index 2cb16b1256..129e7b62a8 100644 --- a/core/extensions.rs +++ b/core/extensions.rs @@ -216,7 +216,7 @@ impl ExtensionBuilder { /// Example: /// ```ignore /// include_js_files!( -/// prefix "deno:extensions/hello", +/// prefix "internal:extensions/hello", /// "01_hello.js", /// "02_goodbye.js", /// ) diff --git a/core/lib.rs b/core/lib.rs index 2333ff75f0..461b4fd205 100644 --- a/core/lib.rs +++ b/core/lib.rs @@ -134,12 +134,12 @@ pub mod _ops { /// A helper macro that will return a call site in Rust code. Should be /// used when executing internal one-line scripts for JsRuntime lifecycle. /// -/// Returns a string in form of: "`[deno:::]`" +/// Returns a string in form of: "`[internal:::]`" #[macro_export] macro_rules! located_script_name { () => { format!( - "[deno:{}:{}:{}]", + "[internal:{}:{}:{}]", std::file!(), std::line!(), std::column!() diff --git a/core/ops_builtin.rs b/core/ops_builtin.rs index 184e942b77..87504f41d2 100644 --- a/core/ops_builtin.rs +++ b/core/ops_builtin.rs @@ -21,7 +21,7 @@ use std::rc::Rc; pub(crate) fn init_builtins() -> Extension { Extension::builder("deno_builtins") .js(include_js_files!( - prefix "deno:core", + prefix "internal:core", "00_primordials.js", "01_core.js", "02_error.js", diff --git a/core/runtime.rs b/core/runtime.rs index 29a6ca450b..903bbfbc4d 100644 --- a/core/runtime.rs +++ b/core/runtime.rs @@ -3887,8 +3887,8 @@ assertEquals(1, notify_return_value); ) .unwrap_err(); let error_string = error.to_string(); - // Test that the script specifier is a URL: `deno:`. - assert!(error_string.contains("deno:core/01_core.js")); + // Test that the script specifier is a URL: `internal:`. + assert!(error_string.contains("internal:core/01_core.js")); } #[test] diff --git a/core/snapshot_util.rs b/core/snapshot_util.rs index b35cabbfa9..8e397e2621 100644 --- a/core/snapshot_util.rs +++ b/core/snapshot_util.rs @@ -39,7 +39,7 @@ pub fn create_snapshot(create_snapshot_options: CreateSnapshotOptions) { let display_path_str = display_path.display().to_string(); js_runtime .execute_script( - &("deno:".to_string() + &display_path_str.replace('\\', "/")), + &("internal:".to_string() + &display_path_str.replace('\\', "/")), &std::fs::read_to_string(&file).unwrap(), ) .unwrap(); diff --git a/ext/broadcast_channel/lib.rs b/ext/broadcast_channel/lib.rs index de9bef8813..674d2414dd 100644 --- a/ext/broadcast_channel/lib.rs +++ b/ext/broadcast_channel/lib.rs @@ -113,7 +113,7 @@ pub fn init( Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web"]) .js(include_js_files!( - prefix "deno:ext/broadcast_channel", + prefix "internal:ext/broadcast_channel", "01_broadcast_channel.js", )) .ops(vec![ diff --git a/ext/cache/lib.rs b/ext/cache/lib.rs index 8aab33268a..8884071534 100644 --- a/ext/cache/lib.rs +++ b/ext/cache/lib.rs @@ -28,7 +28,7 @@ pub fn init( Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web", "deno_url", "deno_fetch"]) .js(include_js_files!( - prefix "deno:ext/cache", + prefix "internal:ext/cache", "01_cache.js", )) .ops(vec![ diff --git a/ext/console/lib.rs b/ext/console/lib.rs index d8fdb38f35..4b3b450299 100644 --- a/ext/console/lib.rs +++ b/ext/console/lib.rs @@ -7,7 +7,7 @@ use std::path::PathBuf; pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .js(include_js_files!( - prefix "deno:ext/console", + prefix "internal:ext/console", "01_colors.js", "02_console.js", )) diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs index 0ee2faecc8..906e7d06f7 100644 --- a/ext/crypto/lib.rs +++ b/ext/crypto/lib.rs @@ -76,7 +76,7 @@ pub fn init(maybe_seed: Option) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web"]) .js(include_js_files!( - prefix "deno:ext/crypto", + prefix "internal:ext/crypto", "00_crypto.js", "01_webidl.js", )) diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs index 7f0a5e37e8..78a42cd848 100644 --- a/ext/fetch/lib.rs +++ b/ext/fetch/lib.rs @@ -98,7 +98,7 @@ where Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web", "deno_url", "deno_console"]) .js(include_js_files!( - prefix "deno:ext/fetch", + prefix "internal:ext/fetch", "01_fetch_util.js", "20_headers.js", "21_formdata.js", diff --git a/ext/ffi/lib.rs b/ext/ffi/lib.rs index d97bb16b4f..88e7884575 100644 --- a/ext/ffi/lib.rs +++ b/ext/ffi/lib.rs @@ -85,7 +85,7 @@ pub(crate) struct FfiState { pub fn init(unstable: bool) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .js(include_js_files!( - prefix "deno:ext/ffi", + prefix "internal:ext/ffi", "00_ffi.js", )) .ops(vec![ diff --git a/ext/flash/lib.rs b/ext/flash/lib.rs index 273aff02d3..d31e78caae 100644 --- a/ext/flash/lib.rs +++ b/ext/flash/lib.rs @@ -1515,7 +1515,7 @@ pub fn init(unstable: bool) -> Extension { "deno_http", ]) .js(deno_core::include_js_files!( - prefix "deno:ext/flash", + prefix "internal:ext/flash", "01_http.js", )) .ops(vec![ diff --git a/ext/http/lib.rs b/ext/http/lib.rs index d6450bb69a..0e3ebf766d 100644 --- a/ext/http/lib.rs +++ b/ext/http/lib.rs @@ -81,7 +81,7 @@ pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_web", "deno_net", "deno_fetch", "deno_websocket"]) .js(include_js_files!( - prefix "deno:ext/http", + prefix "internal:ext/http", "01_http.js", )) .ops(vec![ diff --git a/ext/net/lib.rs b/ext/net/lib.rs index ad5b97a7a4..932f8c8c5c 100644 --- a/ext/net/lib.rs +++ b/ext/net/lib.rs @@ -87,7 +87,7 @@ pub fn init( Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_web"]) .js(include_js_files!( - prefix "deno:ext/net", + prefix "internal:ext/net", "01_net.js", "02_tls.js", )) diff --git a/ext/node/lib.rs b/ext/node/lib.rs index 3c0e323086..ad8619889d 100644 --- a/ext/node/lib.rs +++ b/ext/node/lib.rs @@ -86,7 +86,7 @@ pub fn init( ) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .js(include_js_files!( - prefix "deno:ext/node", + prefix "internal:ext/node", "01_node.js", "02_require.js", )) diff --git a/ext/url/lib.rs b/ext/url/lib.rs index 6990017f56..064590f290 100644 --- a/ext/url/lib.rs +++ b/ext/url/lib.rs @@ -21,7 +21,7 @@ pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl"]) .js(include_js_files!( - prefix "deno:ext/url", + prefix "internal:ext/url", "00_url.js", "01_urlpattern.js", )) diff --git a/ext/web/02_event.js b/ext/web/02_event.js index dac126280f..c99eb8f6ed 100644 --- a/ext/web/02_event.js +++ b/ext/web/02_event.js @@ -1462,7 +1462,7 @@ const frame = frames[i]; if ( typeof frame.fileName == "string" && - !StringPrototypeStartsWith(frame.fileName, "deno:") + !StringPrototypeStartsWith(frame.fileName, "internal:") ) { filename = frame.fileName; lineno = frame.lineNumber; diff --git a/ext/web/lib.rs b/ext/web/lib.rs index ac3fe59fee..c677bb8e91 100644 --- a/ext/web/lib.rs +++ b/ext/web/lib.rs @@ -65,7 +65,7 @@ pub fn init( Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_console", "deno_url"]) .js(include_js_files!( - prefix "deno:ext/web", + prefix "internal:ext/web", "00_infra.js", "01_dom_exception.js", "01_mimesniff.js", diff --git a/ext/webgpu/src/lib.rs b/ext/webgpu/src/lib.rs index d4fd5660ab..8e4077e7f5 100644 --- a/ext/webgpu/src/lib.rs +++ b/ext/webgpu/src/lib.rs @@ -120,7 +120,7 @@ pub fn init(unstable: bool) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl", "deno_web"]) .js(include_js_files!( - prefix "deno:ext/webgpu", + prefix "internal:ext/webgpu", "01_webgpu.js", "02_idl_types.js", )) diff --git a/ext/webgpu/src/surface.rs b/ext/webgpu/src/surface.rs index 1adebb53a4..2ce9cf4487 100644 --- a/ext/webgpu/src/surface.rs +++ b/ext/webgpu/src/surface.rs @@ -16,7 +16,7 @@ pub fn init_surface(unstable: bool) -> Extension { Extension::builder("deno_webgpu_surface") .dependencies(vec!["deno_webidl", "deno_web", "deno_webgpu"]) .js(include_js_files!( - prefix "deno:deno_webgpu", + prefix "internal:deno_webgpu", "03_surface.js", "04_surface_idl_types.js", )) diff --git a/ext/webidl/lib.rs b/ext/webidl/lib.rs index 7962165c67..ae25f04c75 100644 --- a/ext/webidl/lib.rs +++ b/ext/webidl/lib.rs @@ -7,7 +7,7 @@ use deno_core::Extension; pub fn init() -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .js(include_js_files!( - prefix "deno:ext/webidl", + prefix "internal:ext/webidl", "00_webidl.js", )) .build() diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index baf5c396cc..82a2c5918a 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -505,7 +505,7 @@ pub fn init( Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_url", "deno_webidl"]) .js(include_js_files!( - prefix "deno:ext/websocket", + prefix "internal:ext/websocket", "01_websocket.js", "02_websocketstream.js", )) diff --git a/ext/webstorage/lib.rs b/ext/webstorage/lib.rs index 53175f1966..29deaee844 100644 --- a/ext/webstorage/lib.rs +++ b/ext/webstorage/lib.rs @@ -25,7 +25,7 @@ pub fn init(origin_storage_dir: Option) -> Extension { Extension::builder(env!("CARGO_PKG_NAME")) .dependencies(vec!["deno_webidl"]) .js(include_js_files!( - prefix "deno:ext/webstorage", + prefix "internal:ext/webstorage", "01_webstorage.js", )) .ops(vec![ diff --git a/runtime/fmt_errors.rs b/runtime/fmt_errors.rs index 62764965d1..398b7c58a5 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("deno:")); + .map_or(false, |f| f.starts_with("internal:")); 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("deno:")); + .map_or(false, |f| f.starts_with("internal:")); let is_method_call = !(frame.is_top_level.unwrap_or_default() || frame.is_constructor); let mut result = String::new(); diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 079e772b65..d95b284101 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -98,7 +98,7 @@ impl Serialize for WorkerControlEvent { let value = match error.downcast_ref::() { Some(js_error) => { let frame = js_error.frames.iter().find(|f| match &f.file_name { - Some(s) => !s.trim_start_matches('[').starts_with("deno:"), + Some(s) => !s.trim_start_matches('[').starts_with("internal:"), None => false, }); json!({ diff --git a/tools/wgpu_sync.js b/tools/wgpu_sync.js index 6c6130d39f..6edc4c92fc 100755 --- a/tools/wgpu_sync.js +++ b/tools/wgpu_sync.js @@ -85,7 +85,10 @@ async function patchSrcLib() { await patchFile( join(TARGET_DIR, "src", "lib.rs"), (data) => - data.replace(`prefix "deno:deno_webgpu",`, `prefix "deno:ext/webgpu",`), + data.replace( + `prefix "internal:deno_webgpu",`, + `prefix "internal:ext/webgpu",`, + ), ); }