From d1cdf65b106e1bcb3a2b324c013f908c12d6368f Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 6 Jan 2023 12:57:52 -0500 Subject: fix(npm): handle declaration file resolution where packages incorrectly define "types" last in "exports" (#17290) Closes #17279 --- ext/node/resolution.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 95099d14e..7500f0f31 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -445,7 +445,13 @@ fn resolve_package_target( mode, npm_resolver, ) - .map(Some); + .map(|path| { + if mode.is_types() { + path_to_declaration_path(path, referrer_kind) + } else { + Some(path) + } + }); } else if let Some(target_arr) = target.as_array() { if target_arr.is_empty() { return Ok(None); -- cgit v1.2.3