diff options
| author | Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com> | 2024-08-29 15:57:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-29 15:57:43 -0700 |
| commit | 86d5b919d8ef55070e95230c9268f69cf58c25c8 (patch) | |
| tree | 7d005a7116ecb44fc95e64489eac66f786d2ef11 /cli/lsp | |
| parent | 0fb8df6c0ce582c947a8e165c7fb31cd4ec0c3ca (diff) | |
feat(config): Node modules option for 2.0 (#25299)
Diffstat (limited to 'cli/lsp')
| -rw-r--r-- | cli/lsp/config.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index ba5cc3ac4..ec2690506 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -5,6 +5,7 @@ use deno_config::deno_json::DenoJsonCache; use deno_config::deno_json::FmtConfig; use deno_config::deno_json::FmtOptionsConfig; use deno_config::deno_json::LintConfig; +use deno_config::deno_json::NodeModulesMode; use deno_config::deno_json::TestConfig; use deno_config::deno_json::TsConfig; use deno_config::fs::DenoConfigFs; @@ -1390,8 +1391,16 @@ impl ConfigData { let byonm = std::env::var("DENO_UNSTABLE_BYONM").is_ok() || member_dir.workspace.has_unstable("byonm") || (*DENO_FUTURE - && member_dir.workspace.package_jsons().next().is_some() - && member_dir.workspace.node_modules_dir().is_none()); + && matches!( + member_dir.workspace.node_modules_mode().unwrap_or_default(), + Some(NodeModulesMode::LocalManual) + )) + || ( + *DENO_FUTURE + && member_dir.workspace.package_jsons().next().is_some() + && member_dir.workspace.node_modules_dir().is_none() + // TODO(2.0): remove + ); if byonm { lsp_log!(" Enabled 'bring your own node_modules'."); } |