summaryrefslogtreecommitdiff
path: root/cli/tools/info.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-07-03 20:54:33 -0400
committerGitHub <noreply@github.com>2024-07-04 00:54:33 +0000
commit147411e64b22fe74cb258125acab83f9182c9f81 (patch)
treea1f63dcbf0404c20534986b10f02b649df5a3ad5 /cli/tools/info.rs
parentdd6d19e12051fac2ea5639f621501f4710a1b8e1 (diff)
feat: npm workspace and better Deno workspace support (#24334)
Adds much better support for the unstable Deno workspaces as well as support for npm workspaces. npm workspaces is still lacking in that we only install packages into the root node_modules folder. We'll make it smarter over time in order for it to figure out when to add node_modules folders within packages. This includes a breaking change in config file resolution where we stop searching for config files on the first found package.json unless it's in a workspace. For the previous behaviour, the root deno.json needs to be updated to be a workspace by adding `"workspace": ["./path-to-pkg-json-folder-goes-here"]`. See details in https://github.com/denoland/deno_config/pull/66 Closes #24340 Closes #24159 Closes #24161 Closes #22020 Closes #18546 Closes #16106 Closes #24160
Diffstat (limited to 'cli/tools/info.rs')
-rw-r--r--cli/tools/info.rs23
1 files changed, 12 insertions, 11 deletions
diff --git a/cli/tools/info.rs b/cli/tools/info.rs
index 76951b13d..18a4bed57 100644
--- a/cli/tools/info.rs
+++ b/cli/tools/info.rs
@@ -42,19 +42,20 @@ pub async fn info(flags: Flags, info_flags: InfoFlags) -> Result<(), AnyError> {
let module_graph_creator = factory.module_graph_creator().await?;
let npm_resolver = factory.npm_resolver().await?;
let maybe_lockfile = factory.maybe_lockfile();
- let maybe_imports_map = factory.maybe_import_map().await?;
-
- let maybe_import_specifier = if let Some(imports_map) = maybe_imports_map {
- if let Ok(imports_specifier) =
- imports_map.resolve(&specifier, imports_map.base_url())
- {
- Some(imports_specifier)
+ let resolver = factory.workspace_resolver().await?;
+
+ let maybe_import_specifier =
+ if let Some(import_map) = resolver.maybe_import_map() {
+ if let Ok(imports_specifier) =
+ import_map.resolve(&specifier, import_map.base_url())
+ {
+ Some(imports_specifier)
+ } else {
+ None
+ }
} else {
None
- }
- } else {
- None
- };
+ };
let specifier = match maybe_import_specifier {
Some(specifier) => specifier,