From a615eb3b56545960ec9684991442dd34a8b2abfc Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 21 Apr 2023 21:02:46 -0400
Subject: refactor(node): move most of cli/node to ext/node (#18797)

This is just a straight refactor and I didn't do any cleanup in
ext/node. After this PR we can start to clean it up and make things
private that don't need to be public anymore.
---
 cli/graph_util.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'cli/graph_util.rs')

diff --git a/cli/graph_util.rs b/cli/graph_util.rs
index dacd3be17..d5bc6ac0d 100644
--- a/cli/graph_util.rs
+++ b/cli/graph_util.rs
@@ -9,7 +9,7 @@ use crate::cache::ParsedSourceCache;
 use crate::colors;
 use crate::errors::get_error_class_name;
 use crate::file_fetcher::FileFetcher;
-use crate::npm::NpmPackageResolver;
+use crate::npm::CliNpmResolver;
 use crate::resolver::CliGraphResolver;
 use crate::tools::check;
 use crate::tools::check::TypeChecker;
@@ -29,6 +29,7 @@ use deno_graph::ModuleGraph;
 use deno_graph::ModuleGraphError;
 use deno_graph::ResolutionError;
 use deno_graph::SpecifierError;
+use deno_runtime::deno_node;
 use deno_runtime::permissions::PermissionsContainer;
 use import_map::ImportMapError;
 use std::collections::HashMap;
@@ -165,7 +166,7 @@ pub fn graph_lock_or_exit(graph: &ModuleGraph, lockfile: &mut Lockfile) {
 pub struct ModuleGraphBuilder {
   options: Arc<CliOptions>,
   resolver: Arc<CliGraphResolver>,
-  npm_resolver: Arc<NpmPackageResolver>,
+  npm_resolver: Arc<CliNpmResolver>,
   parsed_source_cache: Arc<ParsedSourceCache>,
   lockfile: Option<Arc<Mutex<Lockfile>>>,
   emit_cache: cache::EmitCache,
@@ -178,7 +179,7 @@ impl ModuleGraphBuilder {
   pub fn new(
     options: Arc<CliOptions>,
     resolver: Arc<CliGraphResolver>,
-    npm_resolver: Arc<NpmPackageResolver>,
+    npm_resolver: Arc<CliNpmResolver>,
     parsed_source_cache: Arc<ParsedSourceCache>,
     lockfile: Option<Arc<Mutex<Lockfile>>>,
     emit_cache: cache::EmitCache,
@@ -377,7 +378,7 @@ pub fn get_resolution_error_bare_node_specifier(
   error: &ResolutionError,
 ) -> Option<&str> {
   get_resolution_error_bare_specifier(error).filter(|specifier| {
-    crate::node::resolve_builtin_node_module(specifier).is_ok()
+    deno_node::resolve_builtin_node_module(specifier).is_ok()
   })
 }
 
-- 
cgit v1.2.3