feat(Turborepo): return invalid states from package discovery #7789

gsoltis · 2024-03-20T20:30:51Z

Description

Returns errors when package watching is in a known-invalid state. This means the client does not need to rely on timeouts when we cannot find a package manager or valid workspace globs.
Combines the two bits of state, package manager and workspaces, into a single API call. They were effectively already used that way, but now the clients are updated to only make a single call.

Testing Instructions

Updated tests to no longer use a timeout, as we can now confirm error responses

vercel · 2024-03-20T20:30:55Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
examples-basic-web	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Mar 25, 2024 5:51pm
examples-gatsby-web	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Mar 25, 2024 5:51pm
examples-kitchensink-blog	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Mar 25, 2024 5:51pm
examples-nonmonorepo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Mar 25, 2024 5:51pm
examples-tailwind-web	🔄 Building (Inspect)	Visit Preview	💬 Add feedback	Mar 25, 2024 5:51pm
rust-docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Mar 25, 2024 5:51pm

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
examples-designsystem-docs	⬜️ Ignored (Inspect)	Visit Preview	Mar 25, 2024 5:51pm
examples-native-web	⬜️ Ignored (Inspect)	Visit Preview	Mar 25, 2024 5:51pm
examples-svelte-web	⬜️ Ignored (Inspect)	Visit Preview	Mar 25, 2024 5:51pm
examples-vite-web	⬜️ Ignored (Inspect)	Visit Preview	Mar 25, 2024 5:51pm

gsoltis · 2024-03-20T20:31:07Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @gsoltis and the rest of your teammates on Graphite

github-actions · 2024-03-20T20:31:33Z

🟢 Turbopack Benchmark CI successful 🟢

Thanks

github-actions · 2024-03-20T21:08:37Z

🟢 CI successful 🟢

Thanks

chris-olszewski · 2024-03-22T16:42:17Z

crates/turborepo-lib/src/daemon/server.rs

