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/mod.rs | |
parent | d1962e07afb3761c85cde90bda751c23c144741f (diff) |
fix(npm): improve package.json exports support for types (#16880)
Diffstat (limited to 'cli/npm/resolvers/mod.rs')
-rw-r--r-- | cli/npm/resolvers/mod.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs index 3cc695523..d30775dd4 100644 --- a/cli/npm/resolvers/mod.rs +++ b/cli/npm/resolvers/mod.rs @@ -11,6 +11,7 @@ use deno_core::error::custom_error; use deno_core::error::AnyError; use deno_core::parking_lot::Mutex; use deno_core::serde_json; +use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::PathClean; use deno_runtime::deno_node::RequireNpmResolver; use global::GlobalNpmPackageResolver; @@ -197,11 +198,11 @@ impl NpmPackageResolver { &self, name: &str, referrer: &ModuleSpecifier, - conditions: &[&str], + mode: NodeResolutionMode, ) -> Result<PathBuf, AnyError> { let path = self .inner - .resolve_package_folder_from_package(name, referrer, conditions)?; + .resolve_package_folder_from_package(name, referrer, mode)?; log::debug!("Resolved {} from {} to {}", name, referrer, path.display()); Ok(path) } @@ -330,10 +331,10 @@ impl RequireNpmResolver for NpmPackageResolver { &self, specifier: &str, referrer: &std::path::Path, - conditions: &[&str], + mode: NodeResolutionMode, ) -> Result<PathBuf, AnyError> { let referrer = path_to_specifier(referrer)?; - self.resolve_package_folder_from_package(specifier, &referrer, conditions) + self.resolve_package_folder_from_package(specifier, &referrer, mode) } fn resolve_package_folder_from_path( |