summaryrefslogtreecommitdiff
path: root/cli/npm/registry.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-02-20 19:14:06 +0100
committerGitHub <noreply@github.com>2023-02-20 19:14:06 +0100
commit4d1a14ca7fa9496f36470a7771448a9b006b0204 (patch)
treede226f6368faec98065bf14382f23541484cfe72 /cli/npm/registry.rs
parent88f6fc6a1684326ae1f947ea8ec24ad0bff0f449 (diff)
feat: auto-discover package.json for npm dependencies (#17272)
This commits adds auto-discovery of "package.json" file when running "deno run" and "deno task" subcommands. In case of "deno run" the "package.json" is being looked up starting from the directory of the script that is being run, stopping early if "deno.json(c)" file is found (ie. FS tree won't be traversed "up" from "deno.json"). When "package.json" is discovered the "--node-modules-dir" flag is implied, leading to creation of local "node_modules/" directory - we did that, because most tools relying on "package.json" will expect "node_modules/" directory to be present (eg. Vite). Additionally "dependencies" and "devDependencies" specified in the "package.json" are downloaded on startup. This is a stepping stone to supporting bare specifier imports, but the actual integration will be done in a follow up commit. --------- Co-authored-by: David Sherret <dsherret@gmail.com>
Diffstat (limited to 'cli/npm/registry.rs')
-rw-r--r--cli/npm/registry.rs30
1 files changed, 12 insertions, 18 deletions
diff --git a/cli/npm/registry.rs b/cli/npm/registry.rs
index d267d2224..a758ae7be 100644
--- a/cli/npm/registry.rs
+++ b/cli/npm/registry.rs
@@ -24,6 +24,7 @@ use deno_graph::semver::VersionReq;
use deno_runtime::colors;
use serde::Serialize;
+use crate::args::package_json::parse_dep_entry_name_and_raw_version;
use crate::args::CacheSetting;
use crate::cache::CACHE_PERM;
use crate::http_util::HttpClient;
@@ -113,30 +114,19 @@ impl NpmPackageVersionInfo {
&self,
) -> Result<Vec<NpmDependencyEntry>, AnyError> {
fn parse_dep_entry(
- entry: (&String, &String),
+ (key, value): (&String, &String),
kind: NpmDependencyEntryKind,
) -> Result<NpmDependencyEntry, AnyError> {
- let bare_specifier = entry.0.clone();
let (name, version_req) =
- if let Some(package_and_version) = entry.1.strip_prefix("npm:") {
- if let Some((name, version)) = package_and_version.rsplit_once('@') {
- (name.to_string(), version.to_string())
- } else {
- bail!("could not find @ symbol in npm url '{}'", entry.1);
- }
- } else {
- (entry.0.clone(), entry.1.clone())
- };
+ parse_dep_entry_name_and_raw_version(key, value)?;
let version_req =
- VersionReq::parse_from_npm(&version_req).with_context(|| {
- format!(
- "error parsing version requirement for dependency: {bare_specifier}@{version_req}"
- )
+ VersionReq::parse_from_npm(version_req).with_context(|| {
+ format!("error parsing version requirement for dependency: {key}@{version_req}")
})?;
Ok(NpmDependencyEntry {
kind,
- bare_specifier,
- name,
+ bare_specifier: key.to_string(),
+ name: name.to_string(),
version_req,
peer_dep_version_req: None,
})
@@ -339,7 +329,11 @@ impl RealNpmRegistryApiInner {
.load_package_info_from_registry(name)
.await
.with_context(|| {
- format!("Error getting response at {}", self.get_package_url(name))
+ format!(
+ "Error getting response at {} for package \"{}\"",
+ self.get_package_url(name),
+ name
+ )
})?;
}
let maybe_package_info = maybe_package_info.map(Arc::new);