diff options
Diffstat (limited to 'cli/npm/resolvers/local.rs')
| -rw-r--r-- | cli/npm/resolvers/local.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs index 3a9e97433..69f275c70 100644 --- a/cli/npm/resolvers/local.rs +++ b/cli/npm/resolvers/local.rs @@ -19,8 +19,8 @@ use deno_core::futures::future::BoxFuture; use deno_core::futures::FutureExt; use deno_core::url::Url; use deno_runtime::deno_core::futures; +use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::PackageJson; -use deno_runtime::deno_node::TYPES_CONDITIONS; use tokio::task::JoinHandle; use crate::args::Lockfile; @@ -152,7 +152,7 @@ impl InnerNpmPackageResolver for LocalNpmPackageResolver { &self, name: &str, referrer: &ModuleSpecifier, - conditions: &[&str], + mode: NodeResolutionMode, ) -> Result<PathBuf, AnyError> { let local_path = self.resolve_folder_for_specifier(referrer)?; let package_root_path = self.resolve_package_root(&local_path); @@ -162,7 +162,7 @@ impl InnerNpmPackageResolver for LocalNpmPackageResolver { let sub_dir = join_package_name(current_folder, name); if sub_dir.is_dir() { // if doing types resolution, only resolve the package if it specifies a types property - if conditions == TYPES_CONDITIONS && !name.starts_with("@types/") { + if mode.is_types() && !name.starts_with("@types/") { let package_json = PackageJson::load_skip_read_permission( sub_dir.join("package.json"), )?; @@ -175,7 +175,7 @@ impl InnerNpmPackageResolver for LocalNpmPackageResolver { } // if doing type resolution, check for the existance of a @types package - if conditions == TYPES_CONDITIONS && !name.starts_with("@types/") { + if mode.is_types() && !name.starts_with("@types/") { let sub_dir = join_package_name(current_folder, &types_package_name(name)); if sub_dir.is_dir() { |