diff options
author | Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com> | 2024-05-23 12:31:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-23 12:31:05 -0700 |
commit | 5de30c53239ac74843725d981afc0bb8c45bdf16 (patch) | |
tree | 5e806923d8806d6648a9d991eeb3bb05d1df8b4f /cli/args/lockfile.rs | |
parent | 20dad295e2e0961932b05d34b29b07ee97eb0815 (diff) |
fix(cli): Support deno.lock with only package.json present + fix DENO_FUTURE install interactions with lockfile (#23918)
Fixes #23571.
Previously, we required a `deno.json` to be present (or the `--lock`
flag) in order for us to resolve a `deno.lock` file. This meant that if
you were using deno in an npm-first project deno wouldn't use a
lockfile.
Additionally, while I was fixing that, I discovered there were a couple
bugs keeping the future `install` command from using a lockfile.
With this PR, `install` will actually resolve the lockfile (or create
one if not present), and update it if it's not up-to-date. This also
speeds up `deno install`, as we can use the lockfile to skip work during
npm resolution.
Diffstat (limited to 'cli/args/lockfile.rs')
-rw-r--r-- | cli/args/lockfile.rs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cli/args/lockfile.rs b/cli/args/lockfile.rs index 84cad98d4..d5ab14432 100644 --- a/cli/args/lockfile.rs +++ b/cli/args/lockfile.rs @@ -3,11 +3,14 @@ use std::path::PathBuf; use deno_core::error::AnyError; +use deno_runtime::deno_node::PackageJson; use crate::args::ConfigFile; use crate::Flags; use super::DenoSubcommand; +use super::InstallFlags; +use super::InstallKind; pub use deno_lockfile::Lockfile; pub use deno_lockfile::LockfileError; @@ -15,11 +18,15 @@ pub use deno_lockfile::LockfileError; pub fn discover( flags: &Flags, maybe_config_file: Option<&ConfigFile>, + maybe_package_json: Option<&PackageJson>, ) -> Result<Option<Lockfile>, AnyError> { if flags.no_lock || matches!( flags.subcommand, - DenoSubcommand::Install(_) | DenoSubcommand::Uninstall(_) + DenoSubcommand::Install(InstallFlags { + kind: InstallKind::Global(..), + .. + }) | DenoSubcommand::Uninstall(_) ) { return Ok(None); @@ -38,7 +45,12 @@ pub fn discover( return Ok(None); } } - None => return Ok(None), + None => match maybe_package_json { + Some(package_json) => { + package_json.path.parent().unwrap().join("deno.lock") + } + None => return Ok(None), + }, }, }; |