From fca539e65c3b824990fae3b992389d984aac7a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Thu, 10 Nov 2022 00:28:01 +0100 Subject: [PATCH] feat(lock): don't require --unstable for auto discovery (#16582) Enables discovery of lock file unconditionally (ie. not requiring "--unstable" flag) as long as there's a config file discovered. --- cli/lockfile.rs | 3 +-- cli/tests/integration/run_tests.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cli/lockfile.rs b/cli/lockfile.rs index aa60b57891..b1f0c777fe 100644 --- a/cli/lockfile.rs +++ b/cli/lockfile.rs @@ -105,7 +105,7 @@ impl Lockfile { let filename = match flags.lock { Some(ref lock) => PathBuf::from(lock), - None if flags.unstable => match maybe_config_file { + None => match maybe_config_file { Some(config_file) => { if config_file.specifier.scheme() == "file" { let mut path = config_file.specifier.to_file_path().unwrap(); @@ -117,7 +117,6 @@ impl Lockfile { } None => return Ok(None), }, - None => return Ok(None), }; let lockfile = Self::new(filename, flags.lock_write)?; diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs index 70d4f5d92f..09fc7b4262 100644 --- a/cli/tests/integration/run_tests.rs +++ b/cli/tests/integration/run_tests.rs @@ -3636,7 +3636,7 @@ fn websocket_server_idletimeout() { } itest!(auto_discover_lockfile { - args: "run --unstable run/auto_discover_lockfile/main.ts", + args: "run run/auto_discover_lockfile/main.ts", output: "run/auto_discover_lockfile/main.out", http_server: true, exit_code: 10,