-                    tonic::Status::internal(format!("{}", e))
-                }
-            })
+        match self.package_watcher.discover_packages_blocking().await {


Not related to the PR, but I still don't understand the blocking variant vs normal variant of package discovery. Should this block until package discovery can succeed?

It blocks until there's a non-None value available. Not necessarily a success. When we detect relevant changes, we set the value to None, then recalculate. That recalculation might produce an error, in which case this would resolve to an error.

I believe the blocking variant is used by the LSP, while the non-blocking variant is for the CLI, which will fall back to running its own calculation in the event of a timeout

chris-olszewski · 2024-03-22T17:06:10Z

crates/turborepo-filewatch/src/package_watcher.rs

+    NoPackageManager(Box<dyn std::error::Error + Send + Sync>),
+    InvalidGlobs(Box<dyn std::error::Error + Send + Sync>),


Minor, but since we're only using the error for the error message via e.to_string() we could do that conversion on construction and simplify the type a bit.

I'll take a look at making the change. I had originally intended to send the whole Error instance back, but due to the watch channel, that turns into a requirement for Clone, which in turn propagates pretty far out to all of the different error types.

turbo-orchestrator bot added created-by: turborepo owned-by: turborepo labels Mar 20, 2024

gsoltis mentioned this pull request Mar 20, 2024

feat(Turborepo): handle invalid states in package watching #7759

Merged

gsoltis mentioned this pull request Mar 20, 2024

feat(Turborepo): handle package manager changes #7770

Merged

vercel bot deployed to Preview – examples-nonmonorepo March 20, 2024 20:31 View deployment

gsoltis marked this pull request as ready for review March 20, 2024 20:32

gsoltis requested a review from a team as a code owner March 20, 2024 20:32

gsoltis requested review from tknickman and NicholasLYang and removed request for a team March 20, 2024 20:32

gsoltis marked this pull request as draft March 20, 2024 20:33

gsoltis removed request for tknickman and NicholasLYang March 20, 2024 20:33

vercel bot deployed to Preview – rust-docs March 20, 2024 20:40 View deployment

gsoltis force-pushed the 03-19-feat_Turborepo_handle_package_manager_changes branch from fd6e6c0 to c7281cf Compare March 20, 2024 20:55

turbo-orchestrator bot added area: site owned-by: turbopack labels Mar 20, 2024

gsoltis force-pushed the 03-20-feat_turborepo_return_invalid_states_from_package_discovery branch from 3162d3a to 4e4c232 Compare March 21, 2024 01:23

turbo-orchestrator bot removed area: site owned-by: turbopack labels Mar 21, 2024

vercel bot deployed to Preview – examples-nonmonorepo March 21, 2024 01:23 View deployment

vercel bot deployed to Preview – rust-docs March 21, 2024 01:32 View deployment

gsoltis force-pushed the 03-19-feat_Turborepo_handle_package_manager_changes branch 3 times, most recently from 8ec8547 to 455f88f Compare March 21, 2024 03:42

Base automatically changed from 03-19-feat_Turborepo_handle_package_manager_changes to main March 21, 2024 20:09

gsoltis force-pushed the 03-20-feat_turborepo_return_invalid_states_from_package_discovery branch from 4e4c232 to d9284ae Compare March 21, 2024 20:23

gsoltis mentioned this pull request Mar 21, 2024

feat(Turborepo): Flag on daemon package discovery #7654

Merged

vercel bot deployed to Preview – examples-nonmonorepo March 21, 2024 20:24 View deployment

gsoltis marked this pull request as ready for review March 21, 2024 20:25

vercel bot deployed to Preview – rust-docs March 21, 2024 20:33 View deployment

gsoltis requested review from chris-olszewski and arlyon March 22, 2024 16:23

chris-olszewski approved these changes Mar 22, 2024

View reviewed changes

feat(Turborepo): return invalid states from package discovery

eaccc37

gsoltis force-pushed the 03-20-feat_turborepo_return_invalid_states_from_package_discovery branch from d9284ae to eaccc37 Compare March 25, 2024 17:41

vercel bot deployed to Preview – examples-nonmonorepo March 25, 2024 17:41 View deployment

vercel bot deployed to Preview – rust-docs March 25, 2024 17:51 View deployment

gsoltis merged commit bc4b0c1 into main Mar 25, 2024
56 checks passed

gsoltis deleted the 03-20-feat_turborepo_return_invalid_states_from_package_discovery branch March 25, 2024 21:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(Turborepo): return invalid states from package discovery #7789

feat(Turborepo): return invalid states from package discovery #7789

gsoltis commented Mar 20, 2024 •

edited

vercel bot commented Mar 20, 2024 •

edited

gsoltis commented Mar 20, 2024 •

edited

github-actions bot commented Mar 20, 2024 •

edited

github-actions bot commented Mar 20, 2024 •

edited

chris-olszewski Mar 22, 2024

gsoltis Mar 25, 2024

gsoltis Mar 25, 2024

chris-olszewski Mar 22, 2024

gsoltis Mar 25, 2024

		NoPackageManager(Box<dyn std::error::Error + Send + Sync>),
		InvalidGlobs(Box<dyn std::error::Error + Send + Sync>),

feat(Turborepo): return invalid states from package discovery #7789

feat(Turborepo): return invalid states from package discovery #7789

Conversation

gsoltis commented Mar 20, 2024 • edited

Description

Testing Instructions

vercel bot commented Mar 20, 2024 • edited

gsoltis commented Mar 20, 2024 • edited

github-actions bot commented Mar 20, 2024 • edited

🟢 Turbopack Benchmark CI successful 🟢

github-actions bot commented Mar 20, 2024 • edited

🟢 CI successful 🟢

chris-olszewski Mar 22, 2024

Choose a reason for hiding this comment

gsoltis Mar 25, 2024

Choose a reason for hiding this comment

gsoltis Mar 25, 2024

Choose a reason for hiding this comment

chris-olszewski Mar 22, 2024

Choose a reason for hiding this comment

gsoltis Mar 25, 2024

Choose a reason for hiding this comment

gsoltis commented Mar 20, 2024 •

edited

vercel bot commented Mar 20, 2024 •

edited

gsoltis commented Mar 20, 2024 •

edited

github-actions bot commented Mar 20, 2024 •

edited

github-actions bot commented Mar 20, 2024 •

edited