Merge branch 'main' into screen-sharing

# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts

crates/zed/build.rs

@@ -35,12 +35,12 @@ fn main() {
 
     let output = Command::new("npm")
         .current_dir("../../styles")
-        .args(["run", "build-themes"])
+        .args(["run", "build"])
         .output()
         .expect("failed to run npm");
     if !output.status.success() {
         panic!(
-            "build-themes script failed {}",
+            "build script failed {}",
             String::from_utf8_lossy(&output.stderr)
         );
     }