diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-05-05 12:44:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-05 16:44:24 +0000 |
| commit | a6c47ee74023f6ef683988cabc8caa95406e3c99 (patch) | |
| tree | 74026c558a175b9cf6f881ec7229499878dd6a1a /cli/npm | |
| parent | 5270c43e412cc636cd9923182169d166d181f78a (diff) | |
refactor(ext/node): combine `deno_node::Fs` with `deno_fs::FileSystem` (#18991)
Diffstat (limited to 'cli/npm')
| -rw-r--r-- | cli/npm/resolvers/local.rs | 8 | ||||
| -rw-r--r-- | cli/npm/resolvers/mod.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs index b4cf5af27..038d9eea1 100644 --- a/cli/npm/resolvers/local.rs +++ b/cli/npm/resolvers/local.rs @@ -23,7 +23,7 @@ use deno_npm::resolution::NpmResolutionSnapshot; use deno_npm::NpmPackageCacheFolderId; use deno_npm::NpmPackageId; use deno_runtime::deno_core::futures; -use deno_runtime::deno_node::NodeFs; +use deno_runtime::deno_fs; use deno_runtime::deno_node::NodePermissions; use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::PackageJson; @@ -44,7 +44,7 @@ use super::common::NpmPackageFsResolver; /// and resolves packages from it. #[derive(Debug)] pub struct LocalNpmPackageResolver { - fs: Arc<dyn NodeFs>, + fs: Arc<dyn deno_fs::FileSystem>, cache: Arc<NpmCache>, progress_bar: ProgressBar, resolution: Arc<NpmResolution>, @@ -55,7 +55,7 @@ pub struct LocalNpmPackageResolver { impl LocalNpmPackageResolver { pub fn new( - fs: Arc<dyn NodeFs>, + fs: Arc<dyn deno_fs::FileSystem>, cache: Arc<NpmCache>, progress_bar: ProgressBar, registry_url: Url, @@ -94,7 +94,7 @@ impl LocalNpmPackageResolver { // Canonicalize the path so it's not pointing to the symlinked directory // in `node_modules` directory of the referrer. Some(path) => { - Ok(deno_core::strip_unc_prefix(self.fs.canonicalize(&path)?)) + Ok(deno_core::strip_unc_prefix(self.fs.realpath_sync(&path)?)) } None => bail!("could not find npm package for '{}'", specifier), } diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs index 60402bd27..86d3840f3 100644 --- a/cli/npm/resolvers/mod.rs +++ b/cli/npm/resolvers/mod.rs @@ -18,7 +18,7 @@ use deno_npm::resolution::NpmResolutionSnapshot; use deno_npm::resolution::PackageReqNotFoundError; use deno_npm::resolution::SerializedNpmResolutionSnapshot; use deno_npm::NpmPackageId; -use deno_runtime::deno_node; +use deno_runtime::deno_fs; use deno_runtime::deno_node::NodePermissions; use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::NpmResolver; @@ -270,7 +270,7 @@ impl NpmResolver for CliNpmResolver { } pub fn create_npm_fs_resolver( - fs: Arc<dyn deno_node::NodeFs>, + fs: Arc<dyn deno_fs::FileSystem>, cache: Arc<NpmCache>, progress_bar: &ProgressBar, registry_url: Url, |