diff options
Diffstat (limited to 'core/ops_builtin_v8.rs')
-rw-r--r-- | core/ops_builtin_v8.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/ops_builtin_v8.rs b/core/ops_builtin_v8.rs index e00ed5a29..c66e4d3c2 100644 --- a/core/ops_builtin_v8.rs +++ b/core/ops_builtin_v8.rs @@ -6,13 +6,14 @@ use crate::error::range_error; use crate::error::type_error; use crate::error::JsError; use crate::ops_builtin::WasmStreamingResource; -use crate::resolve_url_or_path_deprecated; +use crate::resolve_url_or_path; use crate::serde_v8::from_v8; use crate::source_map::apply_source_map as apply_source_map_; use crate::JsRealm; use crate::JsRuntime; use crate::OpDecl; use crate::ZeroCopyBuf; +use anyhow::Context; use anyhow::Error; use deno_ops::op; use serde::Deserialize; @@ -165,7 +166,12 @@ fn op_eval_context<'a>( let source = v8::Local::<v8::String>::try_from(source.v8_value) .map_err(|_| type_error("Invalid source"))?; let specifier = match specifier { - Some(s) => resolve_url_or_path_deprecated(&s)?.to_string(), + Some(s) => { + // TODO(bartlomieju): ideally we shouldn't need to call `current_dir()` on each + // call - maybe it should be caller's responsibility to pass fully resolved URL? + let cwd = std::env::current_dir().context("Unable to get CWD")?; + resolve_url_or_path(&s, &cwd)?.to_string() + } None => crate::DUMMY_SPECIFIER.to_string(), }; let specifier = v8::String::new(tc_scope, &specifier).unwrap(); |