diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-07-12 12:48:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-12 12:48:53 -0400 |
commit | 8ee14bd56ac350d65256bdb17cc1e7434ff5b27f (patch) | |
tree | 312ae72a8ce8580abed9942c0234aab5a09e3922 /cli/args/mod.rs | |
parent | 8cbf81cf0840aa9c2e7c8e845748b422827c9b88 (diff) |
refactor: move importMap with imports/scopes diagnostic to deno_config (#24553)
Diffstat (limited to 'cli/args/mod.rs')
-rw-r--r-- | cli/args/mod.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 60cc97e2d..a1c8efc31 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -887,7 +887,7 @@ impl CliOptions { }; for diagnostic in workspace.diagnostics() { - log::warn!("{}", colors::yellow(diagnostic)); + log::warn!("{} {}", colors::yellow("Warning"), diagnostic); } let root_folder = workspace.root_folder().1; @@ -1789,12 +1789,6 @@ fn resolve_import_map_specifier( format!("Bad URL (\"{import_map_path}\") for import map.") })?; Ok(Some(specifier)) - } else if let Some(config_file) = &maybe_config_file { - // if the config file is an import map we prefer to use it, over `importMap` field - if config_file.is_an_import_map() && config_file.json.import_map.is_some() { - log::warn!("{} \"importMap\" setting is ignored when \"imports\" or \"scopes\" are specified in the config file.", colors::yellow("Warning")); - } - Ok(None) } else { Ok(None) } |