diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/node/lib.rs | 2 | ||||
-rw-r--r-- | ext/node/resolution.rs | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/node/lib.rs b/ext/node/lib.rs index c7ca2ca72..d3e0d07db 100644 --- a/ext/node/lib.rs +++ b/ext/node/lib.rs @@ -87,7 +87,7 @@ pub trait NpmResolver: std::fmt::Debug + MaybeSend + MaybeSync { /// Resolves the npm package folder path from the specified path. fn resolve_package_folder_from_path( &self, - path: &Path, + specifier: &ModuleSpecifier, ) -> Result<Option<PathBuf>, AnyError>; /// Resolves an npm package folder path from a Deno module. diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 7a88356d8..dc247ddce 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -1133,7 +1133,7 @@ impl NodeResolver { ) -> Result<Option<PackageJson>, AnyError> { let Some(root_folder) = self .npm_resolver - .resolve_package_folder_from_path(&referrer.to_file_path().unwrap())? + .resolve_package_folder_from_path(referrer)? else { return Ok(None); }; @@ -1170,9 +1170,10 @@ impl NodeResolver { if self.fs.exists_sync(&package_json_path) { return Ok(Some(package_json_path)); } - let Some(root_pkg_folder) = self - .npm_resolver - .resolve_package_folder_from_path(current_dir)? + let Some(root_pkg_folder) = + self.npm_resolver.resolve_package_folder_from_path( + &ModuleSpecifier::from_directory_path(current_dir).unwrap(), + )? else { return Ok(None); }; |