From 820e93e3e742a22f010f3200312039c50ae0d63a Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 5 Oct 2023 16:18:29 -0400 Subject: 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. --- ext/node/resolution.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 3bc7537ac..22ab47ce6 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -325,15 +325,15 @@ impl NodeResolver { Ok(resolved) } - pub fn resolve_npm_reference( + pub fn resolve_package_subpath_from_deno_module( &self, package_dir: &Path, package_subpath: Option<&str>, + referrer: &ModuleSpecifier, mode: NodeResolutionMode, permissions: &dyn NodePermissions, ) -> Result, AnyError> { let package_json_path = package_dir.join("package.json"); - let referrer = ModuleSpecifier::from_directory_path(package_dir).unwrap(); let package_json = self.load_package_json(permissions, package_json_path.clone())?; let node_module_kind = NodeModuleKind::Esm; @@ -344,7 +344,7 @@ impl NodeResolver { .resolve_package_subpath( &package_json, &package_subpath, - &referrer, + referrer, node_module_kind, DEFAULT_CONDITIONS, mode, -- cgit v1.2.3