diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-09-28 16:43:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 22:43:45 +0200 |
| commit | d43e48c4e96b02289d505cd2558ba85d7d6cb57b (patch) | |
| tree | d69a40b3e948a5c4ea166700610e24e35ecc61c4 /cli/tools | |
| parent | 0bd53fd52d8937afed401fe1c61bb2ba0b23501c (diff) | |
refactor(ext/node): remove dependency on deno_npm and deno_semver (#20718)
This is required from BYONM (bring your own node_modules).
Part of #18967
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/check.rs | 5 | ||||
| -rw-r--r-- | cli/tools/task.rs | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cli/tools/check.rs b/cli/tools/check.rs index 85ce44b95..a61e3cfe1 100644 --- a/cli/tools/check.rs +++ b/cli/tools/check.rs @@ -138,7 +138,10 @@ impl TypeChecker { debug, graph: graph.clone(), hash_data, - maybe_node_resolver: Some(self.node_resolver.clone()), + maybe_npm: Some(tsc::RequestNpmState { + node_resolver: self.node_resolver.clone(), + npm_resolver: self.npm_resolver.clone(), + }), maybe_tsbuildinfo, root_names, check_mode: type_check_mode, diff --git a/cli/tools/task.rs b/cli/tools/task.rs index dcb53e4ec..6a6c23e39 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -268,7 +268,9 @@ fn resolve_npm_commands( let mut result = HashMap::new(); let snapshot = npm_resolver.snapshot(); for id in snapshot.top_level_packages() { - let bin_commands = node_resolver.resolve_binary_commands(&id.nv)?; + let package_folder = npm_resolver.resolve_pkg_folder_from_pkg_id(id)?; + let bin_commands = + node_resolver.resolve_binary_commands(&package_folder)?; for bin_command in bin_commands { result.insert( bin_command.to_string(), |