diff --git a/Cargo.lock b/Cargo.lock index c65d3314db070a..a45108aca5f96e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1106,7 +1106,7 @@ dependencies = [ "glibc_version", "glob", "ignore", - "import_map", + "import_map 0.20.0", "indexmap", "jsonc-parser", "junction", @@ -1271,7 +1271,7 @@ checksum = "3d21c7b688ff6cb411895a93bf1d6734ed654c3a7eb9b502f96098f6659df0c5" dependencies = [ "anyhow", "glob", - "import_map", + "import_map 0.19.0", "indexmap", "jsonc-parser", "log", @@ -1372,9 +1372,9 @@ dependencies = [ [[package]] name = "deno_doc" -version = "0.139.0" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9cd9891748fbd9847c9aeed31635c4c1b5d9a949f6fdd80613b082bdd863518" +checksum = "c78299b18732d827203ab801f14f4d163ba260eb2b01ebc6e807274d09243fa1" dependencies = [ "ammonia", "anyhow", @@ -1385,7 +1385,7 @@ dependencies = [ "futures", "handlebars", "html-escape", - "import_map", + "import_map 0.20.0", "indexmap", "lazy_static", "regex", @@ -1397,9 +1397,9 @@ dependencies = [ [[package]] name = "deno_emit" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bc64f886c76647400ed8f807ba7dba82e0b52e57e5426a83094cfe22ee19c9" +checksum = "b4a9faa31cf536b4390073a3d51ec188f0318851961787456e4d91bf0771b634" dependencies = [ "anyhow", "base64 0.21.7", @@ -1407,7 +1407,7 @@ dependencies = [ "deno_graph", "escape8259", "futures", - "import_map", + "import_map 0.20.0", "parking_lot 0.11.2", "url", ] @@ -1468,9 +1468,9 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.78.1" +version = "0.79.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13080829a06062a14e41e190f64a3407e4a0f63cf7db5dcecbc3cf500445df3" +checksum = "caa95531b3eb65aced626d8dd8117b29b3e57763e0c1ace502101fb56b8a2c31" dependencies = [ "anyhow", "async-trait", @@ -1480,7 +1480,7 @@ dependencies = [ "deno_unsync", "encoding_rs", "futures", - "import_map", + "import_map 0.20.0", "indexmap", "log", "monch", @@ -2547,9 +2547,9 @@ dependencies = [ [[package]] name = "eszip" -version = "0.71.0" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3763e2d3e56ed5f770f9ab133aca20b1e7fa840f2408f79575ad96f942af2e" +checksum = "87821a4dc0e26683d866a1841560b99aa9002a60db8a9eded78efe1853144c43" dependencies = [ "anyhow", "base64 0.21.7", @@ -3487,6 +3487,20 @@ dependencies = [ "url", ] +[[package]] +name = "import_map" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373b8288ad259df0d1314e3e8b2fff0e5e63f22e01bc54ecd2c3c7ad77b9200c" +dependencies = [ + "indexmap", + "log", + "percent-encoding", + "serde", + "serde_json", + "url", +] + [[package]] name = "indexmap" version = "2.2.6" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 67060f5299665a..4a01f2305c1797 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -67,9 +67,9 @@ deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposa deno_cache_dir = { workspace = true } deno_config = "=0.16.4" deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] } -deno_doc = { version = "=0.139.0", features = ["html", "syntect"] } -deno_emit = "=0.42.0" -deno_graph = { version = "=0.78.1", features = ["tokio_executor"] } +deno_doc = { version = "=0.140.0", features = ["html", "syntect"] } +deno_emit = "=0.43.0" +deno_graph = { version = "=0.79.0", features = ["tokio_executor"] } deno_lint = { version = "=0.60.0", features = ["docs"] } deno_lockfile.workspace = true deno_npm = "=0.21.4" @@ -77,7 +77,7 @@ deno_runtime = { workspace = true, features = ["include_js_files_for_snapshottin deno_semver = "=0.5.6" deno_task_shell = "=0.17.0" deno_terminal.workspace = true -eszip = "=0.71.0" +eszip = "=0.72.1" napi_sym.workspace = true async-trait.workspace = true @@ -108,7 +108,7 @@ flate2.workspace = true fs3.workspace = true glob = "0.3.1" ignore = "0.4" -import_map = { version = "=0.19.0", features = ["ext"] } +import_map = { version = "=0.20.0", features = ["ext"] } indexmap.workspace = true jsonc-parser.workspace = true jupyter_runtime = { package = "runtimelib", version = "=0.11.0" } diff --git a/cli/graph_util.rs b/cli/graph_util.rs index 67c1792937701b..14f0aaace6546c 100644 --- a/cli/graph_util.rs +++ b/cli/graph_util.rs @@ -843,7 +843,7 @@ fn get_resolution_error_bare_specifier( error: &ResolutionError, ) -> Option<&str> { if let ResolutionError::InvalidSpecifier { - error: SpecifierError::ImportPrefixMissing(specifier, _), + error: SpecifierError::ImportPrefixMissing { specifier, .. }, .. } = error { @@ -1065,7 +1065,10 @@ mod test { start: Position::zeroed(), end: Position::zeroed(), }, - error: SpecifierError::ImportPrefixMissing(input.to_string(), None), + error: SpecifierError::ImportPrefixMissing { + specifier: input.to_string(), + referrer: None, + }, }; assert_eq!(get_resolution_error_bare_node_specifier(&err), output,); } diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs index f2a22e570afb4a..27983867a60544 100644 --- a/cli/lsp/diagnostics.rs +++ b/cli/lsp/diagnostics.rs @@ -1033,7 +1033,7 @@ impl DenoDiagnostic { "invalid-local-import" } ResolutionError::InvalidSpecifier { error, .. } => match error { - SpecifierError::ImportPrefixMissing(_, _) => { + SpecifierError::ImportPrefixMissing { .. } => { "import-prefix-missing" } SpecifierError::InvalidUrl(_) => "invalid-url", diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index e2a53e4689f614..24ba7c9dbe3735 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -472,7 +472,7 @@ pub async fn run( npm_resolver.clone().into_npm_resolver(), )); let maybe_import_map = metadata.maybe_import_map.map(|(base, source)| { - Arc::new(parse_from_json(&base, &source).unwrap().import_map) + Arc::new(parse_from_json(base, &source).unwrap().import_map) }); let cli_node_resolver = Arc::new(CliNodeResolver::new( Some(cjs_resolutions.clone()), diff --git a/cli/tools/compile.rs b/cli/tools/compile.rs index a29511af41da1c..94bcce7e66e873 100644 --- a/cli/tools/compile.rs +++ b/cli/tools/compile.rs @@ -81,12 +81,13 @@ pub async fn compile( ts_config_for_emit.ts_config, )?; let parser = parsed_source_cache.as_capturing_parser(); - let eszip = eszip::EszipV2::from_graph( + let eszip = eszip::EszipV2::from_graph(eszip::FromGraphOptions { graph, - &parser, + parser, transpile_options, emit_options, - )?; + relative_file_base: None, + })?; log::info!( "{} {} to {}",