summaryrefslogtreecommitdiff
path: root/cli/args/mod.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-02-24 13:51:21 -0500
committerGitHub <noreply@github.com>2023-02-24 13:51:21 -0500
commit7ad64283a16cb0bfc9671ed482890d005eed9dcc (patch)
treeaa8214250968627f909d1b5e8bd612f1c3a7c3e2 /cli/args/mod.rs
parent6472afd12bd5978869370948ef2357c810cb6071 (diff)
fix(npm): package.json auto-discovery should respect `--no-config` and `--no-npm` (#17924)
Part of #17916
Diffstat (limited to 'cli/args/mod.rs')
-rw-r--r--cli/args/mod.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 8347a610c..09de47799 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -568,7 +568,9 @@ impl CliOptions {
let maybe_config_file = ConfigFile::discover(&flags, &initial_cwd)?;
let mut maybe_package_json = None;
- if let Some(config_file) = &maybe_config_file {
+ if flags.config_flag == ConfigFlag::Disabled || flags.no_npm {
+ log::debug!("package.json auto-discovery is disabled")
+ } else if let Some(config_file) = &maybe_config_file {
let specifier = config_file.specifier.clone();
if specifier.scheme() == "file" {
let maybe_stop_at = specifier
@@ -582,6 +584,7 @@ impl CliOptions {
} else {
maybe_package_json = discover_package_json(&flags, None)?;
}
+
let maybe_lock_file =
lockfile::discover(&flags, maybe_config_file.as_ref())?;
Self::new(