Merge branch 'main' into gpui2

Cargo.toml

@@ -54,6 +54,7 @@ members = [
     "crates/plugin",
     "crates/plugin_macros",
     "crates/plugin_runtime",
+    "crates/prettier",
     "crates/project",
     "crates/project_panel",
     "crates/project_symbols",
@@ -67,14 +68,12 @@ members = [
     "crates/sqlez_macros",
     "crates/feature_flags",
     "crates/rich_text",
-    "crates/storybook",
     "crates/storybook2",
     "crates/sum_tree",
     "crates/terminal",
     "crates/text",
     "crates/theme",
     "crates/theme_selector",
-    "crates/ui",
     "crates/ui2",
     "crates/util",
     "crates/semantic_index",