chore: remove globalDotEnv and dotEnv fields (#8181)

This PR removes `globalDotEnv`/`dotEnv` in favor of `globalDependencies`
and `inputs` which is now fairly ergonomic to use with the addition of
`$TURBO_DEFAULTS$`.

This PR does *not* update the corresponding JS types.

Updated existing integration tests

crates/turborepo-lib/src/engine/mod.rs

@@ -16,7 +16,6 @@ use petgraph::Graph;
 use thiserror::Error;
 use turborepo_errors::Spanned;
 use turborepo_repository::package_graph::{PackageGraph, PackageName};
-use turborepo_telemetry::events::generic::GenericEventBuilder;
 
 use crate::{run::task_id::TaskId, task_graph::TaskDefinition};
 
@@ -380,12 +379,6 @@ impl Engine<Built> {
         &self.task_definitions
     }
 
-    pub fn track_usage(&self, telemetry: &GenericEventBuilder) {
-        for task in self.task_definitions.values() {
-            telemetry.track_dot_env(task.dot_env.as_deref());
-        }
-    }
-
     pub fn validate(
         &self,
         package_graph: &PackageGraph,

crates/turborepo-lib/src/hash/mod.rs

@@ -60,7 +60,6 @@ pub struct TaskHashable<'a> {
     pub(crate) resolved_env_vars: EnvVarPairs,
     pub(crate) pass_through_env: &'a [String],
     pub(crate) env_mode: ResolvedEnvMode,
-    pub(crate) dot_env: &'a [turbopath::RelativeUnixPathBuf],
 }
 
 #[derive(Debug, Clone)]
@@ -74,7 +73,6 @@ pub struct GlobalHashable<'a> {
     pub pass_through_env: &'a [String],
     pub env_mode: EnvMode,
     pub framework_inference: bool,
-    pub dot_env: &'a [turbopath::RelativeUnixPathBuf],
 }
 
 pub struct LockFilePackages(pub Vec<turborepo_lockfiles::Package>);
@@ -253,15 +251,6 @@ impl From<TaskHashable<'_>> for Builder<HeapAllocator> {
             }
         }
 
-        {
-            let mut dotenv_builder = builder
-                .reborrow()
-                .init_dot_env(task_hashable.dot_env.len() as u32);
-            for (i, env) in task_hashable.dot_env.iter().enumerate() {
-                dotenv_builder.set(i as u32, env.as_str());
-            }
-        }
-
         {
             let mut resolved_env_vars_builder = builder
                 .reborrow()
@@ -352,15 +341,6 @@ impl From<GlobalHashable<'_>> for Builder<HeapAllocator> {
 
         builder.set_framework_inference(hashable.framework_inference);
 
-        {
-            let mut dot_env = builder
-                .reborrow()
-                .init_dot_env(hashable.dot_env.len() as u32);
-            for (i, env) in hashable.dot_env.iter().enumerate() {
-                dot_env.set(i as u32, env.as_str());
-            }
-        }
-
         // We're okay to unwrap here because we haven't hit the nesting
         // limit and the message will not have cycles.
         let size = builder
@@ -407,10 +387,9 @@ mod test {
             resolved_env_vars: vec![],
             pass_through_env: &["pass_thru_env".to_string()],
             env_mode: ResolvedEnvMode::Loose,
-            dot_env: &[turbopath::RelativeUnixPathBuf::new("dotenv".to_string()).unwrap()],
         };
 
-        assert_eq!(task_hashable.hash(), "ff765ee2f83bc034");
+        assert_eq!(task_hashable.hash(), "1f8b13161f57fca1");
     }
 
     #[test]
@@ -431,11 +410,9 @@ mod test {
             pass_through_env: &["pass_through_env".to_string()],
             env_mode: EnvMode::Infer,
             framework_inference: true,
-
-            dot_env: &[turbopath::RelativeUnixPathBuf::new("dotenv".to_string()).unwrap()],
         };
 
-        assert_eq!(global_hash.hash(), "c0ddf8138bd686e8");
+        assert_eq!(global_hash.hash(), "2144612ff08bddb9");
     }
 
     #[test_case(vec![], "459c029558afe716" ; "empty")]

crates/turborepo-lib/src/hash/proto.capnp

