diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-10-05 16:18:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-05 20:18:29 +0000 |
| commit | 820e93e3e742a22f010f3200312039c50ae0d63a (patch) | |
| tree | cb6c69c2427d7eb88484bafcbc4a61e70522c671 /cli/module_loader.rs | |
| parent | 7a01799f490739612be27725f1584a995f6b1491 (diff) | |
refactor(npm): add referrer when resolving npm package sub path from deno module (#20800)
Adds a `referrer` parameter to this function instead of using a fake
one.
Diffstat (limited to 'cli/module_loader.rs')
| -rw-r--r-- | cli/module_loader.rs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/cli/module_loader.rs b/cli/module_loader.rs index 51b9ea598..9f3a7d236 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -512,6 +512,7 @@ impl ModuleLoader for CliModuleLoader { .resolve_package_sub_path( &package_folder, module.nv_reference.sub_path(), + referrer, permissions, ) .with_context(|| { @@ -726,6 +727,7 @@ impl CliNodeResolver { .resolve_package_sub_path( &package_folder, req_ref.sub_path(), + referrer, permissions, ) .with_context(|| format!("Could not resolve '{}'.", req_ref)) @@ -735,14 +737,18 @@ impl CliNodeResolver { &self, package_folder: &Path, sub_path: Option<&str>, + referrer: &ModuleSpecifier, permissions: &PermissionsContainer, ) -> Result<ModuleSpecifier, AnyError> { - self.handle_node_resolve_result(self.node_resolver.resolve_npm_reference( - package_folder, - sub_path, - NodeResolutionMode::Execution, - permissions, - )) + self.handle_node_resolve_result( + self.node_resolver.resolve_package_subpath_from_deno_module( + package_folder, + sub_path, + referrer, + NodeResolutionMode::Execution, + permissions, + ), + ) } fn handle_node_resolve_result( |