foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-11 00:21:05 -05:00
Code Issues Packages 1 Wiki Activity

fix(npm): canonicalize search directory when looking for package.json (#18981)

Browse source 
Co-authored-by: David Sherret <dsherret@gmail.com>
This commit is contained in:
Bartek Iwańczuk 2023-05-04 02:48:23 +02:00 committed by GitHub
parent 7a8bb3b611
commit b8d0e616ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/node/resolution.rs
View file

@ -1078,14 +1078,17 @@ impl NodeResolver {
url: &ModuleSpecifier,
) -> Result<PathBuf, AnyError> {
let file_path = url.to_file_path().unwrap();
let mut current_dir = file_path.parent().unwrap();
let current_dir = deno_core::strip_unc_prefix(
self.fs.canonicalize(file_path.parent().unwrap())?,
);
let mut current_dir = current_dir.as_path();
let package_json_path = current_dir.join("package.json");
if self.fs.exists(&package_json_path) {
return Ok(package_json_path);
}
let root_pkg_folder = self
.npm_resolver
.resolve_package_folder_from_path(&url.to_file_path().unwrap())?;
.resolve_package_folder_from_path(current_dir)?;
while current_dir.starts_with(&root_pkg_folder) {
current_dir = current_dir.parent().unwrap();
let package_json_path = current_dir.join("package.json");