diff --git a/Cargo.lock b/Cargo.lock index 29c34fd..0c5809d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,9 +563,9 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.91.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d54da704eeea3a15a23eb929f93914d833a2a2858c1aaec220097343445ca04" +checksum = "51fed59054a55f3cbd0db096168c58836ca9f94c7b7c1b0730f63064d7dc0f9e" dependencies = [ "async-trait", "capacity_builder", diff --git a/Cargo.toml b/Cargo.toml index 2fcc1ba..bab6120 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT" members = ["lib"] [workspace.dependencies] -deno_graph = { version = "0.91.0", default-features = false } +deno_graph = { version = "0.92.0", default-features = false } deno_ast = { version = "0.47.0", features = ["transpiling"] } import_map = "0.21.0" serde = "1" diff --git a/benches/source_hash_function.rs b/benches/source_hash_function.rs index 96587b7..7bbbe5c 100644 --- a/benches/source_hash_function.rs +++ b/benches/source_hash_function.rs @@ -169,6 +169,7 @@ async fn build_eszip(mb: usize) -> EszipV2 { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, diff --git a/lib/lib.rs b/lib/lib.rs index e266ebe..dfda093 100644 --- a/lib/lib.rs +++ b/lib/lib.rs @@ -284,7 +284,7 @@ pub async fn build_eszip( &loader, &import_map_url, deno_graph::source::LoadOptions { - is_dynamic: false, + in_dynamic_branch: false, was_dynamic_root: false, cache_setting: deno_graph::source::CacheSetting::Use, maybe_checksum: None, @@ -322,13 +322,13 @@ pub async fn build_eszip( graph .build( roots, + Vec::new(), &loader, BuildOptions { resolver: Some(&resolver), module_analyzer: &analyzer, is_dynamic: false, skip_dynamic_deps: false, - imports: Vec::new(), passthrough_jsr_specifiers: false, executor: Default::default(), file_system: &sys_traits::impls::RealSys, @@ -400,7 +400,7 @@ impl Loader for GraphLoader { &JsValue::null(), &JsValue::from(specifier.to_string()), &serde_wasm_bindgen::to_value(&JsLoadOptions { - is_dynamic: options.is_dynamic, + is_dynamic: options.in_dynamic_branch, cache_setting: options.cache_setting.as_js_str(), checksum: options.maybe_checksum.map(|c| c.into_string()), }) diff --git a/src/examples/builder.rs b/src/examples/builder.rs index c1a6740..422ffce 100644 --- a/src/examples/builder.rs +++ b/src/examples/builder.rs @@ -31,7 +31,7 @@ async fn main() { &loader, &import_map_url, deno_graph::source::LoadOptions { - is_dynamic: false, + in_dynamic_branch: false, was_dynamic_root: false, cache_setting: CacheSetting::Use, maybe_checksum: None, @@ -61,6 +61,7 @@ async fn main() { graph .build( vec![url], + Vec::new(), &loader, BuildOptions { resolver: Some(&Resolver(maybe_import_map)), @@ -157,6 +158,7 @@ impl deno_graph::source::Loader for Loader { Ok(Some(deno_graph::source::LoadResponse::Module { specifier: Url::from_file_path(&path).unwrap(), maybe_headers: None, + mtime: None, content: Arc::from(content), })) } @@ -193,6 +195,7 @@ impl deno_graph::source::Loader for Loader { })?; Ok(Some(deno_graph::source::LoadResponse::Module { specifier: url, + mtime: None, maybe_headers: Some(headers), content: Arc::from(content.as_ref()), })) diff --git a/src/v2.rs b/src/v2.rs index cb5507e..3849195 100644 --- a/src/v2.rs +++ b/src/v2.rs @@ -2077,6 +2077,7 @@ mod tests { Ok(Some(LoadResponse::Module { content: source.into(), maybe_headers: None, + mtime: None, specifier, })) }) @@ -2153,7 +2154,7 @@ mod tests { specifier: &ModuleSpecifier, options: LoadOptions, ) -> deno_graph::source::LoadFuture { - if options.is_dynamic { + if options.in_dynamic_branch { unreachable!(); } let scheme = specifier.scheme(); @@ -2175,6 +2176,7 @@ mod tests { Ok(Some(LoadResponse::Module { content: source.into(), maybe_headers: None, + mtime: None, specifier, })) }) @@ -2186,6 +2188,7 @@ mod tests { graph .build( roots, + Vec::new(), &ExternalLoader, BuildOptions { module_analyzer: &analyzer, @@ -2220,6 +2223,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -2265,6 +2269,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -2309,6 +2314,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -2372,6 +2378,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -2415,6 +2422,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -2469,6 +2477,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -2550,6 +2559,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -2682,7 +2692,7 @@ mod tests { &loader, &Url::parse("file:///import_map.json").unwrap(), LoadOptions { - is_dynamic: false, + in_dynamic_branch: false, was_dynamic_root: false, cache_setting: CacheSetting::Use, maybe_checksum: None, @@ -2708,6 +2718,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { resolver: Some(&ImportMapResolver(import_map.import_map)), @@ -2764,7 +2775,7 @@ mod tests { &loader, &Url::parse("file:///import_map.json").unwrap(), LoadOptions { - is_dynamic: false, + in_dynamic_branch: false, was_dynamic_root: false, cache_setting: CacheSetting::Use, maybe_checksum: None, @@ -2792,6 +2803,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { resolver: Some(&ImportMapResolver(import_map.import_map)), @@ -2835,7 +2847,7 @@ mod tests { &loader, &Url::parse("file:///deno.jsonc").unwrap(), LoadOptions { - is_dynamic: false, + in_dynamic_branch: false, was_dynamic_root: false, cache_setting: CacheSetting::Use, maybe_checksum: None, @@ -2866,6 +2878,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { resolver: Some(&ImportMapResolver(import_map.import_map)), @@ -2917,7 +2930,7 @@ mod tests { &loader, &Url::parse("file:///deno.jsonc").unwrap(), LoadOptions { - is_dynamic: false, + in_dynamic_branch: false, was_dynamic_root: false, cache_setting: CacheSetting::Use, maybe_checksum: None, @@ -2948,6 +2961,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { resolver: Some(&ImportMapResolver(import_map.import_map)), @@ -3016,6 +3030,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -3155,6 +3170,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -3211,6 +3227,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -3338,6 +3355,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -3454,6 +3472,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -3551,6 +3570,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -3620,6 +3640,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer, @@ -3928,6 +3949,7 @@ mod tests { graph .build( roots, + Vec::new(), &loader, BuildOptions { module_analyzer: &analyzer,