diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/compat.rs | 10 | ||||
| -rw-r--r-- | cli/tests/integration/compat_tests.rs | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cli/compat.rs b/cli/compat.rs index f120ccd04..13be0374d 100644 --- a/cli/compat.rs +++ b/cli/compat.rs @@ -3,7 +3,11 @@ use deno_core::url::Url; use std::collections::HashMap; -static STD_NODE: &str = "https://deno.land/std/node/"; +// TODO(bartlomieju): this needs to be bumped manually for +// each release, a better mechanism is preferable, but it's a quick and dirty +// solution to avoid printing `X-Deno-Warning` headers when the compat layer is +// downloaded +static STD_URL: &str = "https://deno.land/std@0.110.0/"; static GLOBAL_MODULE: &str = "global.ts"; static SUPPORTED_MODULES: &[&str] = &[ @@ -52,7 +56,7 @@ static SUPPORTED_MODULES: &[&str] = &[ ]; lazy_static::lazy_static! { - static ref GLOBAL_URL_STR: String = format!("{}{}", STD_NODE, GLOBAL_MODULE); + static ref GLOBAL_URL_STR: String = format!("{}node/{}", STD_URL, GLOBAL_MODULE); pub(crate) static ref GLOBAL_URL: Url = Url::parse(&GLOBAL_URL_STR).unwrap(); static ref COMPAT_IMPORT_URL: Url = Url::parse("flags:compat").unwrap(); } @@ -71,7 +75,7 @@ pub fn get_mapped_node_builtins() -> HashMap<String, String> { for module in SUPPORTED_MODULES { // TODO(bartlomieju): this is unversioned, and should be fixed to use latest stable? - let module_url = format!("{}{}.ts", STD_NODE, module); + let module_url = format!("{}node/{}.ts", STD_URL, module); mappings.insert(module.to_string(), module_url.clone()); // Support for `node:<module_name>` diff --git a/cli/tests/integration/compat_tests.rs b/cli/tests/integration/compat_tests.rs index 8f512fca3..6b6ab81b5 100644 --- a/cli/tests/integration/compat_tests.rs +++ b/cli/tests/integration/compat_tests.rs @@ -26,7 +26,7 @@ itest!(existing_import_map { #[test] fn globals_in_repl() { - let (out, err) = util::run_and_collect_output_with_args( + let (out, _err) = util::run_and_collect_output_with_args( true, vec!["repl", "--compat", "--unstable", "--quiet"], Some(vec!["global == window"]), @@ -34,5 +34,4 @@ fn globals_in_repl() { false, ); assert!(out.contains("true")); - assert!(err.contains("Implicitly using latest version")); } |