diff --git a/Cargo.lock b/Cargo.lock index 0792c300..9149be52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -490,7 +490,6 @@ dependencies = [ "env_logger", "file_test_runner", "futures", - "import_map", "indexmap", "log", "monch", @@ -544,9 +543,9 @@ dependencies = [ [[package]] name = "deno_path_util" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe02936964b2910719bd488841f6e884349360113c7abf6f4c6b28ca9cd7a19" +checksum = "e87fa9392a9fe265bbc32c90aca28c3b4b02c12b22892bb3c633938e6dfaa342" dependencies = [ "deno_error", "percent-encoding", @@ -1169,23 +1168,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" -[[package]] -name = "import_map" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83a4958a41489355816028239fee373797435384d162f4908e7980c83c3bb1b" -dependencies = [ - "boxed_error", - "deno_error", - "indexmap", - "log", - "percent-encoding", - "serde", - "serde_json", - "thiserror", - "url", -] - [[package]] name = "indexmap" version = "2.11.0" diff --git a/Cargo.toml b/Cargo.toml index d4434ca1..b5921725 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = ["lib"] [workspace.dependencies] deno_unsync = { version = "0.4.4", default-features = false } thiserror = "2" -deno_error = "0.7.0" +deno_error = { version = "0.7.0", features = ["serde", "serde_json"] } sys_traits = "0.1.16" [lib] @@ -55,10 +55,9 @@ deno_media_type = { version = "0.2.9", features = [ "module_specifier", ] } deno_unsync.workspace = true -deno_path_util = "0.6.0" +deno_path_util = "0.6.2" deno_semver = "0.9.0" futures = "0.3.26" -import_map = "0.24.0" indexmap = { version = "2", features = ["serde"] } log = "0.4.20" monch = "0.5.0" diff --git a/src/module_specifier.rs b/src/module_specifier.rs index c61d277e..a81005b8 100644 --- a/src/module_specifier.rs +++ b/src/module_specifier.rs @@ -2,8 +2,8 @@ pub type ModuleSpecifier = url::Url; -pub use import_map::specifier::SpecifierError; -pub use import_map::specifier::resolve_import; +pub use deno_path_util::SpecifierError; +pub use deno_path_util::resolve_import; pub fn is_fs_root_specifier(url: &ModuleSpecifier) -> bool { if url.scheme() != "file" { diff --git a/src/source/mod.rs b/src/source/mod.rs index 6a6980fd..6cec93f5 100644 --- a/src/source/mod.rs +++ b/src/source/mod.rs @@ -469,9 +469,6 @@ pub enum ResolveError { Specifier(#[from] SpecifierError), #[class(inherit)] #[error(transparent)] - ImportMap(#[from] import_map::ImportMapError), - #[class(inherit)] - #[error(transparent)] Other(#[from] deno_error::JsErrorBox), }