这是indexloc提供的服务,不要输入任何密码
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ urlencoding = "2.1.2"
webbrowser = "0.8.7"
which = "4.4.0"
unicode-segmentation = "1.10.1"
walkdir = "2.3.2"


# Needed until a fix for https://github.com/async-graphql/async-graphql/issues/1703 is published
Expand Down
7 changes: 4 additions & 3 deletions crates/turborepo-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ port_scanner = { workspace = true }
pretty_assertions = { workspace = true }
tempfile = { workspace = true }
test-case = { workspace = true }
tracing = { workspace = true }
tracing-test = { version = "0.2.4", features = ["no-env-filter"] }
tracing.workspace = true
turborepo-vercel-api-mock = { workspace = true }

[lints]
Expand Down Expand Up @@ -91,7 +91,7 @@ prost = "0.12.3"
radix_trie = { workspace = true }
rand = { workspace = true }
rayon = "1.7.0"
regex.workspace = true
regex = { workspace = true }
reqwest = { workspace = true, default-features = false, features = ["json"] }
semver = { workspace = true }
serde = { workspace = true, features = ["derive"] }
Expand All @@ -116,10 +116,10 @@ tokio-util = { version = "0.7.7", features = ["compat"] }
tonic = { version = "0.11.0", features = ["transport"] }
tower = "0.4.13"
tower-http = { version = "0.5.2", features = ["cors"] }
tracing = { workspace = true }
tracing-appender = "0.2.2"
tracing-chrome = "0.7.1"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
tracing.workspace = true
turbo-trace = { workspace = true }
turbo-updater = { workspace = true }
turbopath = { workspace = true }
Expand Down Expand Up @@ -148,6 +148,7 @@ turborepo-unescape = { workspace = true }
turborepo-vercel-api = { path = "../turborepo-vercel-api" }
twox-hash = "1.6.3"
uds_windows = "1.0.2"
walkdir = { workspace = true }
wax = { workspace = true }
webbrowser = { workspace = true }
which = { workspace = true }
Expand Down
2 changes: 2 additions & 0 deletions crates/turborepo-lib/src/cli/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ pub enum Error {
SignalListener(#[from] turborepo_signals::listeners::Error),
#[error(transparent)]
Dialoguer(#[from] dialoguer::Error),
#[error(transparent)]
DepsSync(#[from] crate::commands::deps_sync::Error),
}

const MAX_CHARS_PER_TASK_LINE: usize = 100;
Expand Down
21 changes: 19 additions & 2 deletions crates/turborepo-lib/src/cli/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ use turborepo_ui::{ColorConfig, GREY};
use crate::{
cli::error::print_potential_tasks,
commands::{
bin, boundaries, clone, config, daemon, generate, info, link, login, logout, ls, prune,
query, run, scan, telemetry, unlink, CommandBase,
bin, boundaries, clone, config, daemon, deps_sync, generate, info, link, login, logout, ls,
prune, query, run, scan, telemetry, unlink, CommandBase,
},
get_version,
run::watch::WatchClient,
Expand Down Expand Up @@ -614,6 +614,15 @@ pub enum Command {
#[clap(subcommand)]
command: Option<DaemonCommand>,
},
/// Check that all dependencies across workspaces are synchronized
#[clap(name = "deps-sync")]
DepsSync {
/// Generate allowlist configuration for current conflicts instead of
/// reporting them. This helps with incremental adoption by
/// writing configuration that ignores existing conflicts.
#[clap(long)]
allowlist: bool,
},
/// Generate a new app / package
#[clap(aliases = ["g", "gen"])]
Generate {
Expand Down Expand Up @@ -1441,6 +1450,14 @@ pub async fn run(

Ok(0)
}
Command::DepsSync { allowlist } => {
let event = CommandEventBuilder::new("deps-sync").with_parent(&root_telemetry);
event.track_call();
let base = CommandBase::new(cli_args.clone(), repo_root, version, color_config)?;
event.track_ui_mode(base.opts.run_opts.ui_mode);

Ok(deps_sync::run(&base, *allowlist).await?)
}
Command::Generate {
tag,
generator_name,
Expand Down
Loading
Loading