From 630abb58b08827e63e56f519bf59a84c3283ab23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Wed, 2 Nov 2022 15:47:02 +0100 Subject: refactor: Combine ImportMapResolver and JsxResolver (#16508) These resolvers are used in `deno_graph` APIs. Combining them removes a lot of code and unblocks me on https://github.com/denoland/deno/pull/16157 --- cli/tools/vendor/test.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cli/tools') diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs index 451b4b614..ee779468b 100644 --- a/cli/tools/vendor/test.rs +++ b/cli/tools/vendor/test.rs @@ -21,7 +21,7 @@ use deno_graph::ModuleKind; use import_map::ImportMap; use crate::cache::ParsedSourceCache; -use crate::resolver::ImportMapResolver; +use crate::resolver::CliResolver; use super::build::VendorEnvironment; @@ -265,14 +265,14 @@ async fn build_test_graph( analyzer: &dyn deno_graph::ModuleAnalyzer, ) -> ModuleGraph { let resolver = - original_import_map.map(|m| ImportMapResolver::new(Arc::new(m))); + original_import_map.map(|m| CliResolver::with_import_map(Arc::new(m))); deno_graph::create_graph( roots, &mut loader, deno_graph::GraphOptions { is_dynamic: false, imports: None, - resolver: resolver.as_ref().map(|im| im.as_resolver()), + resolver: resolver.as_ref().map(|r| r.as_graph_resolver()), locker: None, module_analyzer: Some(analyzer), reporter: None, -- cgit v1.2.3