summaryrefslogtreecommitdiff
path: root/cli/resolver.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/resolver.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/resolver.rs')
-rw-r--r--cli/resolver.rs10
1 files changed, 10 insertions, 0 deletions
diff --git a/cli/resolver.rs b/cli/resolver.rs
index 11b2d874c..aa58549a7 100644
--- a/cli/resolver.rs
+++ b/cli/resolver.rs
@@ -5,15 +5,21 @@ use deno_core::ModuleSpecifier;
use deno_graph::source::Resolver;
use deno_graph::source::DEFAULT_JSX_IMPORT_SOURCE_MODULE;
use import_map::ImportMap;
+use std::collections::HashMap;
use std::sync::Arc;
use crate::args::JsxImportSourceConfig;
+use deno_graph::npm::NpmPackageReq;
/// A resolver that takes care of resolution, taking into account loaded
/// import map, JSX settings.
#[derive(Debug, Clone, Default)]
pub struct CliGraphResolver {
maybe_import_map: Option<Arc<ImportMap>>,
+ // TODO(bartlomieju): actually use in `resolver`, once
+ // deno_graph refactors and upgrades land.
+ #[allow(dead_code)]
+ maybe_package_json_deps: Option<HashMap<String, NpmPackageReq>>,
maybe_default_jsx_import_source: Option<String>,
maybe_jsx_import_source_module: Option<String>,
}
@@ -22,6 +28,7 @@ impl CliGraphResolver {
pub fn new(
maybe_jsx_import_source_config: Option<JsxImportSourceConfig>,
maybe_import_map: Option<Arc<ImportMap>>,
+ maybe_package_json_deps: Option<HashMap<String, NpmPackageReq>>,
) -> Self {
Self {
maybe_import_map,
@@ -30,6 +37,7 @@ impl CliGraphResolver {
.and_then(|c| c.default_specifier.clone()),
maybe_jsx_import_source_module: maybe_jsx_import_source_config
.map(|c| c.module),
+ maybe_package_json_deps,
}
}
@@ -55,6 +63,8 @@ impl Resolver for CliGraphResolver {
specifier: &str,
referrer: &ModuleSpecifier,
) -> Result<ModuleSpecifier, AnyError> {
+ // TODO(bartlomieju): actually use `maybe_package_json_deps` here, once
+ // deno_graph refactors and upgrades land.
if let Some(import_map) = &self.maybe_import_map {
import_map
.resolve(specifier, referrer)