From 8ee14bd56ac350d65256bdb17cc1e7434ff5b27f Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 12 Jul 2024 12:48:53 -0400 Subject: refactor: move importMap with imports/scopes diagnostic to deno_config (#24553) --- cli/args/mod.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'cli') 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) } -- cgit v1.2.3