From 4b7c6049ef9d40394eb823859c82cbf8d293430d Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 31 Jan 2024 22:15:22 -0500 Subject: refactor: load bytes in deno_graph (#22212) Upgrades deno_graph to 0.64 where deno_graph is now responsible for turning bytes into a string. This is in preparation for Wasm modules. --- cli/tools/test/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cli/tools/test/mod.rs') diff --git a/cli/tools/test/mod.rs b/cli/tools/test/mod.rs index d1dc76028..7a5d633ec 100644 --- a/cli/tools/test/mod.rs +++ b/cli/tools/test/mod.rs @@ -685,11 +685,9 @@ fn extract_files_from_regex_blocks( .unwrap_or(file_specifier); Some(File { - maybe_types: None, - media_type: file_media_type, - source: file_source.into(), specifier: file_specifier, maybe_headers: None, + source: file_source.into_bytes().into(), }) }) .collect(); @@ -769,7 +767,10 @@ async fn fetch_inline_files( let mut files = Vec::new(); for specifier in specifiers { let fetch_permissions = PermissionsContainer::allow_all(); - let file = file_fetcher.fetch(&specifier, fetch_permissions).await?; + let file = file_fetcher + .fetch(&specifier, fetch_permissions) + .await? + .into_text_decoded()?; let inline_files = if file.media_type == MediaType::Unknown { extract_files_from_fenced_blocks( @@ -1177,9 +1178,8 @@ async fn fetch_specifiers_with_test_mode( .fetch(specifier, PermissionsContainer::allow_all()) .await?; - if file.media_type == MediaType::Unknown - || file.media_type == MediaType::Dts - { + let (media_type, _) = file.resolve_media_type_and_charset(); + if matches!(media_type, MediaType::Unknown | MediaType::Dts) { *mode = TestMode::Documentation } } -- cgit v1.2.3