diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-02-20 19:14:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-20 19:14:06 +0100 |
commit | 4d1a14ca7fa9496f36470a7771448a9b006b0204 (patch) | |
tree | de226f6368faec98065bf14382f23541484cfe72 /cli/proc_state.rs | |
parent | 88f6fc6a1684326ae1f947ea8ec24ad0bff0f449 (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/proc_state.rs')
-rw-r--r-- | cli/proc_state.rs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/cli/proc_state.rs b/cli/proc_state.rs index f40b5d575..b4467b6be 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -216,9 +216,18 @@ impl ProcState { let maybe_inspector_server = cli_options.resolve_inspector_server().map(Arc::new); + let maybe_package_json_deps = cli_options.maybe_package_json_deps()?; + let package_json_reqs = if let Some(deps) = &maybe_package_json_deps { + let mut package_reqs = deps.values().cloned().collect::<Vec<_>>(); + package_reqs.sort(); // deterministic resolution + package_reqs + } else { + Vec::new() + }; let resolver = Arc::new(CliGraphResolver::new( cli_options.to_maybe_jsx_import_source_config(), maybe_import_map.clone(), + maybe_package_json_deps, )); let maybe_file_watcher_reporter = @@ -255,9 +264,11 @@ impl ProcState { cli_options .resolve_local_node_modules_folder() .with_context(|| "Resolving local node_modules folder.")?, + cli_options.get_npm_resolution_snapshot(), lockfile.as_ref().cloned(), ) .await?; + npm_resolver.add_package_reqs(package_json_reqs).await?; let node_analysis_cache = NodeAnalysisCache::new(Some(dir.node_analysis_db_file_path())); @@ -637,6 +648,8 @@ impl ProcState { let cli_resolver = CliGraphResolver::new( self.options.to_maybe_jsx_import_source_config(), self.maybe_import_map.clone(), + // TODO(bartlomieju): this should use dependencies from `package.json`? + None, ); let graph_resolver = cli_resolver.as_graph_resolver(); let analyzer = self.parsed_source_cache.as_analyzer(); |