From a6c47ee74023f6ef683988cabc8caa95406e3c99 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 5 May 2023 12:44:24 -0400 Subject: refactor(ext/node): combine `deno_node::Fs` with `deno_fs::FileSystem` (#18991) --- cli/standalone/mod.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'cli/standalone/mod.rs') diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 0f65db679..e00ab8ab2 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -31,7 +31,6 @@ use deno_core::ModuleType; use deno_core::ResolutionKind; use deno_graph::source::Resolver; use deno_runtime::deno_fs; -use deno_runtime::deno_node; use deno_runtime::deno_node::NodeResolver; use deno_runtime::deno_tls::rustls::RootCertStore; use deno_runtime::deno_tls::RootCertStoreProvider; @@ -208,11 +207,11 @@ pub async fn run( http_client.clone(), progress_bar.clone(), )); - let node_fs = Arc::new(deno_node::RealFs); + let fs = Arc::new(deno_fs::RealFs); let npm_resolution = Arc::new(NpmResolution::from_serialized(npm_api.clone(), None, None)); let npm_fs_resolver = create_npm_fs_resolver( - node_fs.clone(), + fs.clone(), npm_cache, &progress_bar, npm_registry_url, @@ -225,7 +224,7 @@ pub async fn run( None, )); let node_resolver = - Arc::new(NodeResolver::new(node_fs.clone(), npm_resolver.clone())); + Arc::new(NodeResolver::new(fs.clone(), npm_resolver.clone())); let module_loader_factory = StandaloneModuleLoaderFactory { loader: EmbeddedModuleLoader { eszip: Arc::new(eszip), @@ -254,8 +253,7 @@ pub async fn run( BlobStore::default(), Box::new(module_loader_factory), root_cert_store_provider, - Arc::new(deno_fs::RealFs), - node_fs, + fs, None, CliMainWorkerOptions { argv: metadata.argv, -- cgit v1.2.3