refactor(npm): add CliNodeResolver (#18742)

1 files changed, 9 insertions, 7 deletions

diff --git a/cli/ops/mod.rs b/cli/ops/mod.rs
index 4d5595e09..9adc944ce 100644
--- a/cli/ops/mod.rs
+++ b/cli/ops/mod.rs
@@ -1,6 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use crate::proc_state::ProcState;
+use std::sync::Arc;
+
+use crate::npm::NpmPackageResolver;
 use deno_core::error::AnyError;
 use deno_core::op;
 use deno_core::Extension;
@@ -9,17 +11,17 @@ use deno_core::OpState;
 pub mod bench;
 pub mod testing;
 
-pub fn cli_exts(ps: ProcState) -> Vec<Extension> {
-  vec![deno_cli::init_ops(ps)]
+pub fn cli_exts(npm_resolver: Arc<NpmPackageResolver>) -> Vec<Extension> {
+  vec![deno_cli::init_ops(npm_resolver)]
 }
 
 deno_core::extension!(deno_cli,
   ops = [op_npm_process_state],
   options = {
-    ps: ProcState,
+    npm_resolver: Arc<NpmPackageResolver>,
   },
   state = |state, options| {
-    state.put(options.ps);
+    state.put(options.npm_resolver);
   },
   customizer = |ext: &mut deno_core::ExtensionBuilder| {
     ext.force_op_registration();
@@ -28,6 +30,6 @@ deno_core::extension!(deno_cli,
 
 #[op]
 fn op_npm_process_state(state: &mut OpState) -> Result<String, AnyError> {
-  let proc_state = state.borrow_mut::<ProcState>();
-  Ok(proc_state.npm_resolver.get_npm_process_state())
+  let npm_resolver = state.borrow_mut::<Arc<NpmPackageResolver>>();
+  Ok(npm_resolver.get_npm_process_state())
 }