Allow for no root package.json

vercel · Apr 28, 2023 · 567bd41 · 567bd41
1 parent 7586b64
commit 567bd41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/crates/turborepo-lib/src/execution_state.rs b/crates/turborepo-lib/src/execution_state.rs
@@ -30,8 +30,11 @@ impl<'a> TryFrom<&'a CommandBase> for ExecutionState<'a> {
     fn try_from(base: &'a CommandBase) -> Result<Self, Self::Error> {
         let root_package_json = PackageJson::load(&AbsoluteSystemPathBuf::new(
             base.repo_root.join("package.json"),
-        )?)?;
-        let package_manager = PackageManager::get_package_manager(base, &root_package_json)?;
+        )?)
+        .ok();
+
+        let package_manager =
+            PackageManager::get_package_manager(base, root_package_json.as_ref())?;
 
         let repo_config = base.repo_config()?;
         let user_config = base.user_config()?;

diff --git a/crates/turborepo-lib/src/package_manager.rs b/crates/turborepo-lib/src/package_manager.rs
@@ -153,11 +153,13 @@ impl PackageManager {
         }))
     }
 
-    pub fn get_package_manager(base: &CommandBase, pkg: &PackageJson) -> Result<Self> {
+    pub fn get_package_manager(base: &CommandBase, pkg: Option<&PackageJson>) -> Result<Self> {
         // We don't surface errors for `read_package_manager` as we can fall back to
         // `detect_package_manager`
-        if let Ok(Some(package_manager)) = Self::read_package_manager(pkg) {
-            return Ok(package_manager);
+        if let Some(package_json) = pkg {
+            if let Ok(Some(package_manager)) = Self::read_package_manager(package_json) {
+                return Ok(package_manager);
+            }
         }
 
         Self::detect_package_manager(base)