Skip to content
Merged
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
25 changes: 12 additions & 13 deletions crates/turborepo-engine/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,19 +210,18 @@ impl<'a, L: TurboJsonLoader> EngineBuilder<'a, L> {

// Collect tasks from each workspace and its extends chain
for workspace in self.workspaces.iter() {
let implicit_tasks = if let Some(context) =
self.package_graph.package_task_context(workspace)
&& let Some(toolchain_id) = context.toolchain()
&& let Some(toolchain) = self.package_graph.toolchains().get(toolchain_id)
{
toolchain
.registered_tasks(&context)
.into_iter()
.map(TaskName::from)
.collect()
} else {
HashSet::new()
};
let implicit_tasks =
if let Some(context) = self.package_graph.package_task_context(workspace) {
context
.native_tasks()
.tasks()
.iter()
.filter(|task| task.registered())
.map(|task| TaskName::from(task.name().to_string()))
.collect()
} else {
HashSet::new()
};
let workspace_tasks = TaskInheritanceResolver::new(turbo_json_loader)
.with_implicit_tasks(implicit_tasks)
.resolve(workspace)?;
Expand Down
64 changes: 3 additions & 61 deletions crates/turborepo-engine/src/builder/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,35 +143,6 @@ impl Toolchain for AggregateToolchain {
})
}

fn task_command(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
_pass_through_args: Option<&[String]>,
_override_command: Option<&[String]>,
) -> Result<
Option<turborepo_repository::toolchain::TaskCommand>,
turborepo_repository::toolchain::Error,
> {
Ok(None)
}

fn task_display_command(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
) -> Option<String> {
None
}

fn defines_task(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
) -> bool {
false
}

fn watch_spec(&self) -> turborepo_repository::toolchain::WatchSpec {
turborepo_repository::toolchain::WatchSpec::default()
}
Expand Down Expand Up @@ -241,35 +212,6 @@ impl Toolchain for StubIOToolchain {
})
}

fn task_command(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
_pass_through_args: Option<&[String]>,
_override_command: Option<&[String]>,
) -> Result<
Option<turborepo_repository::toolchain::TaskCommand>,
turborepo_repository::toolchain::Error,
> {
Ok(None)
}

fn task_display_command(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
) -> Option<String> {
None
}

fn defines_task(
&self,
_package: &turborepo_repository::package_graph::PackageTaskContext<'_>,
task: &str,
) -> bool {
matches!(task, "build" | "test")
}

fn watch_spec(&self) -> turborepo_repository::toolchain::WatchSpec {
turborepo_repository::toolchain::WatchSpec::default()
}
Expand All @@ -286,10 +228,10 @@ impl Toolchain for StubIOToolchain {

fn derives_task_io(
&self,
package: &turborepo_repository::package_graph::PackageTaskContext<'_>,
task: &str,
_package: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
) -> bool {
self.defines_task(package, task)
true
}

fn task_io_env_vars(&self) -> &[&str] {
Expand Down
29 changes: 0 additions & 29 deletions crates/turborepo-lib/src/run/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1554,35 +1554,6 @@ mod task_io_context_tests {
Box::pin(async { Ok(DiscoveredPackages::default()) })
}

fn task_command(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
_pass_through_args: Option<&[String]>,
_override_command: Option<&[String]>,
) -> Result<
Option<turborepo_repository::toolchain::TaskCommand>,
turborepo_repository::toolchain::Error,
> {
Ok(None)
}

fn task_display_command(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
) -> Option<String> {
None
}

fn defines_task(
&self,
_context: &turborepo_repository::package_graph::PackageTaskContext<'_>,
_task: &str,
) -> bool {
false
}

fn watch_spec(&self) -> turborepo_repository::toolchain::WatchSpec {
turborepo_repository::toolchain::WatchSpec::default()
}
Expand Down
24 changes: 14 additions & 10 deletions crates/turborepo-lib/src/run/task_access.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,23 @@ fn task_access_trace_enabled(repo_root: &AbsoluteSystemPathBuf) -> Result<bool,
return Ok(false);
}

// read package.json at root
// read package.json at root through the same observation vocabulary as
// the native-task catalog — do not read scripts for task identity directly.
let package_json_path = repo_root.join_components(&["package.json"]);
let package_json_content = fs::read_to_string(package_json_path)?;
let package: PackageJson = serde_json::from_str(&package_json_content)?;

if let Some(scripts) = package.scripts {
return match scripts.get("build") {
Some(script) => Ok(script == "next build"),
_ => Ok(false),
};
}

Ok(false)
let scripts = package.scripts.unwrap_or_default();
let scripts: std::collections::BTreeMap<_, _> = scripts
.into_iter()
.map(|(name, value)| (name, turborepo_errors::Spanned::new(value)))
.collect();
let observation = turborepo_repository::native_tasks::observation_from_scripts("//", &scripts);
Ok(observation.tasks.iter().any(|task| {
task.name() == "build"
&& task
.script()
.is_some_and(|script| script.as_inner() == "next build")
}))
}

impl TaskAccessTraceFile {
Expand Down
Loading
Loading