From a6c47ee74023f6ef683988cabc8caa95406e3c99 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 5 May 2023 12:44:24 -0400
Subject: refactor(ext/node): combine `deno_node::Fs` with
 `deno_fs::FileSystem` (#18991)

---
 cli/npm/resolvers/local.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cli/npm/resolvers/local.rs')

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),
     }
-- 
cgit v1.2.3