@@ -41,7 +41,6 @@ struct GlobalHashable {
   passThroughEnv @5 :List(Text);
   envMode @6 :EnvMode;
   frameworkInference @7 :Bool;
-  dotEnv @8 :List(Text);
 
 
   enum EnvMode {

crates/turborepo-lib/src/run/builder.rs

@@ -337,7 +337,6 @@ impl RunBuilder {
             &root_package_json,
             is_single_package,
         )?;
-        root_turbo_json.track_usage(&run_telemetry);
 
         pkg_dep_graph.validate()?;
 
@@ -375,7 +374,6 @@ impl RunBuilder {
             pkg_dep_graph.remove_package_dependencies();
             engine = self.build_engine(&pkg_dep_graph, &root_turbo_json, &filtered_pkgs)?;
         }
-        engine.track_usage(&run_telemetry);
 
         let color_selector = ColorSelector::default();
 

crates/turborepo-lib/src/run/global_hash.rs

@@ -47,7 +47,6 @@ pub struct GlobalHashableInputs<'a> {
     pub pass_through_env: Option<&'a [String]>,
     pub env_mode: EnvMode,
     pub framework_inference: bool,
-    pub dot_env: Option<&'a [RelativeUnixPathBuf]>,
     pub env_at_execution_start: &'a EnvironmentVariableMap,
 }
 
@@ -63,7 +62,6 @@ pub fn get_global_hash_inputs<'a, L: ?Sized + Lockfile>(
     global_pass_through_env: Option<&'a [String]>,
     env_mode: EnvMode,
     framework_inference: bool,
-    dot_env: Option<&'a [RelativeUnixPathBuf]>,
     hasher: &SCM,
 ) -> Result<GlobalHashableInputs<'a>, Error> {
     let global_hashable_env_vars =
@@ -90,19 +88,7 @@ pub fn get_global_hash_inputs<'a, L: ?Sized + Lockfile>(
         .map(|p| root_path.anchor(p).expect("path should be from root"))
         .collect::<Vec<_>>();
 
-    let mut global_file_hash_map =
-        hasher.get_hashes_for_files(root_path, &global_deps_paths, false)?;
-
-    if !dot_env.unwrap_or_default().is_empty() {
-        let system_dot_env = dot_env
-            .into_iter()
-            .flatten()
-            .map(|p| p.to_anchored_system_path_buf());
-
-        let dot_env_object = hasher.hash_existing_of(root_path, system_dot_env)?;
-
-        global_file_hash_map.extend(dot_env_object);
-    }
+    let global_file_hash_map = hasher.get_hashes_for_files(root_path, &global_deps_paths, false)?;
 
     debug!(
         "external deps hash: {}",
@@ -118,7 +104,6 @@ pub fn get_global_hash_inputs<'a, L: ?Sized + Lockfile>(
         pass_through_env: global_pass_through_env,
         env_mode,
         framework_inference,
-        dot_env,
         env_at_execution_start,
     })
 }
@@ -190,7 +175,6 @@ impl<'a> GlobalHashableInputs<'a> {
             pass_through_env: self.pass_through_env.unwrap_or_default(),
             env_mode: self.env_mode,
             framework_inference: self.framework_inference,
-            dot_env: self.dot_env.unwrap_or_default(),
         };
 
         global_hashable.hash()
@@ -240,7 +224,6 @@ mod tests {
             None,
             EnvMode::Infer,
             false,
-            None,
             &SCM::new(&root),
         );
         assert!(result.is_ok());

crates/turborepo-lib/src/run/mod.rs

@@ -289,7 +289,6 @@ impl Run {
                 pass_through_env,
                 env_mode,
                 self.opts.run_opts.framework_inference,
-                self.root_turbo_json.global_dot_env.as_deref(),
                 &self.scm,
             )?
         };

crates/turborepo-lib/src/run/summary/global_hash.rs

@@ -31,7 +31,6 @@ pub struct GlobalHashSummary<'a> {
     pub root_key: &'static str,
     pub files: BTreeMap<RelativeUnixPathBuf, String>,
     pub hash_of_external_dependencies: &'a str,
-    pub global_dot_env: Option<&'a [RelativeUnixPathBuf]>,
     pub environment_variables: GlobalEnvVarSummary<'a>,
 }
 
@@ -46,7 +45,6 @@ impl<'a> TryFrom<GlobalHashableInputs<'a>> for GlobalHashSummary<'a> {
             env,
             resolved_env_vars,
             pass_through_env,
-            dot_env,
             env_at_execution_start,
             ..
         } = global_hashable_inputs;
@@ -80,8 +78,6 @@ impl<'a> TryFrom<GlobalHashableInputs<'a>> for GlobalHashSummary<'a> {
                     .map(|vars| vars.by_source.matching.to_secret_hashable()),
                 pass_through,
             },
-
-            global_dot_env: dot_env,
         })
     }
 }

crates/turborepo-lib/src/run/summary/mod.rs

@@ -499,16 +499,6 @@ impl<'a> RunSummary<'a> {
             "  Global Cache Key\t=\t{}",
             self.global_hash_summary.root_key
         )?;
