From 69ab72002550b5797185b7651de28c700b220bb2 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 30 Sep 2024 09:33:32 -0400 Subject: refactor: move ByonmNpmResolver to deno_resolver (#25937) Some more slow progress on moving all the resolution code into deno_resolver. --- resolvers/node/npm.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'resolvers/node/npm.rs') diff --git a/resolvers/node/npm.rs b/resolvers/node/npm.rs index 77df57c48..6b5f21db6 100644 --- a/resolvers/node/npm.rs +++ b/resolvers/node/npm.rs @@ -3,6 +3,8 @@ use std::path::Path; use std::path::PathBuf; +use deno_path_util::url_from_directory_path; +use deno_path_util::url_from_file_path; use url::Url; use crate::errors; @@ -24,7 +26,7 @@ pub trait NpmResolver: std::fmt::Debug + MaybeSend + MaybeSync { fn in_npm_package(&self, specifier: &Url) -> bool; fn in_npm_package_at_dir_path(&self, path: &Path) -> bool { - let specifier = match Url::from_directory_path(path.to_path_buf().clean()) { + let specifier = match url_from_directory_path(&path.to_path_buf().clean()) { Ok(p) => p, Err(_) => return false, }; @@ -32,7 +34,7 @@ pub trait NpmResolver: std::fmt::Debug + MaybeSend + MaybeSync { } fn in_npm_package_at_file_path(&self, path: &Path) -> bool { - let specifier = match Url::from_file_path(path.to_path_buf().clean()) { + let specifier = match url_from_file_path(&path.to_path_buf().clean()) { Ok(p) => p, Err(_) => return false, }; -- cgit v1.2.3