Feature-gate all references to bevy_text in bevy_ui

crates/bevy_ui/src/lib.rs

@@ -161,7 +161,9 @@ impl Plugin for UiPlugin {
         #[cfg(feature = "bevy_text")]
         app.add_plugins(accessibility::AccessibilityPlugin);
         app.add_systems(PostUpdate, {
+            #[allow(clippy::let_and_return)]
             let system = widget::update_image_content_size_system.before(UiSystem::Layout);
+
             // Potential conflicts: `Assets<Image>`
             // They run independently since `widget::image_node_system` will only ever observe
             // its own UiImage, and `widget::text_system` & `bevy_text::update_text2d_layout`
@@ -184,19 +186,33 @@ impl Plugin for UiPlugin {
                 ui_layout_system
                     .in_set(UiSystem::Layout)
                     .before(TransformSystem::TransformPropagate),
-                resolve_outlines_system
-                    .in_set(UiSystem::Outlines)
-                    .after(UiSystem::Layout)
-                    // clipping doesn't care about outlines
-                    .ambiguous_with(update_clipping_system)
-                    .ambiguous_with(widget::text_system),
-                ui_stack_system
-                    .in_set(UiSystem::Stack)
-                    // the systems don't care about stack index
-                    .ambiguous_with(update_clipping_system)
-                    .ambiguous_with(resolve_outlines_system)
-                    .ambiguous_with(ui_layout_system)
-                    .ambiguous_with(widget::text_system),
+                {
+                    #[allow(clippy::let_and_return)]
+                    let system = resolve_outlines_system
+                        .in_set(UiSystem::Outlines)
+                        .after(UiSystem::Layout)
+                        // clipping doesn't care about outlines
+                        .ambiguous_with(update_clipping_system);
+
+                    #[cfg(feature = "bevy_text")]
+                    let system = system.ambiguous_with(widget::text_system);
+
+                    system
+                },
+                {
+                    #[allow(clippy::let_and_return)]
+                    let system = ui_stack_system
+                        .in_set(UiSystem::Stack)
+                        // the systems don't care about stack index
+                        .ambiguous_with(update_clipping_system)
+                        .ambiguous_with(resolve_outlines_system)
+                        .ambiguous_with(ui_layout_system);
+
+                    #[cfg(feature = "bevy_text")]
+                    let system = system.ambiguous_with(widget::text_system);
+
+                    system
+                },
                 update_clipping_system.after(TransformSystem::TransformPropagate),
             ),
         );

crates/bevy_ui/src/render/mod.rs

@@ -8,18 +8,24 @@ use bevy_render::{
     render_phase::PhaseItem, render_resource::BindGroupEntries, view::ViewVisibility,
     ExtractSchedule, Render,
 };
-use bevy_sprite::{SpriteAssetEvents, TextureAtlas};
+use bevy_sprite::SpriteAssetEvents;
+#[cfg(feature = "bevy_text")]
+use bevy_sprite::TextureAtlas;
 pub use pipeline::*;
 pub use render_pass::*;
 pub use ui_material_pipeline::*;
 
+#[cfg(feature = "bevy_text")]
+use crate::{BackgroundColor, UiImage};
 use crate::{
-    BackgroundColor, BorderColor, CalculatedClip, ContentSize, Node, Style, UiImage, UiScale, Val,
+    BorderColor, CalculatedClip, ContentSize, DefaultUiCamera, Node, Outline, Style, TargetCamera,
+    UiScale, Val,
 };
-use crate::{DefaultUiCamera, Outline, TargetCamera};
 
 use bevy_app::prelude::*;
-use bevy_asset::{load_internal_asset, AssetEvent, AssetId, Assets, Handle};
+#[cfg(feature = "bevy_text")]
+use bevy_asset::Assets;
+use bevy_asset::{load_internal_asset, AssetEvent, AssetId, Handle};
 use bevy_ecs::prelude::*;
 use bevy_math::{Mat4, Rect, URect, UVec4, Vec2, Vec3, Vec4Swizzles};
 use bevy_render::{
@@ -82,6 +88,7 @@ pub fn build_ui_render(app: &mut App) {
             (
                 extract_default_ui_camera_view::<Camera2d>,
                 extract_default_ui_camera_view::<Camera3d>,
+                #[cfg(feature = "bevy_text")]
                 extract_uinodes.in_set(RenderUiSystem::ExtractNode),
                 extract_uinode_borders.after(RenderUiSystem::ExtractAtlasNode),
                 #[cfg(feature = "bevy_text")]
@@ -397,6 +404,7 @@ pub fn extract_uinode_outlines(
     }
 }
 
+#[cfg(feature = "bevy_text")]
 pub fn extract_uinodes(
     mut extracted_uinodes: ResMut<ExtractedUiNodes>,
     images: Extract<Res<Assets<Image>>>,

crates/bevy_ui/src/widget/image.rs

@@ -1,14 +1,6 @@
 use crate::{measurement::AvailableSpace, ContentSize, Measure, Node, UiImage, UiScale};
 use bevy_asset::Assets;
-
-use bevy_ecs::change_detection::DetectChanges;
-use bevy_ecs::query::Without;
-use bevy_ecs::{
-    prelude::Component,
-    query::With,
-    reflect::ReflectComponent,
-    system::{Local, Query, Res},
-};
+use bevy_ecs::prelude::*;
 use bevy_math::Vec2;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::texture::Image;