diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-11-14 15:24:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-14 15:24:25 -0500 |
| commit | 617350e79c58b6e01984e3d7c7436d243d0e5cff (patch) | |
| tree | dadb3c7675d1d49952a30c525bbc6ee3086a78e3 /ext | |
| parent | de34c7ed29bcce8b46a65f5effe45090b8493ba5 (diff) | |
refactor(resolver): move more resolution code into deno_resolver (#26873)
Follow-up to cjs refactor.
This moves most of the resolution code into the deno_resolver crate.
Still pending is the npm resolution code.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/node/lib.rs | 4 | ||||
| -rw-r--r-- | ext/node/ops/require.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/node/lib.rs b/ext/node/lib.rs index 702c919f4..84f39552c 100644 --- a/ext/node/lib.rs +++ b/ext/node/lib.rs @@ -15,7 +15,7 @@ use deno_core::url::Url; use deno_core::v8; use deno_core::v8::ExternalReference; use node_resolver::errors::ClosestPkgJsonError; -use node_resolver::NpmResolverRc; +use node_resolver::NpmPackageFolderResolverRc; use once_cell::sync::Lazy; extern crate libz_sys as zlib; @@ -183,7 +183,7 @@ fn op_node_build_os() -> String { pub struct NodeExtInitServices { pub node_require_loader: NodeRequireLoaderRc, pub node_resolver: NodeResolverRc, - pub npm_resolver: NpmResolverRc, + pub npm_resolver: NpmPackageFolderResolverRc, pub pkg_json_resolver: PackageJsonResolverRc, } diff --git a/ext/node/ops/require.rs b/ext/node/ops/require.rs index b7fa8feb2..e381ee91d 100644 --- a/ext/node/ops/require.rs +++ b/ext/node/ops/require.rs @@ -24,7 +24,7 @@ use std::rc::Rc; use crate::NodePermissions; use crate::NodeRequireLoaderRc; use crate::NodeResolverRc; -use crate::NpmResolverRc; +use crate::NpmPackageFolderResolverRc; use crate::PackageJsonResolverRc; #[must_use = "the resolved return value to mitigate time-of-check to time-of-use issues"] @@ -220,7 +220,7 @@ pub fn op_require_resolve_deno_dir( #[string] request: String, #[string] parent_filename: String, ) -> Result<Option<String>, AnyError> { - let resolver = state.borrow::<NpmResolverRc>(); + let resolver = state.borrow::<NpmPackageFolderResolverRc>(); Ok( resolver .resolve_package_folder_from_package( |