diff --git a/crates/turborepo-lib/src/commands/link.rs b/crates/turborepo-lib/src/commands/link.rs index 759df0c529995..a725b136f9289 100644 --- a/crates/turborepo-lib/src/commands/link.rs +++ b/crates/turborepo-lib/src/commands/link.rs @@ -720,7 +720,7 @@ mod test { fs::write( turbo_json_file.as_path(), - r#"{ "globalEnv": [], "pipeline": {} }"#, + r#"{ "globalEnv": [], "tasks": {} }"#, ) .unwrap(); diff --git a/crates/turborepo-lib/src/engine/builder.rs b/crates/turborepo-lib/src/engine/builder.rs index bdd1704621168..4ceeeb99cac70 100644 --- a/crates/turborepo-lib/src/engine/builder.rs +++ b/crates/turborepo-lib/src/engine/builder.rs @@ -389,8 +389,8 @@ impl<'a> EngineBuilder<'a> { }; let task_id_as_name = task_id.as_task_name(); - if turbo_json.pipeline.contains_key(&task_id_as_name) - || turbo_json.pipeline.contains_key(task_name) + if turbo_json.tasks.contains_key(&task_id_as_name) + || turbo_json.tasks.contains_key(task_name) { Ok(true) } else if !matches!(workspace, PackageName::Root) { @@ -441,7 +441,7 @@ impl<'a> EngineBuilder<'a> { }); } - if let Some(workspace_def) = workspace_json.pipeline.get(task_name) { + if let Some(workspace_def) = workspace_json.tasks.get(task_name) { task_definitions.push(workspace_def.value.clone()); } } @@ -665,13 +665,13 @@ mod test { ); a_turbo_json - .create_with_contents(r#"{"pipeline": {"build": {}}}"#) + .create_with_contents(r#"{"tasks": {"build": {}}}"#) .unwrap(); let turbo_json = engine_builder .load_turbo_json(&PackageName::from("a")) .unwrap(); - assert_eq!(turbo_json.pipeline.len(), 1); + assert_eq!(turbo_json.tasks.len(), 1); } fn turbo_json(value: serde_json::Value) -> TurboJson { @@ -706,7 +706,7 @@ mod test { ( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "test": { "inputs": ["testing"] }, "build": { "inputs": ["primary"] }, "a#build": { "inputs": ["special"] }, @@ -716,7 +716,7 @@ mod test { ( PackageName::from("b"), turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "inputs": ["outer"]}, } })), @@ -784,7 +784,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "test": { "dependsOn": ["^build", "prepare"] }, "build": { "dependsOn": ["^build", "prepare"] }, "prepare": {}, @@ -843,7 +843,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "test": { "dependsOn": ["^build"] }, "build": { "dependsOn": ["^build"] }, } @@ -882,7 +882,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, "app1#special": { "dependsOn": ["^build"] }, } @@ -919,7 +919,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, "test": { "dependsOn": ["^build"] }, "//#test": {}, @@ -972,7 +972,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, "libA#build": { "dependsOn": ["//#root-task"] }, "//#root-task": {}, @@ -1016,7 +1016,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, "libA#build": { "dependsOn": ["//#root-task"] }, } @@ -1049,7 +1049,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "libA#build": { "dependsOn": ["app1#compile", "app1#test"] }, "build": { "dependsOn": ["^build"] }, "compile": {}, @@ -1095,7 +1095,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, "foo": {}, "libA#build": { "dependsOn": ["//#foo"] } @@ -1134,7 +1134,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build", "prepare"] }, "test": { "dependsOn": ["^build", "prepare"] }, "prepare": {}, @@ -1183,7 +1183,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, } })), @@ -1221,7 +1221,7 @@ mod test { let turbo_jsons = vec![( PackageName::Root, turbo_json(json!({ - "pipeline": { + "tasks": { "a#build": { }, "b#build": { "dependsOn": ["a#build"] } } diff --git a/crates/turborepo-lib/src/run/builder.rs b/crates/turborepo-lib/src/run/builder.rs index 2eb49f335dde8..f3ffb2f1229f8 100644 --- a/crates/turborepo-lib/src/run/builder.rs +++ b/crates/turborepo-lib/src/run/builder.rs @@ -358,7 +358,7 @@ impl RunBuilder { task_name = task_name.into_root_task() } - if root_turbo_json.pipeline.contains_key(&task_name) { + if root_turbo_json.tasks.contains_key(&task_name) { filtered_pkgs.insert(PackageName::Root); break; } @@ -435,7 +435,7 @@ impl RunBuilder { pkg_dep_graph, self.opts.run_opts.single_package, ) - .with_root_tasks(root_turbo_json.pipeline.keys().cloned()) + .with_root_tasks(root_turbo_json.tasks.keys().cloned()) .with_turbo_jsons(Some( Some((PackageName::Root, root_turbo_json.clone())) .into_iter() diff --git a/crates/turborepo-lib/src/turbo_json/mod.rs b/crates/turborepo-lib/src/turbo_json/mod.rs index 73ed6a0c1d02b..7b55ec9d58d6c 100644 --- a/crates/turborepo-lib/src/turbo_json/mod.rs +++ b/crates/turborepo-lib/src/turbo_json/mod.rs @@ -53,7 +53,7 @@ pub struct TurboJson { pub(crate) global_dot_env: Option>, pub(crate) global_env: Vec, pub(crate) global_pass_through_env: Option>, - pub(crate) pipeline: Pipeline, + pub(crate) tasks: Pipeline, } // Iterable is required to enumerate allowed keys @@ -118,10 +118,10 @@ pub struct RawTurboJson { // .env files to consider, in order. #[serde(skip_serializing_if = "Option::is_none")] global_dot_env: Option>, - // Pipeline is a map of Turbo pipeline entries which define the task graph + // Tasks is a map of task entries which define the task graph // and cache behavior on a per task or per package-task basis. #[serde(skip_serializing_if = "Option::is_none")] - pub pipeline: Option, + pub tasks: Option, // Configuration options when interfacing with the remote cache #[serde(skip_serializing_if = "Option::is_none")] pub(crate) remote_cache: Option, @@ -402,7 +402,7 @@ impl RawTurboJson { /// workspaces pub fn prune_tasks>(&self, workspaces: &[S]) -> Self { let mut this = self.clone(); - if let Some(pipeline) = &mut this.pipeline { + if let Some(pipeline) = &mut this.tasks { pipeline.0.retain(|task_name, _| { task_name.in_workspace(ROOT_PKG_NAME) || workspaces @@ -446,7 +446,7 @@ impl RawTurboJson { } Some(RawTurboJson { - pipeline: Some(pipeline), + tasks: Some(pipeline), ..RawTurboJson::default() }) } @@ -521,7 +521,7 @@ impl TryFrom for TurboJson { Ok(global_dot_env) }) .transpose()?, - pipeline: raw_turbo.pipeline.unwrap_or_default(), + tasks: raw_turbo.tasks.unwrap_or_default(), // copy these over, we don't need any changes here. extends: raw_turbo .extends @@ -571,7 +571,7 @@ impl TurboJson { // tasks (true, Ok(mut turbo_from_files)) => { let mut pipeline = Pipeline::default(); - for (task_name, task_definition) in turbo_from_files.pipeline { + for (task_name, task_definition) in turbo_from_files.tasks { if task_name.is_package_task() { let (span, text) = task_definition.span_and_text("turbo.json"); @@ -585,7 +585,7 @@ impl TurboJson { pipeline.insert(task_name.into_root_task(), task_definition); } - turbo_from_files.pipeline = pipeline; + turbo_from_files.tasks = pipeline; turbo_from_files } @@ -599,7 +599,7 @@ impl TurboJson { // Explicitly set cache to Some(false) in this definition // so we can pretend it was set on purpose. That way it // won't get clobbered by the merge function. - turbo_json.pipeline.insert( + turbo_json.tasks.insert( task_name, Spanned::new(RawTaskDefinition { cache: Some(Spanned::new(false)), @@ -613,7 +613,7 @@ impl TurboJson { } fn has_task(&self, task_name: &TaskName) -> bool { - for key in self.pipeline.keys() { + for key in self.tasks.keys() { if key == task_name || (key.task() == task_name.task() && !task_name.is_package_task()) { return true; @@ -634,12 +634,9 @@ impl TurboJson { } pub fn task(&self, task_id: &TaskId, task_name: &TaskName) -> Option { - match self.pipeline.get(&task_id.as_task_name()) { + match self.tasks.get(&task_id.as_task_name()) { Some(entry) => Some(entry.value.clone()), - None => self - .pipeline - .get(task_name) - .map(|entry| entry.value.clone()), + None => self.tasks.get(task_name).map(|entry| entry.value.clone()), } } @@ -656,7 +653,7 @@ impl TurboJson { } pub fn has_root_tasks(&self) -> bool { - self.pipeline + self.tasks .iter() .any(|(task_name, _)| task_name.package() == Some(ROOT_PKG_NAME)) } @@ -666,7 +663,7 @@ type TurboJSONValidation = fn(&TurboJson) -> Vec; pub fn validate_no_package_task_syntax(turbo_json: &TurboJson) -> Vec { turbo_json - .pipeline + .tasks .iter() .filter(|(task_name, _)| task_name.is_package_task()) .map(|(task_name, entry)| { @@ -815,7 +812,7 @@ mod tests { ..PackageJson::default() }, TurboJson { - pipeline: Pipeline([( + tasks: Pipeline([( "//#build".into(), Spanned::new(RawTaskDefinition { cache: Some(Spanned::new(false)), @@ -828,7 +825,7 @@ mod tests { )] #[test_case( Some(r#"{ - "pipeline": { + "tasks": { "build": { "cache": true } @@ -839,12 +836,12 @@ mod tests { ..PackageJson::default() }, TurboJson { - pipeline: Pipeline([( + tasks: Pipeline([( "//#build".into(), Spanned::new(RawTaskDefinition { - cache: Some(Spanned::new(true).with_range(84..88)), + cache: Some(Spanned::new(true).with_range(81..85)), ..RawTaskDefinition::default() - }).with_range(53..106) + }).with_range(50..103) ), ( "//#test".into(), @@ -876,7 +873,7 @@ mod tests { )?; turbo_json.text = None; turbo_json.path = None; - for (_, task_definition) in turbo_json.pipeline.iter_mut() { + for (_, task_definition) in turbo_json.tasks.iter_mut() { task_definition.path = None; task_definition.text = None; } @@ -1057,7 +1054,7 @@ mod tests { #[test] fn test_turbo_task_pruning() { let json = RawTurboJson::parse_from_serde(json!({ - "pipeline": { + "tasks": { "//#top": {}, "build": {}, "a#build": {}, @@ -1067,7 +1064,7 @@ mod tests { .unwrap(); let pruned_json = json.prune_tasks(&["a"]); let expected: RawTurboJson = RawTurboJson::parse_from_serde(json!({ - "pipeline": { + "tasks": { "//#top": {}, "build": {}, "a#build": {}, @@ -1076,8 +1073,8 @@ mod tests { .unwrap(); // We do this comparison manually so we don't compare the `task_name_range` // fields, which are expected to be different - let pruned_pipeline = pruned_json.pipeline.unwrap(); - let expected_pipeline = expected.pipeline.unwrap(); + let pruned_pipeline = pruned_json.tasks.unwrap(); + let expected_pipeline = expected.tasks.unwrap(); for ( (pruned_task_name, pruned_pipeline_entry), (expected_task_name, expected_pipeline_entry), @@ -1098,7 +1095,7 @@ mod tests { #[test_case("junk", None ; "invalid value")] fn test_parsing_output_logs_mode(output_logs: &str, expected: Option) { let json: Result = RawTurboJson::parse_from_serde(json!({ - "pipeline": { + "tasks": { "build": { "outputLogs": output_logs, } @@ -1108,7 +1105,7 @@ mod tests { let actual = json .as_ref() .ok() - .and_then(|j| j.pipeline.as_ref()) + .and_then(|j| j.tasks.as_ref()) .and_then(|pipeline| pipeline.0.get(&TaskName::from("build"))) .and_then(|build| build.value.output_logs.clone()) .map(|mode| mode.into_inner()); diff --git a/crates/turborepo-lib/src/turbo_json/parser.rs b/crates/turborepo-lib/src/turbo_json/parser.rs index 079be1bf89c2c..c76a965c86bf3 100644 --- a/crates/turborepo-lib/src/turbo_json/parser.rs +++ b/crates/turborepo-lib/src/turbo_json/parser.rs @@ -147,7 +147,7 @@ impl WithMetadata for RawTurboJson { self.global_dependencies.add_text(text.clone()); self.global_env.add_text(text.clone()); self.global_pass_through_env.add_text(text.clone()); - self.pipeline.add_text(text); + self.tasks.add_text(text); } fn add_path(&mut self, path: Arc) { @@ -156,7 +156,7 @@ impl WithMetadata for RawTurboJson { self.global_dependencies.add_path(path.clone()); self.global_env.add_path(path.clone()); self.global_pass_through_env.add_path(path.clone()); - self.pipeline.add_path(path); + self.tasks.add_path(path); } } diff --git a/crates/turborepo-lsp/src/lib.rs b/crates/turborepo-lsp/src/lib.rs index abc7dd8011a26..e64cc1c1a0bd5 100644 --- a/crates/turborepo-lsp/src/lib.rs +++ b/crates/turborepo-lsp/src/lib.rs @@ -207,7 +207,7 @@ impl LanguageServer for Backend { .value .as_ref() .and_then(|v| v.as_object()) - .and_then(|o| o.get_object("pipeline")) + .and_then(|o| o.get_object("tasks")) .map(|p| p.properties.iter()) .into_iter() .flatten() @@ -376,7 +376,7 @@ impl LanguageServer for Backend { .value .as_ref() .and_then(|v| v.as_object()) - .and_then(|o| o.get_object("pipeline")) + .and_then(|o| o.get_object("tasks")) .map(|p| p.properties.iter()) .into_iter() .flatten(); @@ -712,7 +712,7 @@ impl Backend { ); let pipeline = object - .and_then(|o| o.get_object("pipeline")) + .and_then(|o| o.get_object("tasks")) .map(|p| p.properties.iter()); for property in pipeline.into_iter().flatten() { diff --git a/turborepo-tests/integration/fixtures/basic_monorepo/turbo.json b/turborepo-tests/integration/fixtures/basic_monorepo/turbo.json index cfee1ac9613ab..7094e9b5d7f79 100644 --- a/turborepo-tests/integration/fixtures/basic_monorepo/turbo.json +++ b/turborepo-tests/integration/fixtures/basic_monorepo/turbo.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/add-keys/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/add-keys/turbo.json index 7172b489cab5f..2e8e6af12db13 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/add-keys/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/add-keys/turbo.json @@ -1,8 +1,6 @@ { - "extends": [ - "//" - ], - "pipeline": { + "extends": ["//"], + "tasks": { "add-keys-task": { "dependsOn": [ "add-keys-underlying-task" diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/add-tasks/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/add-tasks/turbo.json index 6be0e0aadeac8..653a3f17bd740 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/add-tasks/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/add-tasks/turbo.json @@ -1,7 +1,7 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "added-task": { "outputs": ["out/**"] } diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/cached/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/cached/turbo.json index 89633c6bb9bd6..a5852aab9901b 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/cached/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/cached/turbo.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "cached-task-1": { "cache": true }, diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo-changed.json b/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo-changed.json index 59794bd4698db..8afcea50a9090 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo-changed.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo-changed.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "config-change-task": {}, "other-task": { "env": ["ARBITRARY_CHANGE"] diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo.json index cedcef6a2d303..1bc6503605dea 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/config-change/turbo.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "config-change-task": {}, "other-task": {} } diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/cross-workspace/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/cross-workspace/turbo.json index da8bb470e9074..99d39eb16c931 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/cross-workspace/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/cross-workspace/turbo.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "cross-workspace-task": { "dependsOn": ["blank-pkg#cross-workspace-underlying-task"] } diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/invalid-config/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/invalid-config/turbo.json index 375a220129953..4cca66d5760ef 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/invalid-config/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/invalid-config/turbo.json @@ -1,5 +1,5 @@ { - "pipeline": { + "tasks": { "invalid-config#build": { "outputs": ["out/**", "lib/**"] }, diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/omit-keys/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/omit-keys/turbo.json index 35ddebb5803f9..91e0bb163452c 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/omit-keys/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/omit-keys/turbo.json @@ -1,7 +1,7 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "omit-keys-task": {}, "omit-keys-task-with-deps": {} } diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/override-values/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/override-values/turbo.json index 2b9a83c6a444b..f9ec258ee8e9c 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/override-values/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/override-values/turbo.json @@ -1,8 +1,6 @@ { - "extends": [ - "//" - ], - "pipeline": { + "extends": ["//"], + "tasks": { "override-values-task": { "inputs": [ "src/bar.txt" diff --git a/turborepo-tests/integration/fixtures/composable_config/apps/persistent/turbo.json b/turborepo-tests/integration/fixtures/composable_config/apps/persistent/turbo.json index e1f98a5b4f1af..06bbde343f979 100644 --- a/turborepo-tests/integration/fixtures/composable_config/apps/persistent/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/apps/persistent/turbo.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "persistent-task-2": { "persistent": false }, diff --git a/turborepo-tests/integration/fixtures/composable_config/packages/blank-pkg/turbo.json b/turborepo-tests/integration/fixtures/composable_config/packages/blank-pkg/turbo.json index 7b7cadf305971..dfcfa5f61728b 100644 --- a/turborepo-tests/integration/fixtures/composable_config/packages/blank-pkg/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/packages/blank-pkg/turbo.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "cross-workspace-underlying-task": {} } } diff --git a/turborepo-tests/integration/fixtures/composable_config/turbo.json b/turborepo-tests/integration/fixtures/composable_config/turbo.json index 8aa07de263f1f..fc76820c940a9 100644 --- a/turborepo-tests/integration/fixtures/composable_config/turbo.json +++ b/turborepo-tests/integration/fixtures/composable_config/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "add-keys-task": {}, "add-keys-underlying-task": {}, "omit-keys-task-with-deps": { diff --git a/turborepo-tests/integration/fixtures/framework_inference/turbo.json b/turborepo-tests/integration/fixtures/framework_inference/turbo.json index b7f071fb387ec..0dcebba049467 100644 --- a/turborepo-tests/integration/fixtures/framework_inference/turbo.json +++ b/turborepo-tests/integration/fixtures/framework_inference/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turbo.build/schema.json", "globalPassThroughEnv": [], - "pipeline": { + "tasks": { "build": {} } } diff --git a/turborepo-tests/integration/fixtures/global_deps/turbo.json b/turborepo-tests/integration/fixtures/global_deps/turbo.json index 390c719bdf582..09678c6e79a08 100644 --- a/turborepo-tests/integration/fixtures/global_deps/turbo.json +++ b/turborepo-tests/integration/fixtures/global_deps/turbo.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["global_deps/**"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/fixtures/inference/has_workspaces/packages/ui-library/turbo.json b/turborepo-tests/integration/fixtures/inference/has_workspaces/packages/ui-library/turbo.json index 924a1fc613ae9..dea276bc6bd3d 100644 --- a/turborepo-tests/integration/fixtures/inference/has_workspaces/packages/ui-library/turbo.json +++ b/turborepo-tests/integration/fixtures/inference/has_workspaces/packages/ui-library/turbo.json @@ -1,5 +1,5 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": {} + "tasks": {} } diff --git a/turborepo-tests/integration/fixtures/inference/has_workspaces/turbo.json b/turborepo-tests/integration/fixtures/inference/has_workspaces/turbo.json index 2fc9d06fe4d5a..9d4fcdc74f3b4 100644 --- a/turborepo-tests/integration/fixtures/inference/has_workspaces/turbo.json +++ b/turborepo-tests/integration/fixtures/inference/has_workspaces/turbo.json @@ -1,7 +1,7 @@ // Has a comment! { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": {} } } diff --git a/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer-no-turbo/inner/turbo.json b/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer-no-turbo/inner/turbo.json index d4487028869da..a383ddeb487c9 100644 --- a/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer-no-turbo/inner/turbo.json +++ b/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer-no-turbo/inner/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": {} } } diff --git a/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/inner/turbo.json b/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/inner/turbo.json index d4487028869da..a383ddeb487c9 100644 --- a/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/inner/turbo.json +++ b/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/inner/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": {} } } diff --git a/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/turbo.json b/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/turbo.json index d4487028869da..a383ddeb487c9 100644 --- a/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/turbo.json +++ b/turborepo-tests/integration/fixtures/inference/nested_workspaces/outer/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": {} } } diff --git a/turborepo-tests/integration/fixtures/lockfile_aware_caching/turbo.json b/turborepo-tests/integration/fixtures/lockfile_aware_caching/turbo.json index 383437544e6e7..3f16969b87b9a 100644 --- a/turborepo-tests/integration/fixtures/lockfile_aware_caching/turbo.json +++ b/turborepo-tests/integration/fixtures/lockfile_aware_caching/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": [], "inputs": ["package.json"] diff --git a/turborepo-tests/integration/fixtures/monorepo_dependency_error/turbo.json b/turborepo-tests/integration/fixtures/monorepo_dependency_error/turbo.json index 30922a61b1baf..89b91e89da259 100644 --- a/turborepo-tests/integration/fixtures/monorepo_dependency_error/turbo.json +++ b/turborepo-tests/integration/fixtures/monorepo_dependency_error/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"], "outputs": [] diff --git a/turborepo-tests/integration/fixtures/monorepo_one_script_error/turbo.json b/turborepo-tests/integration/fixtures/monorepo_one_script_error/turbo.json index 54b3b12ee34be..acf03c909f7af 100644 --- a/turborepo-tests/integration/fixtures/monorepo_one_script_error/turbo.json +++ b/turborepo-tests/integration/fixtures/monorepo_one_script_error/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "error": { "dependsOn": ["okay"], "outputs": ["foo"] diff --git a/turborepo-tests/integration/fixtures/monorepo_with_root_dep/apps/docs/turbo.json b/turborepo-tests/integration/fixtures/monorepo_with_root_dep/apps/docs/turbo.json index 93e9625690ab3..57e9a40018036 100644 --- a/turborepo-tests/integration/fixtures/monorepo_with_root_dep/apps/docs/turbo.json +++ b/turborepo-tests/integration/fixtures/monorepo_with_root_dep/apps/docs/turbo.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "new-task": {} } } diff --git a/turborepo-tests/integration/fixtures/monorepo_with_root_dep/turbo.json b/turborepo-tests/integration/fixtures/monorepo_with_root_dep/turbo.json index c42bb9ff19e47..b8ef3df99416b 100644 --- a/turborepo-tests/integration/fixtures/monorepo_with_root_dep/turbo.json +++ b/turborepo-tests/integration/fixtures/monorepo_with_root_dep/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": [] }, diff --git a/turborepo-tests/integration/fixtures/nested_packages/turbo.json b/turborepo-tests/integration/fixtures/nested_packages/turbo.json index 0d547fb58901a..aa0b0be65ca8a 100644 --- a/turborepo-tests/integration/fixtures/nested_packages/turbo.json +++ b/turborepo-tests/integration/fixtures/nested_packages/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": [] } diff --git a/turborepo-tests/integration/fixtures/ordered/turbo.json b/turborepo-tests/integration/fixtures/ordered/turbo.json index 3fedbd641120c..8acc697061308 100644 --- a/turborepo-tests/integration/fixtures/ordered/turbo.json +++ b/turborepo-tests/integration/fixtures/ordered/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": {}, "fail": {} } diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/1-topological/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/1-topological/turbo.json index c1a03e77ab652..4171bea063e7e 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/1-topological/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/1-topological/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "dev": { "dependsOn": ["^dev"], "persistent": true diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/10-too-many/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/10-too-many/turbo.json index fb2077e4f4ecd..3b92d9b2c6dc0 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/10-too-many/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/10-too-many/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "persistent": true } diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/2-same-workspace/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/2-same-workspace/turbo.json index a9c86b1b85eb8..77e6483fa4c7e 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/2-same-workspace/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/2-same-workspace/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "dependsOn": ["dev"] }, diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/3-workspace-specific/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/3-workspace-specific/turbo.json index 7d6afe90f180b..5e2c63f85bccf 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/3-workspace-specific/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/3-workspace-specific/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "dependsOn": ["pkg-a#dev"] }, diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/4-cross-workspace/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/4-cross-workspace/turbo.json index c72700ecbb850..482595dc0410c 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/4-cross-workspace/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/4-cross-workspace/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "app-a#dev": { "dependsOn": ["pkg-a#dev"], "persistent": true diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/5-root-workspace/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/5-root-workspace/turbo.json index c5eee83836181..b3880a210565c 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/5-root-workspace/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/5-root-workspace/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "dependsOn": ["//#dev"], "persistent": true diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/6-topological-unimplemented/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/6-topological-unimplemented/turbo.json index c1a03e77ab652..4171bea063e7e 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/6-topological-unimplemented/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/6-topological-unimplemented/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "dev": { "dependsOn": ["^dev"], "persistent": true diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/7-topological-nested/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/7-topological-nested/turbo.json index c1a03e77ab652..4171bea063e7e 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/7-topological-nested/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/7-topological-nested/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "dev": { "dependsOn": ["^dev"], "persistent": true diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/8-topological-with-extra/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/8-topological-with-extra/turbo.json index e04097b2c4c8a..e779360980573 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/8-topological-with-extra/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/8-topological-with-extra/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, diff --git a/turborepo-tests/integration/fixtures/persistent_dependencies/9-cross-workspace-nested/turbo.json b/turborepo-tests/integration/fixtures/persistent_dependencies/9-cross-workspace-nested/turbo.json index 350c7db5ef75a..76e6d670a134d 100644 --- a/turborepo-tests/integration/fixtures/persistent_dependencies/9-cross-workspace-nested/turbo.json +++ b/turborepo-tests/integration/fixtures/persistent_dependencies/9-cross-workspace-nested/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "app-a#build": { "dependsOn": ["app-b#build"] }, diff --git a/turborepo-tests/integration/fixtures/run_logging/turbo.json b/turborepo-tests/integration/fixtures/run_logging/turbo.json index 94c00331464fa..15ae3fba0a36d 100644 --- a/turborepo-tests/integration/fixtures/run_logging/turbo.json +++ b/turborepo-tests/integration/fixtures/run_logging/turbo.json @@ -1,5 +1,5 @@ { - "pipeline": { + "tasks": { "build": {}, "builderror": {}, "builderror2": { diff --git a/turborepo-tests/integration/fixtures/single_package/turbo.json b/turborepo-tests/integration/fixtures/single_package/turbo.json index bf9ddbce36808..ce5bdbed55601 100644 --- a/turborepo-tests/integration/fixtures/single_package/turbo.json +++ b/turborepo-tests/integration/fixtures/single_package/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turbo.build/schema.json", "globalDependencies": ["somefile.txt"], - "pipeline": { + "tasks": { "build": { "outputs": ["foo.txt"] }, diff --git a/turborepo-tests/integration/fixtures/strict_env_vars/turbo.json b/turborepo-tests/integration/fixtures/strict_env_vars/turbo.json index fb6a143e3f51d..b61b61ca90940 100644 --- a/turborepo-tests/integration/fixtures/strict_env_vars/turbo.json +++ b/turborepo-tests/integration/fixtures/strict_env_vars/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["dist/**"] } diff --git a/turborepo-tests/integration/fixtures/task_dependencies/complex/turbo.json b/turborepo-tests/integration/fixtures/task_dependencies/complex/turbo.json index 998a9d6c6fd46..9c7ae2be4125e 100644 --- a/turborepo-tests/integration/fixtures/task_dependencies/complex/turbo.json +++ b/turborepo-tests/integration/fixtures/task_dependencies/complex/turbo.json @@ -1,5 +1,5 @@ { - "pipeline": { + "tasks": { "build0": { "dependsOn": ["^build0", "prepare"] }, diff --git a/turborepo-tests/integration/fixtures/task_dependencies/overwriting/turbo.json b/turborepo-tests/integration/fixtures/task_dependencies/overwriting/turbo.json index d16b6d0cb2a57..c5241441bea82 100644 --- a/turborepo-tests/integration/fixtures/task_dependencies/overwriting/turbo.json +++ b/turborepo-tests/integration/fixtures/task_dependencies/overwriting/turbo.json @@ -1,5 +1,5 @@ { - "pipeline": { + "tasks": { "build": { "dependsOn": ["generate"] }, diff --git a/turborepo-tests/integration/fixtures/task_dependencies/root-to-workspace/turbo.json b/turborepo-tests/integration/fixtures/task_dependencies/root-to-workspace/turbo.json index 3b0f3d5582dfc..e2d0fdd451f0b 100644 --- a/turborepo-tests/integration/fixtures/task_dependencies/root-to-workspace/turbo.json +++ b/turborepo-tests/integration/fixtures/task_dependencies/root-to-workspace/turbo.json @@ -1,9 +1,7 @@ { - "pipeline": { + "tasks": { "//#mytask": { - "dependsOn": [ - "lib-a#build" - ] + "dependsOn": ["lib-a#build"] }, "build": {} } diff --git a/turborepo-tests/integration/fixtures/task_dependencies/topological/turbo.json b/turborepo-tests/integration/fixtures/task_dependencies/topological/turbo.json index 35f359404228c..ad728338d3903 100644 --- a/turborepo-tests/integration/fixtures/task_dependencies/topological/turbo.json +++ b/turborepo-tests/integration/fixtures/task_dependencies/topological/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"] }, diff --git a/turborepo-tests/integration/fixtures/task_dependencies/workspace-tasks/turbo.json b/turborepo-tests/integration/fixtures/task_dependencies/workspace-tasks/turbo.json index fe53b0720a930..bf3683219f757 100644 --- a/turborepo-tests/integration/fixtures/task_dependencies/workspace-tasks/turbo.json +++ b/turborepo-tests/integration/fixtures/task_dependencies/workspace-tasks/turbo.json @@ -1,5 +1,5 @@ { - "pipeline": { + "tasks": { "build1": {}, "//#build1": {}, diff --git a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs-win.json b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs-win.json index 90ee505b29818..de6732b2eb11d 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs-win.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs-win.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "inputs": ["C:\\another\\absolute\\path", "a\\relative\\path"] } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs.json b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs.json index 4030d358ccade..b4d0dd0f954c5 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-inputs.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "inputs": ["/another/absolute/path", "a/relative/path"] } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs-win.json b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs-win.json index dfc11bdf16efd..ced621aaf819b 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs-win.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs-win.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["C:\\another\\absolute\\path", "a\\relative\\path"] } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs.json b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs.json index 8549776d8bccb..ce38d4e55ca31 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/abs-path-outputs.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["/another/absolute/path", "a/relative/path"] } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/gitignored-inputs.json b/turborepo-tests/integration/fixtures/turbo-configs/gitignored-inputs.json index 03679e958de7a..8a66d16710ca6 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/gitignored-inputs.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/gitignored-inputs.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "inputs": ["internal.txt"] } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/interactive.json b/turborepo-tests/integration/fixtures/turbo-configs/interactive.json index 56baec07fe610..043c0250487a0 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/interactive.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/interactive.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "interactive": true } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/invalid-env-var.json b/turborepo-tests/integration/fixtures/turbo-configs/invalid-env-var.json index a97adf5692d34..13bacf4dbe644 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/invalid-env-var.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/invalid-env-var.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV", "$FOOBAR"], "outputs": [] diff --git a/turborepo-tests/integration/fixtures/turbo-configs/package-task.json b/turborepo-tests/integration/fixtures/turbo-configs/package-task.json index 5ef775e5892ae..4074a4b5e8f23 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/package-task.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/package-task.json @@ -3,7 +3,7 @@ "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], "extends": ["//"], - "pipeline": { + "tasks": { // this comment verifies that turbo can read .json files with comments "my-app#build": { "outputs": ["banana.txt", "apple.json"], diff --git a/turborepo-tests/integration/fixtures/turbo-configs/parse-error.json b/turborepo-tests/integration/fixtures/turbo-configs/parse-error.json index 15d3d9546a80d..ef5188f09f1ca 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/parse-error.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/parse-error.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"],, "outputs": [] diff --git a/turborepo-tests/integration/fixtures/turbo-configs/spaces-failure.json b/turborepo-tests/integration/fixtures/turbo-configs/spaces-failure.json index bef35a6246b31..e325ffa7eb0f0 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/spaces-failure.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/spaces-failure.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/all.json b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/all.json index 1432fa2ad354e..c854bbf60f54f 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/all.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/all.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["dist/**"], "passThroughEnv": ["LOCAL_VAR_PT"], diff --git a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt-empty.json b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt-empty.json index 16e1ab9636a95..0d9986ea82da7 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt-empty.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt-empty.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["dist/**"] } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt.json b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt.json index ae7f1281aaa29..420a12f632dfd 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/global_pt.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["dist/**"] } diff --git a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt-empty.json b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt-empty.json index 0bdf3e397595c..9fcd9ce443750 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt-empty.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt-empty.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["dist/**"], "passThroughEnv": [] diff --git a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt.json b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt.json index 905b853753b61..600c1381b217f 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/strict_env_vars/task_pt.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": ["dist/**"], "passThroughEnv": ["LOCAL_VAR_PT"] diff --git a/turborepo-tests/integration/fixtures/turbo-configs/syntax-error.json b/turborepo-tests/integration/fixtures/turbo-configs/syntax-error.json index 43dc12146e5fd..61f550c77528c 100644 --- a/turborepo-tests/integration/fixtures/turbo-configs/syntax-error.json +++ b/turborepo-tests/integration/fixtures/turbo-configs/syntax-error.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json",, "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV", "$FOOBAR"], "outputs": [] diff --git a/turborepo-tests/integration/fixtures/with-pkg-deps/turbo.json b/turborepo-tests/integration/fixtures/with-pkg-deps/turbo.json index 4216c8201cbcd..07252a496d131 100644 --- a/turborepo-tests/integration/fixtures/with-pkg-deps/turbo.json +++ b/turborepo-tests/integration/fixtures/with-pkg-deps/turbo.json @@ -1,10 +1,8 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { - "dependsOn": [ - "^build" - ] + "dependsOn": ["^build"] } } } diff --git a/turborepo-tests/integration/tests/dry-json/single-package-with-deps.t b/turborepo-tests/integration/tests/dry-json/single-package-with-deps.t index 35d0edd676973..517a952462898 100644 --- a/turborepo-tests/integration/tests/dry-json/single-package-with-deps.t +++ b/turborepo-tests/integration/tests/dry-json/single-package-with-deps.t @@ -32,13 +32,13 @@ Setup { "taskId": "build", "task": "build", - "hash": "45fcb56a23295f63", + "hash": "e48ea8d453fe3216", "inputs": { ".gitignore": "03b541460c1b836f96f9c0a941ceb48e91a9fd83", "package-lock.json": "1c117cce37347befafe3a9cba1b8a609b3600021", "package.json": "8606ff4b95a5330740d8d9d0948faeada64f1f32", "somefile.txt": "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", - "turbo.json": "bf9ddbce36808b6ea5a0ea2b7ceb400ee6c42c4c" + "turbo.json": "ce5bdbed55601768de641f5d8d005a8f5be8d3f7" }, "hashOfExternalDependencies": "", "cache": { @@ -89,13 +89,13 @@ Setup { "taskId": "test", "task": "test", - "hash": "314a0e5a10072ae2", + "hash": "92fa9e0daec0e1ec", "inputs": { ".gitignore": "03b541460c1b836f96f9c0a941ceb48e91a9fd83", "package-lock.json": "1c117cce37347befafe3a9cba1b8a609b3600021", "package.json": "8606ff4b95a5330740d8d9d0948faeada64f1f32", "somefile.txt": "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", - "turbo.json": "bf9ddbce36808b6ea5a0ea2b7ceb400ee6c42c4c" + "turbo.json": "ce5bdbed55601768de641f5d8d005a8f5be8d3f7" }, "hashOfExternalDependencies": "", "cache": { diff --git a/turborepo-tests/integration/tests/dry-json/single-package.t b/turborepo-tests/integration/tests/dry-json/single-package.t index a56c44dcc8790..4614cc7256104 100644 --- a/turborepo-tests/integration/tests/dry-json/single-package.t +++ b/turborepo-tests/integration/tests/dry-json/single-package.t @@ -32,13 +32,13 @@ Setup { "taskId": "build", "task": "build", - "hash": "45fcb56a23295f63", + "hash": "e48ea8d453fe3216", "inputs": { ".gitignore": "03b541460c1b836f96f9c0a941ceb48e91a9fd83", "package-lock.json": "1c117cce37347befafe3a9cba1b8a609b3600021", "package.json": "8606ff4b95a5330740d8d9d0948faeada64f1f32", "somefile.txt": "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", - "turbo.json": "bf9ddbce36808b6ea5a0ea2b7ceb400ee6c42c4c" + "turbo.json": "ce5bdbed55601768de641f5d8d005a8f5be8d3f7" }, "hashOfExternalDependencies": "", "cache": { diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/1-baseline.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/1-baseline.json index 9c9c4ee347ff4..fc3749db3fd1e 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/1-baseline.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/1-baseline.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/2-update-pipeline.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/2-update-pipeline.json index d75c02b701257..a8162a1ebb8fa 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/2-update-pipeline.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/2-update-pipeline.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV", "NEW_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/3-update-global-env.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/3-update-global-env.json index 4966c92b5f6b9..d09d9cdcce8aa 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/3-update-global-env.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/3-update-global-env.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR", "NEW_ENV"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/4-update-global-deps.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/4-update-global-deps.json index eb0cad40ff0a4..efd6a141e0d1b 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/4-update-global-deps.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/4-update-global-deps.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo*.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/5-update-global-deps-materially.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/5-update-global-deps-materially.json index 7392198df3957..7dac14e455a1a 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/5-update-global-deps-materially.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/5-update-global-deps-materially.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt", "bar.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/6-update-passthrough-env.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/6-update-passthrough-env.json index 0e7e6f2413e56..ce8ddf25f4ffe 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/6-update-passthrough-env.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/6-update-passthrough-env.json @@ -3,7 +3,7 @@ "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], "globalPassThroughEnv": ["PASSTHROUGH"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/a-baseline.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/a-baseline.json index 9c9c4ee347ff4..fc3749db3fd1e 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/a-baseline.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/a-baseline.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/b-change-only-my-app.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/b-change-only-my-app.json index d14227552234b..ee6f8ba3a2e10 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/b-change-only-my-app.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/b-change-only-my-app.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/c-my-app-depends-on.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/c-my-app-depends-on.json index 6f3d11a73b231..40222c6d60146 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/c-my-app-depends-on.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/c-my-app-depends-on.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/d-depends-on-util.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/d-depends-on-util.json index 6de9c73c20174..998363166ddb7 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/d-depends-on-util.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/d-depends-on-util.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/e-depends-on-util-but-modified.json b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/e-depends-on-util-but-modified.json index 7f8f9e34929d6..2ec766c54c822 100644 --- a/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/e-depends-on-util-but-modified.json +++ b/turborepo-tests/integration/tests/edit-turbo-json/fixture-configs/e-depends-on-util-but-modified.json @@ -2,7 +2,7 @@ "$schema": "https://turbo.build/schema.json", "globalDependencies": ["foo.txt"], "globalEnv": ["SOME_ENV_VAR"], - "pipeline": { + "tasks": { "build": { "env": ["NODE_ENV"], "outputs": [] diff --git a/turborepo-tests/integration/tests/prune/composable-config.t b/turborepo-tests/integration/tests/prune/composable-config.t index ca8d88fd19080..a1d3038aab1b4 100644 --- a/turborepo-tests/integration/tests/prune/composable-config.t +++ b/turborepo-tests/integration/tests/prune/composable-config.t @@ -11,7 +11,7 @@ Make sure that the internal util package is part of the prune output \xe2\x80\xa2 Packages in scope: docs, shared, util (esc) \xe2\x80\xa2 Running new-task in 3 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - docs:new-task: cache miss, executing caf7e46550cd3151 + docs:new-task: cache miss, executing 0fb91dc0d3d46797 docs:new-task: docs:new-task: > docs@ new-task .*out(\/|\\)apps(\/|\\)docs (re) docs:new-task: > echo building diff --git a/turborepo-tests/integration/tests/prune/produces-valid-turbo-json.t b/turborepo-tests/integration/tests/prune/produces-valid-turbo-json.t index 5173bed41a654..8614ec80376de 100644 --- a/turborepo-tests/integration/tests/prune/produces-valid-turbo-json.t +++ b/turborepo-tests/integration/tests/prune/produces-valid-turbo-json.t @@ -12,7 +12,7 @@ Make sure we prune tasks that reference a pruned workspace $ cat out/turbo.json | jq { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "outputs": [] } diff --git a/turborepo-tests/integration/tests/run-caching/excluded-inputs/turbo.json b/turborepo-tests/integration/tests/run-caching/excluded-inputs/turbo.json index c3d2f67aebdaa..c0ee2fe496d84 100644 --- a/turborepo-tests/integration/tests/run-caching/excluded-inputs/turbo.json +++ b/turborepo-tests/integration/tests/run-caching/excluded-inputs/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { + "tasks": { "build": { "inputs": ["*.txt", "!excluded.txt"], "outputs": ["banana.txt", "apple.json"] diff --git a/turborepo-tests/integration/tests/run/single-package/dry-run.t b/turborepo-tests/integration/tests/run/single-package/dry-run.t index 3a90872232b13..beb69607169c4 100644 --- a/turborepo-tests/integration/tests/run/single-package/dry-run.t +++ b/turborepo-tests/integration/tests/run/single-package/dry-run.t @@ -18,7 +18,7 @@ Check Tasks to Run build Task = build\s* (re) - Hash = 45fcb56a23295f63 + Hash = e48ea8d453fe3216\s* (re) Cached \(Local\) = false\s* (re) Cached \(Remote\) = false\s* (re) Command = echo building > foo.txt\s* (re) diff --git a/turborepo-tests/integration/tests/run/single-package/run-yarn.t b/turborepo-tests/integration/tests/run/single-package/run-yarn.t index 8e457e1ba021f..cf6a88370128a 100644 --- a/turborepo-tests/integration/tests/run/single-package/run-yarn.t +++ b/turborepo-tests/integration/tests/run/single-package/run-yarn.t @@ -5,7 +5,7 @@ Check $ ${TURBO} run build \xe2\x80\xa2 Running build (esc) \xe2\x80\xa2 Remote caching disabled (esc) - build: cache miss, executing c1d6153f4a6d83b5 + build: cache miss, executing 72f505390b93a0dc build: yarn run v1.22.17 build: warning package.json: No license field build: $ echo building > foo.txt @@ -18,7 +18,7 @@ Check $ ${TURBO} run build \xe2\x80\xa2 Running build (esc) \xe2\x80\xa2 Remote caching disabled (esc) - build: cache hit, replaying logs c1d6153f4a6d83b5 + build: cache hit, replaying logs 72f505390b93a0dc build: yarn run v1.22.17 build: warning package.json: No license field build: $ echo building > foo.txt @@ -27,4 +27,4 @@ Check Tasks: 1 successful, 1 total Cached: 1 cached, 1 total Time:\s*[\.0-9]+m?s >>> FULL TURBO (re) - \ No newline at end of file + diff --git a/turborepo-tests/integration/tests/run/single-package/run.t b/turborepo-tests/integration/tests/run/single-package/run.t index de4290a16e20f..ddd35c299b53a 100644 --- a/turborepo-tests/integration/tests/run/single-package/run.t +++ b/turborepo-tests/integration/tests/run/single-package/run.t @@ -5,7 +5,7 @@ Check $ ${TURBO} run build \xe2\x80\xa2 Running build (esc) \xe2\x80\xa2 Remote caching disabled (esc) - build: cache miss, executing 45fcb56a23295f63 + build: cache miss, executing e48ea8d453fe3216 build: build: > build build: > echo building > foo.txt @@ -22,7 +22,7 @@ Run a second time, verify caching works because there is a config $ ${TURBO} run build \xe2\x80\xa2 Running build (esc) \xe2\x80\xa2 Remote caching disabled (esc) - build: cache hit, replaying logs 45fcb56a23295f63 + build: cache hit, replaying logs e48ea8d453fe3216 build: build: > build build: > echo building > foo.txt @@ -31,4 +31,4 @@ Run a second time, verify caching works because there is a config Tasks: 1 successful, 1 total Cached: 1 cached, 1 total Time:\s*[\.0-9]+m?s >>> FULL TURBO (re) - \ No newline at end of file + diff --git a/turborepo-tests/integration/tests/run/single-package/with-deps-dry-run.t b/turborepo-tests/integration/tests/run/single-package/with-deps-dry-run.t index eda313d048e60..72b55ae27da01 100644 --- a/turborepo-tests/integration/tests/run/single-package/with-deps-dry-run.t +++ b/turborepo-tests/integration/tests/run/single-package/with-deps-dry-run.t @@ -18,7 +18,7 @@ Check Tasks to Run build Task = build\s* (re) - Hash = 45fcb56a23295f63 + Hash = e48ea8d453fe3216\s* (re) Cached \(Local\) = false\s* (re) Cached \(Remote\) = false\s* (re) Command = echo building > foo.txt\s* (re) @@ -37,7 +37,7 @@ Check Framework =\s* (re) test Task = test\s* (re) - Hash = 314a0e5a10072ae2 + Hash = 92fa9e0daec0e1ec\s* (re) Cached \(Local\) = false\s* (re) Cached \(Remote\) = false\s* (re) Command = cat foo.txt\s* (re) diff --git a/turborepo-tests/integration/tests/run/single-package/with-deps-run.t b/turborepo-tests/integration/tests/run/single-package/with-deps-run.t index 2440a21185470..2e6d4064e71a2 100644 --- a/turborepo-tests/integration/tests/run/single-package/with-deps-run.t +++ b/turborepo-tests/integration/tests/run/single-package/with-deps-run.t @@ -5,12 +5,12 @@ Check $ ${TURBO} run test \xe2\x80\xa2 Running test (esc) \xe2\x80\xa2 Remote caching disabled (esc) - build: cache miss, executing 45fcb56a23295f63 + build: cache miss, executing e48ea8d453fe3216 build: build: > build build: > echo building > foo.txt build: - test: cache miss, executing 314a0e5a10072ae2 + test: cache miss, executing 92fa9e0daec0e1ec test: test: > test test: > cat foo.txt @@ -25,12 +25,12 @@ Run a second time, verify caching works because there is a config $ ${TURBO} run test \xe2\x80\xa2 Running test (esc) \xe2\x80\xa2 Remote caching disabled (esc) - build: cache hit, replaying logs 45fcb56a23295f63 + build: cache hit, replaying logs e48ea8d453fe3216 build: build: > build build: > echo building > foo.txt build: - test: cache hit, replaying logs 314a0e5a10072ae2 + test: cache hit, replaying logs 92fa9e0daec0e1ec test: test: > test test: > cat foo.txt @@ -45,8 +45,8 @@ Run with --output-logs=hash-only $ ${TURBO} run test --output-logs=hash-only \xe2\x80\xa2 Running test (esc) \xe2\x80\xa2 Remote caching disabled (esc) - build: cache hit, suppressing logs 45fcb56a23295f63 - test: cache hit, suppressing logs 314a0e5a10072ae2 + build: cache hit, suppressing logs e48ea8d453fe3216 + test: cache hit, suppressing logs 92fa9e0daec0e1ec Tasks: 2 successful, 2 total Cached: 2 cached, 2 total diff --git a/turborepo-tests/integration/tests/task-dependencies/root-worksapce.t b/turborepo-tests/integration/tests/task-dependencies/root-worksapce.t index e59b98213a0be..cbe08ffe4fea3 100644 --- a/turborepo-tests/integration/tests/task-dependencies/root-worksapce.t +++ b/turborepo-tests/integration/tests/task-dependencies/root-worksapce.t @@ -11,7 +11,7 @@ This tests asserts that root tasks can depend on workspace#task lib-a:build: > echo build-lib-a lib-a:build: lib-a:build: build-lib-a - //:mytask: cache miss, executing 8546b6a2ce1f1d1f + //:mytask: cache miss, executing 43a7ee3e788e9884 //:mytask: //:mytask: > mytask //:mytask: > echo root-mytask @@ -21,4 +21,4 @@ This tests asserts that root tasks can depend on workspace#task Tasks: 2 successful, 2 total Cached: 0 cached, 2 total Time:\s*[\.0-9ms]+ (re) - \ No newline at end of file + diff --git a/turborepo-tests/integration/tests/workspace-configs/add-keys.t b/turborepo-tests/integration/tests/workspace-configs/add-keys.t index 4e7510d245ee4..d1ee395622eb2 100644 --- a/turborepo-tests/integration/tests/workspace-configs/add-keys.t +++ b/turborepo-tests/integration/tests/workspace-configs/add-keys.t @@ -14,13 +14,13 @@ Setup \xe2\x80\xa2 Packages in scope: add-keys (esc) \xe2\x80\xa2 Running add-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - add-keys:add-keys-underlying-task: cache miss, executing d25daf30e7a100a5 + add-keys:add-keys-underlying-task: cache miss, executing 3f949b336a7c0682 add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: > add-keys-underlying-task add-keys:add-keys-underlying-task: > echo running-add-keys-underlying-task add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: running-add-keys-underlying-task - add-keys:add-keys-task: cache miss, executing 4c7146b3c1c06bb2 + add-keys:add-keys-task: cache miss, executing 2d68b2b4d0de7dff add-keys:add-keys-task: add-keys:add-keys-task: > add-keys-task add-keys:add-keys-task: > echo running-add-keys-task > out/foo.min.txt @@ -42,13 +42,13 @@ Setup \xe2\x80\xa2 Packages in scope: add-keys (esc) \xe2\x80\xa2 Running add-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - add-keys:add-keys-underlying-task: cache hit, replaying logs d25daf30e7a100a5 + add-keys:add-keys-underlying-task: cache hit, replaying logs 3f949b336a7c0682 add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: > add-keys-underlying-task add-keys:add-keys-underlying-task: > echo running-add-keys-underlying-task add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: running-add-keys-underlying-task - add-keys:add-keys-task: cache hit, suppressing logs 4c7146b3c1c06bb2 + add-keys:add-keys-task: cache hit, suppressing logs 2d68b2b4d0de7dff Tasks: 2 successful, 2 total Cached: 2 cached, 2 total @@ -60,13 +60,13 @@ Setup \xe2\x80\xa2 Packages in scope: add-keys (esc) \xe2\x80\xa2 Running add-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - add-keys:add-keys-underlying-task: cache miss, executing 9ef1856ccb467daf + add-keys:add-keys-underlying-task: cache miss, executing c898b461c762109e add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: > add-keys-underlying-task add-keys:add-keys-underlying-task: > echo running-add-keys-underlying-task add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: running-add-keys-underlying-task - add-keys:add-keys-task: cache miss, executing 512794a64d2a1f5e + add-keys:add-keys-task: cache miss, executing f6215c2d01b0a3d6 add-keys:add-keys-task: add-keys:add-keys-task: > add-keys-task add-keys:add-keys-task: > echo running-add-keys-task > out/foo.min.txt @@ -81,13 +81,13 @@ Setup \xe2\x80\xa2 Packages in scope: add-keys (esc) \xe2\x80\xa2 Running add-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - add-keys:add-keys-underlying-task: cache hit, replaying logs 9ef1856ccb467daf + add-keys:add-keys-underlying-task: cache hit, replaying logs c898b461c762109e add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: > add-keys-underlying-task add-keys:add-keys-underlying-task: > echo running-add-keys-underlying-task add-keys:add-keys-underlying-task: add-keys:add-keys-underlying-task: running-add-keys-underlying-task - add-keys:add-keys-task: cache miss, executing 69c0f4c312f9c15e + add-keys:add-keys-task: cache miss, executing bd4d6cef8c9e78be add-keys:add-keys-task: add-keys:add-keys-task: > add-keys-task add-keys:add-keys-task: > echo running-add-keys-task > out/foo.min.txt diff --git a/turborepo-tests/integration/tests/workspace-configs/add-tasks.t b/turborepo-tests/integration/tests/workspace-configs/add-tasks.t index 8728b21349f9e..5cf747cc0a401 100644 --- a/turborepo-tests/integration/tests/workspace-configs/add-tasks.t +++ b/turborepo-tests/integration/tests/workspace-configs/add-tasks.t @@ -5,7 +5,7 @@ Setup \xe2\x80\xa2 Packages in scope: add-tasks (esc) \xe2\x80\xa2 Running added-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - add-tasks:added-task: cache miss, executing 79780b288549784d + add-tasks:added-task: cache miss, executing 0c5330f15cf6887a add-tasks:added-task: add-tasks:added-task: > added-task add-tasks:added-task: > echo running-added-task > out/foo.min.txt @@ -14,4 +14,4 @@ Setup Tasks: 1 successful, 1 total Cached: 0 cached, 1 total Time:\s+[.0-9]+m?s (re) - \ No newline at end of file + diff --git a/turborepo-tests/integration/tests/workspace-configs/bad-json.t b/turborepo-tests/integration/tests/workspace-configs/bad-json.t index 73a547ae5790e..7081aa1dfb632 100644 --- a/turborepo-tests/integration/tests/workspace-configs/bad-json.t +++ b/turborepo-tests/integration/tests/workspace-configs/bad-json.t @@ -2,7 +2,7 @@ Setup $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh composable_config # Put some bad JSON into the turbo.json in this app - $ echo '{"pipeline": {"trailing-comma": {},}}' > "$TARGET_DIR/apps/bad-json/turbo.json" + $ echo '{"tasks": {"trailing-comma": {},}}' > "$TARGET_DIR/apps/bad-json/turbo.json" # The test is greping from a logfile because the list of errors can appear in any order # Errors are shown if we run across a malformed turbo.json diff --git a/turborepo-tests/integration/tests/workspace-configs/cache.t b/turborepo-tests/integration/tests/workspace-configs/cache.t index 4fdc1a837d28f..ca70f3a11182b 100644 --- a/turborepo-tests/integration/tests/workspace-configs/cache.t +++ b/turborepo-tests/integration/tests/workspace-configs/cache.t @@ -13,7 +13,7 @@ This test covers: \xe2\x80\xa2 Packages in scope: cached (esc) \xe2\x80\xa2 Running cached-task-1 in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - cached:cached-task-1: cache miss, executing 21346f9dc1d8f091 + cached:cached-task-1: cache miss, executing afd2b0c00a8996af cached:cached-task-1: cached:cached-task-1: > cached-task-1 cached:cached-task-1: > echo cached-task-1 > out/foo.min.txt @@ -38,7 +38,7 @@ This test covers: \xe2\x80\xa2 Packages in scope: cached (esc) \xe2\x80\xa2 Running cached-task-2 in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - cached:cached-task-2: cache bypass, force executing bf7e4ca31119a2ca + cached:cached-task-2: cache bypass, force executing 6580d2dfa8add55b cached:cached-task-2: cached:cached-task-2: > cached-task-2 cached:cached-task-2: > echo cached-task-2 > out/foo.min.txt @@ -60,7 +60,7 @@ no `cache` config in root, cache:false in workspace \xe2\x80\xa2 Packages in scope: cached (esc) \xe2\x80\xa2 Running cached-task-3 in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - cached:cached-task-3: cache bypass, force executing 5a6c15882980e64c + cached:cached-task-3: cache bypass, force executing 1df473e4a0ec177d cached:cached-task-3: cached:cached-task-3: > cached-task-3 cached:cached-task-3: > echo cached-task-3 > out/foo.min.txt diff --git a/turborepo-tests/integration/tests/workspace-configs/config-change.t b/turborepo-tests/integration/tests/workspace-configs/config-change.t index 4312c38045cb6..812526169b994 100644 --- a/turborepo-tests/integration/tests/workspace-configs/config-change.t +++ b/turborepo-tests/integration/tests/workspace-configs/config-change.t @@ -3,13 +3,13 @@ Setup # 1. First run, check the hash $ ${TURBO} run config-change-task --filter=config-change --dry=json | jq .tasks[0].hash - "58fafdfda3030039" + "b795d055df35b872" 2. Run again and assert task hash stays the same $ ${TURBO} run config-change-task --filter=config-change --dry=json | jq .tasks[0].hash - "58fafdfda3030039" + "b795d055df35b872" 3. Change turbo.json and assert that hash changes $ cp $TARGET_DIR/apps/config-change/turbo-changed.json $TARGET_DIR/apps/config-change/turbo.json $ ${TURBO} run config-change-task --filter=config-change --dry=json | jq .tasks[0].hash - "5c193e0718f3a05b" + "5ab2f944ad74ef44" diff --git a/turborepo-tests/integration/tests/workspace-configs/cross-workspace.t b/turborepo-tests/integration/tests/workspace-configs/cross-workspace.t index 9b2592839bad4..51519bd0d2cce 100644 --- a/turborepo-tests/integration/tests/workspace-configs/cross-workspace.t +++ b/turborepo-tests/integration/tests/workspace-configs/cross-workspace.t @@ -4,13 +4,13 @@ Setup \xe2\x80\xa2 Packages in scope: cross-workspace (esc) \xe2\x80\xa2 Running cross-workspace-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - blank-pkg:cross-workspace-underlying-task: cache miss, executing 13256295c40d6836 + blank-pkg:cross-workspace-underlying-task: cache miss, executing 791d863fb4d9b806 blank-pkg:cross-workspace-underlying-task: blank-pkg:cross-workspace-underlying-task: > cross-workspace-underlying-task blank-pkg:cross-workspace-underlying-task: > echo cross-workspace-underlying-task from blank-pkg blank-pkg:cross-workspace-underlying-task: blank-pkg:cross-workspace-underlying-task: cross-workspace-underlying-task from blank-pkg - cross-workspace:cross-workspace-task: cache miss, executing f386c2eceecb7035 + cross-workspace:cross-workspace-task: cache miss, executing a412d64fde39f2be cross-workspace:cross-workspace-task: cross-workspace:cross-workspace-task: > cross-workspace-task cross-workspace:cross-workspace-task: > echo cross-workspace-task diff --git a/turborepo-tests/integration/tests/workspace-configs/missing-workspace-config-deps.t b/turborepo-tests/integration/tests/workspace-configs/missing-workspace-config-deps.t index 1ae76b8d680f5..6bd8b9a887db7 100644 --- a/turborepo-tests/integration/tests/workspace-configs/missing-workspace-config-deps.t +++ b/turborepo-tests/integration/tests/workspace-configs/missing-workspace-config-deps.t @@ -15,7 +15,7 @@ Setup \xe2\x80\xa2 Remote caching disabled (esc) $ cat tmp.log | grep "missing-workspace-config:missing-workspace-config-task-with-deps" - missing-workspace-config:missing-workspace-config-task-with-deps: cache miss, executing cb5a7b7c7ef29b91 + missing-workspace-config:missing-workspace-config-task-with-deps: cache miss, executing c151f24ca66771e5 missing-workspace-config:missing-workspace-config-task-with-deps: missing-workspace-config:missing-workspace-config-task-with-deps: > missing-workspace-config-task-with-deps missing-workspace-config:missing-workspace-config-task-with-deps: > echo running-missing-workspace-config-task-with-deps > out/foo.min.txt @@ -30,7 +30,7 @@ Setup missing-workspace-config:missing-workspace-config-underlying-task: running-missing-workspace-config-underlying-task $ cat tmp.log | grep "blank-pkg:missing-workspace-config-underlying-topo-task" - blank-pkg:missing-workspace-config-underlying-topo-task: cache miss, executing 86d7535cfbce352a + blank-pkg:missing-workspace-config-underlying-topo-task: cache miss, executing 360fb5a29b92db26 blank-pkg:missing-workspace-config-underlying-topo-task: blank-pkg:missing-workspace-config-underlying-topo-task: > missing-workspace-config-underlying-topo-task blank-pkg:missing-workspace-config-underlying-topo-task: > echo missing-workspace-config-underlying-topo-task from blank-pkg diff --git a/turborepo-tests/integration/tests/workspace-configs/omit-keys-deps.t b/turborepo-tests/integration/tests/workspace-configs/omit-keys-deps.t index d44e5307fa1c0..cab8c22b937d5 100644 --- a/turborepo-tests/integration/tests/workspace-configs/omit-keys-deps.t +++ b/turborepo-tests/integration/tests/workspace-configs/omit-keys-deps.t @@ -15,14 +15,14 @@ Setup \xe2\x80\xa2 Running omit-keys-task-with-deps in 1 packages (esc) $ cat tmp.log | grep "omit-keys:omit-keys-task-with-deps" - omit-keys:omit-keys-task-with-deps: cache miss, executing 9a01368558ebb03f + omit-keys:omit-keys-task-with-deps: cache miss, executing f25fd75100c8bbc8 omit-keys:omit-keys-task-with-deps: omit-keys:omit-keys-task-with-deps: > omit-keys-task-with-deps omit-keys:omit-keys-task-with-deps: > echo running-omit-keys-task-with-deps > out/foo.min.txt omit-keys:omit-keys-task-with-deps: $ cat tmp.log | grep "omit-keys:omit-keys-underlying-task" - omit-keys:omit-keys-underlying-task: cache miss, executing a2db581d4cbbd3d6 + omit-keys:omit-keys-underlying-task: cache miss, executing 43511d15677eaa27 omit-keys:omit-keys-underlying-task: omit-keys:omit-keys-underlying-task: > omit-keys-underlying-task omit-keys:omit-keys-underlying-task: > echo running-omit-keys-underlying-task @@ -30,7 +30,7 @@ Setup omit-keys:omit-keys-underlying-task: running-omit-keys-underlying-task $ cat tmp.log | grep "blank-pkg:omit-keys-underlying-topo-task" - blank-pkg:omit-keys-underlying-topo-task: cache miss, executing e14022a5380dbf76 + blank-pkg:omit-keys-underlying-topo-task: cache miss, executing e9fad778a6d981e0 blank-pkg:omit-keys-underlying-topo-task: blank-pkg:omit-keys-underlying-topo-task: > omit-keys-underlying-topo-task blank-pkg:omit-keys-underlying-topo-task: > echo omit-keys-underlying-topo-task from blank-pkg diff --git a/turborepo-tests/integration/tests/workspace-configs/omit-keys.t b/turborepo-tests/integration/tests/workspace-configs/omit-keys.t index d5d50a159713a..663cc1e06638a 100644 --- a/turborepo-tests/integration/tests/workspace-configs/omit-keys.t +++ b/turborepo-tests/integration/tests/workspace-configs/omit-keys.t @@ -14,7 +14,7 @@ Setup \xe2\x80\xa2 Packages in scope: omit-keys (esc) \xe2\x80\xa2 Running omit-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - omit-keys:omit-keys-task: cache miss, executing 0e2764d66f4e31cb + omit-keys:omit-keys-task: cache miss, executing c2b676fcb84b4e03 omit-keys:omit-keys-task: omit-keys:omit-keys-task: > omit-keys-task omit-keys:omit-keys-task: > echo running-omit-keys-task > out/foo.min.txt @@ -36,7 +36,7 @@ Setup \xe2\x80\xa2 Packages in scope: omit-keys (esc) \xe2\x80\xa2 Running omit-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - omit-keys:omit-keys-task: cache hit, suppressing logs 0e2764d66f4e31cb + omit-keys:omit-keys-task: cache hit, suppressing logs c2b676fcb84b4e03 Tasks: 1 successful, 1 total Cached: 1 cached, 1 total @@ -48,7 +48,7 @@ Setup \xe2\x80\xa2 Packages in scope: omit-keys (esc) \xe2\x80\xa2 Running omit-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - omit-keys:omit-keys-task: cache miss, executing 610b5c185bcefc0c + omit-keys:omit-keys-task: cache miss, executing 8b89b146ef1ffbf0 omit-keys:omit-keys-task: omit-keys:omit-keys-task: > omit-keys-task omit-keys:omit-keys-task: > echo running-omit-keys-task > out/foo.min.txt @@ -65,7 +65,7 @@ Setup \xe2\x80\xa2 Packages in scope: omit-keys (esc) \xe2\x80\xa2 Running omit-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - omit-keys:omit-keys-task: cache hit, suppressing logs 610b5c185bcefc0c + omit-keys:omit-keys-task: cache hit, suppressing logs 8b89b146ef1ffbf0 Tasks: 1 successful, 1 total Cached: 1 cached, 1 total @@ -76,7 +76,7 @@ Setup \xe2\x80\xa2 Packages in scope: omit-keys (esc) \xe2\x80\xa2 Running omit-keys-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - omit-keys:omit-keys-task: cache miss, executing f4229f7e07a5c9b1 + omit-keys:omit-keys-task: cache miss, executing 4dfc7e5dc9674f95 omit-keys:omit-keys-task: omit-keys:omit-keys-task: > omit-keys-task omit-keys:omit-keys-task: > echo running-omit-keys-task > out/foo.min.txt diff --git a/turborepo-tests/integration/tests/workspace-configs/override-values-deps.t b/turborepo-tests/integration/tests/workspace-configs/override-values-deps.t index c7639a7102b24..17d07cef3c6ec 100644 --- a/turborepo-tests/integration/tests/workspace-configs/override-values-deps.t +++ b/turborepo-tests/integration/tests/workspace-configs/override-values-deps.t @@ -12,7 +12,7 @@ Setup \xe2\x80\xa2 Packages in scope: override-values (esc) \xe2\x80\xa2 Running override-values-task-with-deps in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - override-values:override-values-task-with-deps: cache miss, executing e80ec3c530793663 + override-values:override-values-task-with-deps: cache miss, executing c3c6987056362501 override-values:override-values-task-with-deps: override-values:override-values-task-with-deps: > override-values-task-with-deps override-values:override-values-task-with-deps: > echo running-override-values-task-with-deps > out/foo.min.txt diff --git a/turborepo-tests/integration/tests/workspace-configs/override-values.t b/turborepo-tests/integration/tests/workspace-configs/override-values.t index a3a6527c44656..523181dbb602a 100644 --- a/turborepo-tests/integration/tests/workspace-configs/override-values.t +++ b/turborepo-tests/integration/tests/workspace-configs/override-values.t @@ -11,7 +11,7 @@ Setup \xe2\x80\xa2 Packages in scope: override-values (esc) \xe2\x80\xa2 Running override-values-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - override-values:override-values-task: cache miss, executing 87924bee003e84fe + override-values:override-values-task: cache miss, executing b56cb877f87bf1f9 override-values:override-values-task: override-values:override-values-task: > override-values-task override-values:override-values-task: > echo running-override-values-task > lib/bar.min.txt @@ -33,7 +33,7 @@ Setup \xe2\x80\xa2 Packages in scope: override-values (esc) \xe2\x80\xa2 Running override-values-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - override-values:override-values-task: cache hit, replaying logs 87924bee003e84fe + override-values:override-values-task: cache hit, replaying logs b56cb877f87bf1f9 override-values:override-values-task: override-values:override-values-task: > override-values-task override-values:override-values-task: > echo running-override-values-task > lib/bar.min.txt @@ -49,7 +49,7 @@ Setup \xe2\x80\xa2 Packages in scope: override-values (esc) \xe2\x80\xa2 Running override-values-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - override-values:override-values-task: cache miss, executing f4a52702cd7910e3 + override-values:override-values-task: cache miss, executing 4ac0e68522256f92 override-values:override-values-task: override-values:override-values-task: > override-values-task override-values:override-values-task: > echo running-override-values-task > lib/bar.min.txt @@ -65,7 +65,7 @@ Setup \xe2\x80\xa2 Packages in scope: override-values (esc) \xe2\x80\xa2 Running override-values-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - override-values:override-values-task: cache hit, replaying logs f4a52702cd7910e3 + override-values:override-values-task: cache hit, replaying logs 4ac0e68522256f92 override-values:override-values-task: override-values:override-values-task: > override-values-task override-values:override-values-task: > echo running-override-values-task > lib/bar.min.txt @@ -80,7 +80,7 @@ Setup \xe2\x80\xa2 Packages in scope: override-values (esc) \xe2\x80\xa2 Running override-values-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - override-values:override-values-task: cache miss, executing d0863c55324d2752 + override-values:override-values-task: cache miss, executing 40bcc05a158ee40d override-values:override-values-task: override-values:override-values-task: > override-values-task override-values:override-values-task: > echo running-override-values-task > lib/bar.min.txt @@ -95,7 +95,7 @@ Setup \xe2\x80\xa2 Packages in scope: override-values (esc) \xe2\x80\xa2 Running override-values-task in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - override-values:override-values-task: cache hit, replaying logs d0863c55324d2752 + override-values:override-values-task: cache hit, replaying logs 40bcc05a158ee40d override-values:override-values-task: override-values:override-values-task: > override-values-task override-values:override-values-task: > echo running-override-values-task > lib/bar.min.txt diff --git a/turborepo-tests/integration/tests/workspace-configs/persistent.t b/turborepo-tests/integration/tests/workspace-configs/persistent.t index 6b7db5b88ffd0..82241d3794b2a 100644 --- a/turborepo-tests/integration/tests/workspace-configs/persistent.t +++ b/turborepo-tests/integration/tests/workspace-configs/persistent.t @@ -30,13 +30,13 @@ This test covers: \xe2\x80\xa2 Packages in scope: persistent (esc) \xe2\x80\xa2 Running persistent-task-2-parent in 1 packages (esc) \xe2\x80\xa2 Remote caching disabled (esc) - persistent:persistent-task-2: cache miss, executing 37375b286d724c01 + persistent:persistent-task-2: cache miss, executing 051e4c844cef1000 persistent:persistent-task-2: persistent:persistent-task-2: > persistent-task-2 persistent:persistent-task-2: > echo persistent-task-2 persistent:persistent-task-2: persistent:persistent-task-2: persistent-task-2 - persistent:persistent-task-2-parent: cache miss, executing dfc8c20283d7826a + persistent:persistent-task-2-parent: cache miss, executing 938a86455b404310 persistent:persistent-task-2-parent: persistent:persistent-task-2-parent: > persistent-task-2-parent persistent:persistent-task-2-parent: > echo persistent-task-2-parent