summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/args/mod.rs2
-rw-r--r--cli/lsp/config.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index a7e75745a..be8eccd6c 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -1740,7 +1740,7 @@ fn resolve_node_modules_folder(
return Ok(None);
} else if let Some(state) = &*NPM_PROCESS_STATE {
return Ok(state.local_node_modules_path.as_ref().map(PathBuf::from));
- } else if workspace.package_jsons().next().is_some() {
+ } else if root_folder.pkg_json.is_some() {
let node_modules_dir = resolve_from_root(root_folder, cwd);
if let Ok(deno_dir) = deno_dir_provider.get_or_create() {
// `deno_dir.root` can be symlink in macOS
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs
index 854e55250..d204dce64 100644
--- a/cli/lsp/config.rs
+++ b/cli/lsp/config.rs
@@ -1393,7 +1393,7 @@ impl ConfigData {
.unwrap_or_default();
let byonm = match node_modules_dir {
Some(mode) => mode == NodeModulesDirMode::Manual,
- None => member_dir.workspace.package_jsons().next().is_some(),
+ None => member_dir.workspace.root_pkg_json().is_some(),
};
if byonm {
lsp_log!(" Enabled 'bring your own node_modules'.");