-        cwriteln!(
-            tab_writer,
-            ui,
-            GREY,
-            "  Global .env Files Considered\t=\t{}",
-            self.global_hash_summary
-                .global_dot_env
-                .unwrap_or_default()
-                .len()
-        )?;
         cwriteln!(
             tab_writer,
             ui,
@@ -661,16 +651,6 @@ impl<'a> RunSummary<'a> {
                 "  Inputs Files Considered\t=\t{}",
                 task.shared.inputs.len()
             )?;
-            cwriteln!(
-                tab_writer,
-                ui,
-                GREY,
-                "  .env Files Considered\t=\t{}",
-                task.shared
-                    .dot_env
-                    .as_ref()
-                    .map_or(0, |dot_env| dot_env.len())
-            )?;
 
             cwriteln!(
                 tab_writer,

crates/turborepo-lib/src/run/summary/task.rs

@@ -81,7 +81,6 @@ pub(crate) struct SharedTaskSummary<T> {
     pub framework: String,
     pub env_mode: EnvMode,
     pub environment_variables: TaskEnvVarSummary,
-    pub dot_env: Option<Vec<RelativeUnixPathBuf>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub execution: Option<TaskExecutionSummary>,
 }
@@ -104,7 +103,6 @@ pub struct TaskSummaryTaskDefinition {
     persistent: bool,
     env: Vec<String>,
     pass_through_env: Option<Vec<String>>,
-    dot_env: Option<Vec<RelativeUnixPathBuf>>,
     interactive: bool,
 }
 
@@ -233,7 +231,6 @@ impl From<SharedTaskSummary<TaskId<'static>>> for SharedTaskSummary<String> {
             execution,
             env_mode,
             environment_variables,
-            dot_env,
             ..
         } = value;
         Self {
@@ -261,7 +258,6 @@ impl From<SharedTaskSummary<TaskId<'static>>> for SharedTaskSummary<String> {
             execution,
             env_mode,
             environment_variables,
-            dot_env,
         }
     }
 }
@@ -277,7 +273,6 @@ impl From<TaskDefinition> for TaskSummaryTaskDefinition {
             cache,
             mut env,
             pass_through_env,
-            dot_env,
             topological_dependencies,
             task_dependencies,
             mut inputs,
@@ -318,8 +313,6 @@ impl From<TaskDefinition> for TaskSummaryTaskDefinition {
             interactive,
             env,
             pass_through_env,
-            // This should _not_ be sorted.
-            dot_env,
         }
     }
 }
@@ -378,7 +371,6 @@ mod test {
             "interactive": false,
             "env": [],
             "passThroughEnv": null,
-            "dotEnv": null,
         })
         ; "resolved task definition"
     )]

crates/turborepo-lib/src/run/summary/task_factory.rs

@@ -197,7 +197,6 @@ impl<'a> TaskSummaryFactory<'a> {
                 self.env_at_start,
             )
             .expect("invalid glob in task definition should have been caught earlier"),
-            dot_env: task_definition.dot_env.clone(),
             execution,
         })
     }

crates/turborepo-lib/src/task_graph/mod.rs

@@ -49,8 +49,6 @@ pub struct TaskDefinition {
 
     pub(crate) pass_through_env: Option<Vec<String>>,
 
-    pub(crate) dot_env: Option<Vec<RelativeUnixPathBuf>>,
-
     // TopologicalDependencies are tasks from package dependencies.
     // E.g. "build" is a topological dependency in:
     // dependsOn: ['^build'].
@@ -92,7 +90,6 @@ impl Default for TaskDefinition {
             inputs: Default::default(),
             output_logs: Default::default(),
             persistent: Default::default(),
-            dot_env: Default::default(),
             interactive: Default::default(),
         }
     }

crates/turborepo-lib/src/task_hash.rs

@@ -184,7 +184,7 @@ impl PackageInputsHashes {
                     None
                 };
 
-                let mut hash_object = match hash_object {
+                let hash_object = match hash_object {
                     Some(hash_object) => hash_object,
                     None => {
                         let local_hash_result = scm.get_package_file_hashes(
@@ -199,22 +199,6 @@ impl PackageInputsHashes {
                         }
                     }
                 };
-                if let Some(dot_env) = &task_definition.dot_env {
-                    if !dot_env.is_empty() {
-                        let absolute_package_path = repo_root.resolve(package_path);
-                        let dot_env_object = match scm.hash_existing_of(
-                            &absolute_package_path,
-                            dot_env.iter().map(|p| p.to_anchored_system_path_buf()),
-                        ) {
-                            Ok(dot_env_object) => dot_env_object,
-                            Err(err) => return Some(Err(err.into())),
-                        };
-
-                        for (key, value) in dot_env_object {
-                            hash_object.insert(key, value);
-                        }
-                    }
-                }
 
                 let file_hashes = FileHashes(hash_object);
                 let hash = file_hashes.clone().hash();
@@ -410,7 +394,6 @@ impl<'a> TaskHasher<'a> {
                 .as_deref()
                 .unwrap_or_default(),
             env_mode: task_env_mode,
-            dot_env: task_definition.dot_env.as_deref().unwrap_or_default(),
         };
 
         let task_hash = task_hashable.calculate_task_hash();