diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-02-23 10:58:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 10:58:10 -0500 |
| commit | 344317ec501fa124f0c74b44035fa4516999dce6 (patch) | |
| tree | 3a0e4ca3d83b1a47a0903f08648ef1b896b32195 /cli/npm/resolvers/local.rs | |
| parent | 214bdbbc2b09ab3f56f0ffe1ad5930d48ec0c76f (diff) | |
feat(npm): support bare specifiers from package.json in more subcommands and language server (#17891)
Diffstat (limited to 'cli/npm/resolvers/local.rs')
| -rw-r--r-- | cli/npm/resolvers/local.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs index ba395d1b6..bf5b8529c 100644 --- a/cli/npm/resolvers/local.rs +++ b/cli/npm/resolvers/local.rs @@ -44,7 +44,7 @@ pub struct LocalNpmPackageResolver { resolution: NpmResolution, registry_url: Url, root_node_modules_path: PathBuf, - root_node_modules_specifier: ModuleSpecifier, + root_node_modules_url: Url, } impl LocalNpmPackageResolver { @@ -58,10 +58,8 @@ impl LocalNpmPackageResolver { cache, resolution, registry_url, - root_node_modules_specifier: ModuleSpecifier::from_directory_path( - &node_modules_folder, - ) - .unwrap(), + root_node_modules_url: Url::from_directory_path(&node_modules_folder) + .unwrap(), root_node_modules_path: node_modules_folder, } } @@ -92,8 +90,7 @@ impl LocalNpmPackageResolver { &self, specifier: &ModuleSpecifier, ) -> Option<PathBuf> { - let relative_url = - self.root_node_modules_specifier.make_relative(specifier)?; + let relative_url = self.root_node_modules_url.make_relative(specifier)?; if relative_url.starts_with("../") { return None; } @@ -126,6 +123,10 @@ impl LocalNpmPackageResolver { #[async_trait] impl NpmPackageFsResolver for LocalNpmPackageResolver { + fn root_dir_url(&self) -> &Url { + &self.root_node_modules_url + } + fn resolve_package_folder_from_deno_module( &self, node_id: &NpmPackageId, |