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.

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

chore(signals): prefactor #9995

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
9 changes: 9 additions & 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 @@ -65,6 +65,7 @@ turborepo-repository = { path = "crates/turborepo-repository" }
turborepo-ui = { path = "crates/turborepo-ui" }
turborepo-unescape = { path = "crates/turborepo-unescape" }
turborepo-scm = { path = "crates/turborepo-scm" }
turborepo-signals = { path = "crates/turborepo-signals" }
wax = { path = "crates/turborepo-wax" }
turborepo-vercel-api = { path = "crates/turborepo-vercel-api" }
turborepo-vercel-api-mock = { path = "crates/turborepo-vercel-api-mock" }
Expand Down
1 change: 1 addition & 0 deletions crates/turborepo-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ turborepo-lockfiles = { workspace = true }
turborepo-microfrontends = { workspace = true }
turborepo-repository = { path = "../turborepo-repository" }
turborepo-scm = { workspace = true }
turborepo-signals = { workspace = true }
turborepo-telemetry = { path = "../turborepo-telemetry" }
turborepo-ui = { workspace = true }
turborepo-unescape = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/cli/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use itertools::Itertools;
use miette::Diagnostic;
use thiserror::Error;
use turborepo_repository::package_graph;
use turborepo_signals::SignalHandler;
use turborepo_telemetry::events::command::CommandEventBuilder;
use turborepo_ui::{color, BOLD, GREY};

Expand All @@ -14,7 +15,6 @@ use crate::{
rewrite_json::RewriteError,
run,
run::{builder::RunBuilder, watch},
signal::SignalHandler,
};

#[derive(Debug, Error, Diagnostic)]
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/commands/boundaries.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use turborepo_signals::SignalHandler;
use turborepo_telemetry::events::command::CommandEventBuilder;

use crate::{
cli,
commands::{run::get_signal, CommandBase},
run::builder::RunBuilder,
signal::SignalHandler,
};

pub async fn run(base: CommandBase, telemetry: CommandEventBuilder) -> Result<i32, cli::Error> {
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/commands/ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use serde::Serialize;
use thiserror::Error;
use turbopath::AnchoredSystemPath;
use turborepo_repository::package_graph::{PackageName, PackageNode};
use turborepo_signals::SignalHandler;
use turborepo_telemetry::events::command::CommandEventBuilder;
use turborepo_ui::{color, cprint, cprintln, ColorConfig, BOLD, BOLD_GREEN, GREY};

Expand All @@ -13,7 +14,6 @@ use crate::{
cli::OutputFormat,
commands::{run::get_signal, CommandBase},
run::{builder::RunBuilder, Run},
signal::SignalHandler,
};

#[derive(Debug, Error, Diagnostic)]
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/commands/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ use camino::Utf8Path;
use miette::{Diagnostic, Report, SourceSpan};
use thiserror::Error;
use turbopath::AbsoluteSystemPathBuf;
use turborepo_signals::SignalHandler;
use turborepo_telemetry::events::command::CommandEventBuilder;

use crate::{
commands::{run::get_signal, CommandBase},
query,
query::{Error, RepositoryQuery},
run::builder::RunBuilder,
signal::SignalHandler,
};

#[derive(Debug, Diagnostic, Error)]
Expand Down
3 changes: 2 additions & 1 deletion crates/turborepo-lib/src/commands/run.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use std::{future::Future, sync::Arc};

use tracing::error;
use turborepo_signals::SignalHandler;
use turborepo_telemetry::events::command::CommandEventBuilder;
use turborepo_ui::sender::UISender;

use crate::{commands::CommandBase, run, run::builder::RunBuilder, signal::SignalHandler};
use crate::{commands::CommandBase, run, run::builder::RunBuilder};

#[cfg(windows)]
pub fn get_signal() -> Result<impl Future<Output = Option<()>>, run::Error> {
Expand Down
1 change: 0 additions & 1 deletion crates/turborepo-lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ mod query;
mod rewrite_json;
mod run;
mod shim;
mod signal;
mod task_graph;
mod task_hash;
mod tracing;
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/query/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ use tokio::select;
use turbo_trace::TraceError;
use turbopath::AbsoluteSystemPathBuf;
use turborepo_repository::{change_mapper::AllPackageChangeReason, package_graph::PackageName};
use turborepo_signals::SignalHandler;

use crate::{
get_version,
query::{file::File, task::RepositoryTask},
run::{builder::RunBuilder, Run},
signal::SignalHandler,
};

#[derive(Error, Debug, miette::Diagnostic)]
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/run/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use turborepo_repository::{
package_json::PackageJson,
};
use turborepo_scm::SCM;
use turborepo_signals::{SignalHandler, SignalSubscriber};
use turborepo_telemetry::events::{
command::CommandEventBuilder,
generic::{DaemonInitStatus, GenericEventBuilder},
Expand All @@ -46,7 +47,6 @@ use crate::{
process::ProcessManager,
run::{scope, task_access::TaskAccess, task_id::TaskName, Error, Run, RunCache},
shim::TurboState,
signal::{SignalHandler, SignalSubscriber},
turbo_json::{TurboJson, TurboJsonLoader, UIMode},
DaemonConnector,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/run/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use turborepo_ci::Vendor;
use turborepo_env::EnvironmentVariableMap;
use turborepo_repository::package_graph::{PackageGraph, PackageName, PackageNode};
use turborepo_scm::SCM;
use turborepo_signals::SignalHandler;
use turborepo_telemetry::events::generic::GenericEventBuilder;
use turborepo_ui::{
cprint, cprintln, sender::UISender, tui, tui::TuiSender, wui::sender::WebUISender, ColorConfig,
Expand All @@ -45,7 +46,6 @@ use crate::{
opts::Opts,
process::ProcessManager,
run::{global_hash::get_global_hash_inputs, summary::RunTracker, task_access::TaskAccess},
signal::SignalHandler,
task_graph::Visitor,
task_hash::{get_external_deps_hash, get_internal_deps_hash, PackageInputsHashes},
turbo_json::{TurboJson, TurboJsonLoader, UIMode},
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/run/watch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use thiserror::Error;
use tokio::{select, sync::Notify, task::JoinHandle};
use tracing::{instrument, trace, warn};
use turborepo_repository::package_graph::PackageName;
use turborepo_signals::SignalHandler;
use turborepo_telemetry::events::command::CommandEventBuilder;
use turborepo_ui::sender::UISender;

Expand All @@ -18,7 +19,6 @@ use crate::{
daemon::{proto, DaemonConnectorError, DaemonError},
get_version, opts,
run::{self, builder::RunBuilder, scope::target_selector::InvalidSelectorError, Run},
signal::SignalHandler,
turbo_json::CONFIG_FILE,
DaemonConnector, DaemonPaths,
};
Expand Down
13 changes: 13 additions & 0 deletions crates/turborepo-signals/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "turborepo-signals"
version = "0.1.0"
edition = "2021"

[dependencies]
futures = "0.3.30"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason we're using a different version for futures instead of the workspace root version?

tokio = { workspace = true, features = ["full", "time"] }

[dev-dependencies]

[lints]
workspace = true
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#![deny(clippy::all)]
#![feature(assert_matches)]

use std::{
fmt::Debug,
future::Future,
Expand Down