Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(cli): Create wrapper around deno_lockfile::Lockfile #24366

Merged
merged 5 commits into from
Jun 29, 2024
Merged

refactor(cli): Create wrapper around deno_lockfile::Lockfile #24366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift click to select a range
2d0aa12
Move out of args::lockfile
nathanwhit Jun 28, 2024
1467cb2
Create wrapper around `Lockfile`
nathanwhit Jun 28, 2024
07e9d63
Put filename on struct, make exists more clear, rename
nathanwhit Jun 28, 2024
c893aac
Move to args
nathanwhit Jun 28, 2024
3a535fc
Fmt
nathanwhit Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fmt
  • Loading branch information
@nathanwhit
nathanwhit committed Jun 28, 2024
commit 3a535fc8ef75c2c953a3c0a6759fdef5ef2b48cf
2 changes: 1 addition & 1 deletion cli/lsp/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 2,13 @@

use super::logging::lsp_log;
use crate::args::discover_npmrc;
use crate::args::CliLockfile;
use crate::args::ConfigFile;
use crate::args::FmtOptions;
use crate::args::LintOptions;
use crate::args::DENO_FUTURE;
use crate::cache::FastInsecureHasher;
use crate::file_fetcher::FileFetcher;
use crate::args::CliLockfile;
use crate::lsp::logging::lsp_warn;
use crate::tools::lint::get_configured_rules;
use crate::tools::lint::ConfiguredRules;
Expand Down
2 changes: 1 addition & 1 deletion cli/module_loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 9,7 @@ use std::str;
use std::sync::Arc;

use crate::args::jsr_url;
use crate::args::CliLockfile;
use crate::args::CliOptions;
use crate::args::DenoSubcommand;
use crate::args::TsTypeLib;
Expand All @@ -22,7 23,6 @@ use crate::graph_container::ModuleGraphContainer;
use crate::graph_container::ModuleGraphUpdatePermit;
use crate::graph_util::CreateGraphOptions;
use crate::graph_util::ModuleGraphBuilder;
use crate::args::CliLockfile;
use crate::node;
use crate::resolver::CliGraphResolver;
use crate::resolver::CliNodeResolver;
Expand Down
7 changes: 2 additions & 5 deletions cli/npm/managed/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 26,12 @@ use deno_semver::package::PackageNv;
use deno_semver::package::PackageReq;
use resolution::AddPkgReqsResult;

use crate::args::CliLockfile;
use crate::args::NpmProcessState;
use crate::args::NpmProcessStateKind;
use crate::args::PackageJsonDepsProvider;
use crate::cache::FastInsecureHasher;
use crate::http_util::HttpClientProvider;
use crate::args::CliLockfile;
use crate::util::fs::canonicalize_path_maybe_not_exists_with_fs;
use crate::util::progress_bar::ProgressBar;
use crate::util::sync::AtomicFlag;
Expand Down Expand Up @@ -208,10 208,7 @@ async fn resolve_snapshot(
let snapshot = snapshot_from_lockfile(lockfile.clone(), api)
.await
.with_context(|| {
format!(
"failed reading lockfile '{}'",
lockfile.filename.display()
)
format!("failed reading lockfile '{}'", lockfile.filename.display())
})?;
Ok(Some(snapshot))
} else {
Expand Down