diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2022-11-30 18:07:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-30 23:07:32 +0000 |
commit | b1e29d1bd09b08bb6d3b307ae5c5c41e0dd012e3 (patch) | |
tree | f65cfbb09dbaf2e32d86b965ee879f6db640f4b3 /cli/npm/resolvers/global.rs | |
parent | d1962e07afb3761c85cde90bda751c23c144741f (diff) |
fix(npm): improve package.json exports support for types (#16880)
Diffstat (limited to 'cli/npm/resolvers/global.rs')
-rw-r--r-- | cli/npm/resolvers/global.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cli/npm/resolvers/global.rs b/cli/npm/resolvers/global.rs index 46cfec48f..07df80d30 100644 --- a/cli/npm/resolvers/global.rs +++ b/cli/npm/resolvers/global.rs @@ -12,8 +12,8 @@ use deno_core::error::AnyError; use deno_core::futures::future::BoxFuture; use deno_core::futures::FutureExt; use deno_core::url::Url; +use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::PackageJson; -use deno_runtime::deno_node::TYPES_CONDITIONS; use crate::args::Lockfile; use crate::npm::resolution::NpmResolution; @@ -76,7 +76,7 @@ impl InnerNpmPackageResolver for GlobalNpmPackageResolver { &self, name: &str, referrer: &ModuleSpecifier, - conditions: &[&str], + mode: NodeResolutionMode, ) -> Result<PathBuf, AnyError> { let referrer_pkg_id = self .cache @@ -84,7 +84,7 @@ impl InnerNpmPackageResolver for GlobalNpmPackageResolver { let pkg_result = self .resolution .resolve_package_from_package(name, &referrer_pkg_id); - if conditions == TYPES_CONDITIONS && !name.starts_with("@types/") { + if mode.is_types() && !name.starts_with("@types/") { // When doing types resolution, the package must contain a "types" // entry, or else it will then search for a @types package if let Ok(pkg) = pkg_result { |