summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/Cargo.toml2
-rw-r--r--cli/args/flags.rs63
-rw-r--r--cli/args/mod.rs77
-rw-r--r--cli/graph_util.rs7
-rw-r--r--cli/lsp/config.rs13
-rw-r--r--cli/tools/run/mod.rs7
-rw-r--r--cli/tools/vendor/mod.rs5
7 files changed, 136 insertions, 38 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index c7462ba00..6617cc90b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -65,7 +65,7 @@ winres.workspace = true
[dependencies]
deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
deno_cache_dir = { workspace = true }
-deno_config = { version = "=0.30.1", features = ["workspace", "sync"] }
+deno_config = { version = "=0.31.0", features = ["workspace", "sync"] }
deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_doc = { version = "0.147.0", features = ["html", "syntect"] }
deno_emit = "=0.44.0"
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index ca8a0a82f..3ac280869 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -10,6 +10,7 @@ use clap::ColorChoice;
use clap::Command;
use clap::ValueHint;
use color_print::cstr;
+use deno_config::deno_json::NodeModulesMode;
use deno_config::glob::FilePatterns;
use deno_config::glob::PathOrPatternSet;
use deno_core::anyhow::bail;
@@ -602,6 +603,7 @@ pub struct Flags {
pub type_check_mode: TypeCheckMode,
pub config_flag: ConfigFlag,
pub node_modules_dir: Option<bool>,
+ pub node_modules_mode: Option<NodeModulesMode>,
pub vendor: Option<bool>,
pub enable_op_summary_metrics: bool,
pub enable_testing_features: bool,
@@ -2363,7 +2365,7 @@ TypeScript compiler cache: Subdirectory containing TS compiler output.",
.arg(no_lock_arg())
.arg(config_arg())
.arg(import_map_arg())
- .arg(node_modules_dir_arg())
+ .args(node_modules_args())
.arg(vendor_arg())
.arg(
Arg::new("json")
@@ -3178,7 +3180,7 @@ Remote modules and multiple modules may also be specified:
.arg(config_arg())
.arg(import_map_arg())
.arg(lock_arg())
- .arg(node_modules_dir_arg())
+ .args(node_modules_args())
.arg(vendor_arg())
.arg(reload_arg())
.arg(ca_file_arg())
@@ -3240,7 +3242,7 @@ fn compile_args_without_check_args(app: Command) -> Command {
.arg(import_map_arg())
.arg(no_remote_arg())
.arg(no_npm_arg())
- .arg(node_modules_dir_arg())
+ .args(node_modules_args())
.arg(vendor_arg())
.arg(config_arg())
.arg(no_config_arg())
@@ -3916,16 +3918,49 @@ fn no_npm_arg() -> Arg {
.help_heading(DEPENDENCY_MANAGEMENT_HEADING)
}
-fn node_modules_dir_arg() -> Arg {
- Arg::new("node-modules-dir")
- .long("node-modules-dir")
- .num_args(0..=1)
- .value_parser(value_parser!(bool))
- .value_name("DIRECTORY")
- .default_missing_value("true")
- .require_equals(true)
- .help("Enables or disables the use of a local node_modules folder for npm packages")
- .help_heading(DEPENDENCY_MANAGEMENT_HEADING)
+fn node_modules_arg_parse(flags: &mut Flags, matches: &mut ArgMatches) {
+ if *DENO_FUTURE {
+ let value = matches.remove_one::<NodeModulesMode>("node-modules");
+ if let Some(mode) = value {
+ flags.node_modules_mode = Some(mode);
+ }
+ } else {
+ flags.node_modules_dir = matches.remove_one::<bool>("node-modules-dir");
+ }
+}
+
+fn node_modules_args() -> Vec<Arg> {
+ if *DENO_FUTURE {
+ vec![
+ Arg::new("node-modules")
+ .long("node-modules")
+ .num_args(0..=1)
+ .value_parser(NodeModulesMode::parse)
+ .value_name("MODE")
+ .require_equals(true)
+ .help("Sets the node modules management mode for npm packages")
+ .help_heading(DEPENDENCY_MANAGEMENT_HEADING),
+ Arg::new("node-modules-dir")
+ .long("node-modules-dir")
+ .num_args(0..=1)
+ .value_parser(clap::builder::UnknownArgumentValueParser::suggest_arg(
+ "--node-modules",
+ ))
+ .require_equals(true),
+ ]
+ } else {
+ vec![
+ Arg::new("node-modules-dir")
+ .long("node-modules-dir")
+ .num_args(0..=1)
+ .value_parser(value_parser!(bool))
+ .value_name("ENABLED")
+ .default_missing_value("true")
+ .require_equals(true)
+ .help("Enables or disables the use of a local node_modules folder for npm packages")
+ .help_heading(DEPENDENCY_MANAGEMENT_HEADING)
+ ]
+ }
}
fn vendor_arg() -> Arg {
@@ -5315,7 +5350,7 @@ fn node_modules_and_vendor_dir_arg_parse(
flags: &mut Flags,
matches: &mut ArgMatches,
) {
- flags.node_modules_dir = matches.remove_one::<bool>("node-modules-dir");
+ node_modules_arg_parse(flags, matches);
flags.vendor = matches.remove_one::<bool>("vendor");
}
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index bd5309c01..a0888ca58 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -8,6 +8,7 @@ mod lockfile;
mod package_json;
use deno_ast::SourceMapOption;
+use deno_config::deno_json::NodeModulesMode;
use deno_config::workspace::CreateResolverOptions;
use deno_config::workspace::PackageJsonDepResolution;
use deno_config::workspace::VendorEnablement;
@@ -819,6 +820,7 @@ impl CliOptions {
let maybe_node_modules_folder = resolve_node_modules_folder(
&initial_cwd,
&flags,
+ &start_dir.workspace,
root_folder.deno_json.as_deref(),
root_folder.pkg_json.as_deref(),
&deno_dir_provider,
@@ -917,6 +919,10 @@ impl CliOptions {
};
for diagnostic in start_dir.workspace.diagnostics() {
+ // TODO(2.0): remove
+ if matches!(diagnostic.kind, deno_config::workspace::WorkspaceDiagnosticKind::DeprecatedNodeModulesDirOption(_)) && !*DENO_FUTURE {
+ continue;
+ }
log::warn!("{} {}", colors::yellow("Warning"), diagnostic);
}
@@ -1255,11 +1261,29 @@ impl CliOptions {
}
}
- pub fn node_modules_dir_enablement(&self) -> Option<bool> {
- self
- .flags
- .node_modules_dir
- .or_else(|| self.workspace().node_modules_dir())
+ pub fn node_modules_mode(&self) -> Result<Option<NodeModulesMode>, AnyError> {
+ if *DENO_FUTURE {
+ if let Some(flag) = self.flags.node_modules_mode {
+ return Ok(Some(flag));
+ }
+ self.workspace().node_modules_mode().map_err(Into::into)
+ } else {
+ Ok(
+ self
+ .flags
+ .node_modules_dir
+ .or_else(|| self.workspace().node_modules_dir())
+ .map(|enabled| {
+ if enabled && self.byonm_enabled() {
+ NodeModulesMode::LocalManual
+ } else if enabled {
+ NodeModulesMode::LocalAuto
+ } else {
+ NodeModulesMode::GlobalAuto
+ }
+ }),
+ )
+ }
}
pub fn vendor_dir_path(&self) -> Option<&PathBuf> {
@@ -1611,9 +1635,19 @@ impl CliOptions {
|| self.workspace().has_unstable("bare-node-builtins")
}
+ fn byonm_enabled(&self) -> bool {
+ // check if enabled via unstable
+ self.flags.unstable_config.byonm
+ || NPM_PROCESS_STATE
+ .as_ref()
+ .map(|s| matches!(s.kind, NpmProcessStateKind::Byonm))
+ .unwrap_or(false)
+ || self.workspace().has_unstable("byonm")
+ }
+
pub fn use_byonm(&self) -> bool {
if self.enable_future_features()
- && self.node_modules_dir_enablement().is_none()
+ && self.node_modules_mode().ok().flatten().is_none()
&& self.maybe_node_modules_folder.is_some()
&& self
.workspace()
@@ -1624,13 +1658,7 @@ impl CliOptions {
return true;
}
- // check if enabled via unstable
- self.flags.unstable_config.byonm
- || NPM_PROCESS_STATE
- .as_ref()
- .map(|s| matches!(s.kind, NpmProcessStateKind::Byonm))
- .unwrap_or(false)
- || self.workspace().has_unstable("byonm")
+ self.byonm_enabled()
}
pub fn unstable_sloppy_imports(&self) -> bool {
@@ -1762,15 +1790,28 @@ impl CliOptions {
fn resolve_node_modules_folder(
cwd: &Path,
flags: &Flags,
+ workspace: &Workspace,
maybe_config_file: Option<&ConfigFile>,
maybe_package_json: Option<&PackageJson>,
deno_dir_provider: &Arc<DenoDirProvider>,
) -> Result<Option<PathBuf>, AnyError> {
- let use_node_modules_dir = flags
- .node_modules_dir
- .or_else(|| maybe_config_file.and_then(|c| c.json.node_modules_dir))
- .or(flags.vendor)
- .or_else(|| maybe_config_file.and_then(|c| c.json.vendor));
+ let use_node_modules_dir = if *DENO_FUTURE {
+ if let Some(mode) = flags.node_modules_mode {
+ Some(mode.uses_node_modules_dir())
+ } else {
+ workspace
+ .node_modules_mode()?
+ .map(|m| m.uses_node_modules_dir())
+ .or(flags.vendor)
+ .or_else(|| maybe_config_file.and_then(|c| c.json.vendor))
+ }
+ } else {
+ flags
+ .node_modules_dir
+ .or_else(|| maybe_config_file.and_then(|c| c.json.node_modules_dir))
+ .or(flags.vendor)
+ .or_else(|| maybe_config_file.and_then(|c| c.json.vendor))
+ };
let path = if use_node_modules_dir == Some(false) {
return Ok(None);
} else if let Some(state) = &*NPM_PROCESS_STATE {
diff --git a/cli/graph_util.rs b/cli/graph_util.rs
index c8432b67e..8ff6c9ae3 100644
--- a/cli/graph_util.rs
+++ b/cli/graph_util.rs
@@ -541,7 +541,12 @@ impl ModuleGraphBuilder {
) -> Result<(), AnyError> {
// ensure an "npm install" is done if the user has explicitly
// opted into using a node_modules directory
- if self.options.node_modules_dir_enablement() == Some(true) {
+ if self
+ .options
+ .node_modules_mode()?
+ .map(|m| m.uses_node_modules_dir())
+ .unwrap_or(false)
+ {
if let Some(npm_resolver) = self.npm_resolver.as_managed() {
npm_resolver.ensure_top_level_package_json_install().await?;
}
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'.");
}
diff --git a/cli/tools/run/mod.rs b/cli/tools/run/mod.rs
index 1964cfdd9..9d1d5e78b 100644
--- a/cli/tools/run/mod.rs
+++ b/cli/tools/run/mod.rs
@@ -194,7 +194,12 @@ pub async fn eval_command(
pub async fn maybe_npm_install(factory: &CliFactory) -> Result<(), AnyError> {
// ensure an "npm install" is done if the user has explicitly
// opted into using a managed node_modules directory
- if factory.cli_options()?.node_modules_dir_enablement() == Some(true) {
+ if factory
+ .cli_options()?
+ .node_modules_mode()?
+ .map(|m| m.uses_node_modules_dir())
+ .unwrap_or(false)
+ {
if let Some(npm_resolver) = factory.npm_resolver().await?.as_managed() {
npm_resolver.ensure_top_level_package_json_install().await?;
}
diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index e14452372..d21d17529 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -88,7 +88,10 @@ pub async fn vendor(
let graph = output.graph;
let npm_package_count = graph.npm_packages.len();
let try_add_node_modules_dir = npm_package_count > 0
- && cli_options.node_modules_dir_enablement().unwrap_or(true);
+ && cli_options
+ .node_modules_mode()?
+ .map(|m| m.uses_node_modules_dir())
+ .unwrap_or(true);
log::info!(
concat!("Vendored {} {} into {} directory.",),
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:16:33 +0000