diff options
Diffstat (limited to 'cli/resolver.rs')
| -rw-r--r-- | cli/resolver.rs | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/cli/resolver.rs b/cli/resolver.rs index 808ffcb9a..2bd947c34 100644 --- a/cli/resolver.rs +++ b/cli/resolver.rs @@ -253,22 +253,23 @@ impl Resolver for CliGraphResolver { } let referrer = &referrer_range.specifier; - let result = match self + let result = self .mapped_specifier_resolver - .resolve(specifier, referrer)? - { - MappedResolution::ImportMap(specifier) => Ok(specifier), - MappedResolution::PackageJson(specifier) => { - // found a specifier in the package.json, so mark that - // we need to do an "npm install" later - self.found_package_json_dep_flag.raise(); - Ok(specifier) - } - MappedResolution::None => { - deno_graph::resolve_import(specifier, &referrer_range.specifier) - .map_err(|err| err.into()) - } - }; + .resolve(specifier, referrer) + .map_err(|err| err.into()) + .and_then(|resolution| match resolution { + MappedResolution::ImportMap(specifier) => Ok(specifier), + MappedResolution::PackageJson(specifier) => { + // found a specifier in the package.json, so mark that + // we need to do an "npm install" later + self.found_package_json_dep_flag.raise(); + Ok(specifier) + } + MappedResolution::None => { + deno_graph::resolve_import(specifier, &referrer_range.specifier) + .map_err(|err| err.into()) + } + }); // do sloppy imports resolution if enabled let result = |