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 /ext/node/lib.rs | |
| parent | d1962e07afb3761c85cde90bda751c23c144741f (diff) | |
fix(npm): improve package.json exports support for types (#16880)
Diffstat (limited to 'ext/node/lib.rs')
| -rw-r--r-- | ext/node/lib.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/node/lib.rs b/ext/node/lib.rs index c365d5d7b..b2443db0b 100644 --- a/ext/node/lib.rs +++ b/ext/node/lib.rs @@ -30,8 +30,8 @@ pub use resolution::package_imports_resolve; pub use resolution::package_resolve; pub use resolution::path_to_declaration_path; pub use resolution::NodeModuleKind; +pub use resolution::NodeResolutionMode; pub use resolution::DEFAULT_CONDITIONS; -pub use resolution::TYPES_CONDITIONS; use std::cell::RefCell; pub trait NodePermissions { @@ -43,7 +43,7 @@ pub trait RequireNpmResolver { &self, specifier: &str, referrer: &Path, - conditions: &[&str], + mode: NodeResolutionMode, ) -> Result<PathBuf, AnyError>; fn resolve_package_folder_from_path( @@ -292,7 +292,7 @@ fn op_require_resolve_deno_dir( .resolve_package_folder_from_package( &request, &PathBuf::from(parent_filename), - DEFAULT_CONDITIONS, + NodeResolutionMode::Execution, ) .ok() .map(|p| p.to_string_lossy().to_string()) @@ -506,6 +506,7 @@ fn op_require_try_self( &referrer, NodeModuleKind::Cjs, resolution::REQUIRE_CONDITIONS, + NodeResolutionMode::Execution, &*resolver, ) .map(|r| Some(r.to_string_lossy().to_string())) @@ -568,6 +569,7 @@ fn op_require_resolve_exports( &referrer, NodeModuleKind::Cjs, resolution::REQUIRE_CONDITIONS, + NodeResolutionMode::Execution, &*resolver, ) .map(|r| Some(r.to_string_lossy().to_string())) @@ -627,6 +629,7 @@ where &referrer, NodeModuleKind::Cjs, resolution::REQUIRE_CONDITIONS, + NodeResolutionMode::Execution, &*resolver, ) .map(|r| Some(Url::from_file_path(r).unwrap().to_string())); |