From 3bf147fe287ac779b20d318daba56b336f356adf Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:08:14 -0400
Subject: refactor: decouple node resolution from deno_core (#24724)

---
 ext/node/ops/worker_threads.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ext/node/ops/worker_threads.rs')

diff --git a/ext/node/ops/worker_threads.rs b/ext/node/ops/worker_threads.rs
index 182ba0118..c7ea4c52c 100644
--- a/ext/node/ops/worker_threads.rs
+++ b/ext/node/ops/worker_threads.rs
@@ -6,13 +6,13 @@ use deno_core::op2;
 use deno_core::url::Url;
 use deno_core::OpState;
 use deno_fs::FileSystemRc;
+use node_resolver::NodeResolution;
 use std::path::Path;
 use std::path::PathBuf;
 
-use crate::resolution;
-use crate::resolution::NodeResolverRc;
 use crate::NodePermissions;
-use crate::NpmResolverRc;
+use crate::NodeRequireResolverRc;
+use crate::NodeResolverRc;
 
 fn ensure_read_permission<P>(
   state: &mut OpState,
@@ -21,7 +21,7 @@ fn ensure_read_permission<P>(
 where
   P: NodePermissions + 'static,
 {
-  let resolver = state.borrow::<NpmResolverRc>().clone();
+  let resolver = state.borrow::<NodeRequireResolverRc>().clone();
   let permissions = state.borrow_mut::<P>();
   resolver.ensure_read_permission(permissions, file_path)
 }
@@ -64,9 +64,9 @@ where
   }
   let node_resolver = state.borrow::<NodeResolverRc>();
   match node_resolver.url_to_node_resolution(url)? {
-    resolution::NodeResolution::Esm(u) => Ok(u.to_string()),
-    resolution::NodeResolution::CommonJs(u) => wrap_cjs(u),
-    _ => Err(generic_error("Neither ESM nor CJS")),
+    NodeResolution::Esm(u) => Ok(u.to_string()),
+    NodeResolution::CommonJs(u) => wrap_cjs(u),
+    NodeResolution::BuiltIn(_) => Err(generic_error("Neither ESM nor CJS")),
   }
 }
 
-- 
cgit v1.2.3