diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2022-09-12 15:47:54 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-12 15:47:54 -0400 |
commit | 98454c1eb802b91a8c77dd97888a8994c85dfa46 (patch) | |
tree | 851f7590f14a2f54db5ef306e884cc2c64bf6f07 /ext/node/resolution.rs | |
parent | a3a4760831e14307a9499d4e410cf1653b416dc1 (diff) |
fix(npm): support cjs resolution of package subpath with package.json (#15855)
Diffstat (limited to 'ext/node/resolution.rs')
-rw-r--r-- | ext/node/resolution.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index d6734066c..a7428fe03 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -707,12 +707,7 @@ pub fn legacy_main_resolve( package_json: &PackageJson, referrer_kind: NodeModuleKind, ) -> Result<PathBuf, AnyError> { - let maybe_main = - if referrer_kind == NodeModuleKind::Esm && package_json.typ == "module" { - package_json.module.as_ref().or(package_json.main.as_ref()) - } else { - package_json.main.as_ref() - }; + let maybe_main = package_json.main(referrer_kind); let mut guess; if let Some(main) = maybe_main { |