summaryrefslogtreecommitdiff
path: root/cli/tools/vendor/build.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-02-09 22:00:23 -0500
committerGitHub <noreply@github.com>2023-02-09 22:00:23 -0500
commitb3e88e0681248631b4bf8e4d9cd2e4d2c651f333 (patch)
treecd526bb63ef712e21aef24ff77703727791f48d5 /cli/tools/vendor/build.rs
parent8da235adced567839912344ba092fb445683485a (diff)
refactor: deno_graph 0.43 upgrade (#17692)
Diffstat (limited to 'cli/tools/vendor/build.rs')
-rw-r--r--cli/tools/vendor/build.rs29
1 files changed, 20 insertions, 9 deletions
diff --git a/cli/tools/vendor/build.rs b/cli/tools/vendor/build.rs
index f418670b3..f3cc01444 100644
--- a/cli/tools/vendor/build.rs
+++ b/cli/tools/vendor/build.rs
@@ -18,6 +18,7 @@ use import_map::SpecifierMap;
use crate::args::Lockfile;
use crate::cache::ParsedSourceCache;
+use crate::graph_util;
use crate::graph_util::graph_lock_or_exit;
use super::analyze::has_default_export;
@@ -72,18 +73,22 @@ pub fn build(
validate_original_import_map(original_im, &output_dir_specifier)?;
}
- // build the graph
+ // check the lockfile
if let Some(lockfile) = maybe_lockfile {
graph_lock_or_exit(&graph, &mut lockfile.lock());
}
- let mut graph_errors = graph.errors().peekable();
- if graph_errors.peek().is_some() {
- for err in graph_errors {
- log::error!("{}", err);
- }
- bail!("failed vendoring");
- }
+ // surface any errors
+ graph_util::graph_valid(
+ &graph,
+ &graph.roots,
+ deno_graph::WalkOptions {
+ // surface all errors
+ check_js: true,
+ follow_dynamic: true,
+ follow_type_only: true,
+ },
+ )?;
// figure out how to map remote modules to local
let all_modules = graph.modules().collect::<Vec<_>>();
@@ -1119,7 +1124,13 @@ mod test {
.err()
.unwrap();
- assert_eq!(err.to_string(), "failed vendoring");
+ assert_eq!(
+ err.to_string(),
+ concat!(
+ "500 Internal Server Error\n",
+ " at https://localhost/mod.ts:1:14"
+ )
+ );
}
fn to_file_vec(items: &[(&str, &str)]) -> Vec<(String, String)> {