From 4a33c349afd4b2728eb8c3c29676651353282d3b Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:38:10 -0400
Subject: refactor: move some CJS and ESM code analysis to ext/node (#18789)

---
 cli/npm/mod.rs           |  2 +-
 cli/npm/resolvers/mod.rs | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'cli/npm')

diff --git a/cli/npm/mod.rs b/cli/npm/mod.rs
index 8a38ee079..8f6ac77bc 100644
--- a/cli/npm/mod.rs
+++ b/cli/npm/mod.rs
@@ -13,6 +13,6 @@ pub use installer::PackageJsonDepsInstaller;
 pub use registry::CliNpmRegistryApi;
 pub use resolution::NpmResolution;
 pub use resolvers::create_npm_fs_resolver;
+pub use resolvers::CliRequireNpmResolver;
 pub use resolvers::NpmPackageResolver;
 pub use resolvers::NpmProcessState;
-pub use resolvers::RequireNpmPackageResolver;
diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs
index 5d3eb52b0..f693d3d23 100644
--- a/cli/npm/resolvers/mod.rs
+++ b/cli/npm/resolvers/mod.rs
@@ -229,17 +229,15 @@ impl NpmPackageResolver {
     Ok(())
   }
 
-  pub fn as_require_npm_resolver(
-    self: &Arc<Self>,
-  ) -> RequireNpmPackageResolver {
-    RequireNpmPackageResolver(self.clone())
+  pub fn as_require_npm_resolver(self: &Arc<Self>) -> CliRequireNpmResolver {
+    CliRequireNpmResolver(self.clone())
   }
 }
 
 #[derive(Debug)]
-pub struct RequireNpmPackageResolver(Arc<NpmPackageResolver>);
+pub struct CliRequireNpmResolver(Arc<NpmPackageResolver>);
 
-impl RequireNpmResolver for RequireNpmPackageResolver {
+impl RequireNpmResolver for CliRequireNpmResolver {
   fn resolve_package_folder_from_package(
     &self,
     specifier: &str,
-- 
cgit v1.2.3