more ci fixes

Author: databasedav

.github/workflows/ci.yaml

@@ -70,7 +70,7 @@ jobs:
       uses: dtolnay/rust-toolchain@master
       with:
         components: clippy
-        toolchain: stable
+        toolchain: nightly
     - name: install bevy dependencies
       run: sudo apt-get update && sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
       shell: bash

Cargo.toml

@@ -43,6 +43,24 @@ strum = { version = "0.26", features = ["derive"] }
 num = "0.4"
 bevy_rich_text3d = { version = "0.2", default-features = false, features = ["2d"] }
 
+[features]
+deployed_wasm_example = []
+
 [dev-dependencies]
 bevy = { version = "0.15", features = ["bevy_dev_tools"] }
 
+[[example]]
+name = "custom"
+path = "examples/custom.rs"
+doc-scrape-examples = true
+
+[[example]]
+name = "world"
+path = "examples/world.rs"
+doc-scrape-examples = true
+
+[[example]]
+name = "utils"
+path = "examples/utils.rs"
+doc-scrape-examples = true
+crate-type = ["lib"]

examples/custom.rs

@@ -1,4 +1,8 @@
 //! register custom frontends for any type
+
+mod utils;
+use utils::*;
+
 use aalo::prelude::*;
 use bevy::ecs::{component::ComponentId, world::DeferredWorld};
 use bevy::prelude::*;
@@ -7,7 +11,7 @@ fn main() {
     register_frontend("bool", custom_bool_frontend);
     register_frontend("custom::CustomBoolComponent", custom_bool_frontend);
     App::new()
-        .add_plugins(DefaultPlugins)
+        .add_plugins(DefaultPlugins.set(example_window_plugin()))
         .add_plugins(AaloPlugin::new().world().with_inspector(|inspector| {
             inspector.jump_to(("entity", "custom bool field", "boolcomponent", ".0"))
         }))

examples/utils.rs

@@ -0,0 +1,16 @@
+#![allow(dead_code)]
+
+use bevy::prelude::*;
+
+pub(crate) fn example_window_plugin() -> WindowPlugin {
+    WindowPlugin {
+        primary_window: Some(Window {
+            #[cfg(feature = "deployed_wasm_example")]
+            canvas: Some("#bevy".to_string()),
+            fit_canvas_to_parent: true,
+            prevent_default_event_handling: true,
+            ..default()
+        }),
+        ..default()
+    }
+}

examples/world.rs

@@ -1,10 +1,14 @@
 //! basic world inspector, inspired by https://github.com/jakobhellermann/bevy-inspector-egui/blob/main/crates/bevy-inspector-egui/examples/quick/world_inspector.rs
+
+mod utils;
+use utils::*;
+
 use aalo::prelude::*;
 use bevy::prelude::*;
 
 fn main() {
     App::new()
-        .add_plugins(DefaultPlugins)
+        .add_plugins(DefaultPlugins.set(example_window_plugin()))
         .add_plugins(AaloPlugin::new().world().with_inspector(|inspector| {
             inspector.jump_to(("entity", "my cube", "transform", ".translation"))
         }))

justfile

@@ -11,7 +11,7 @@ doctest:
 test: doctest
 
 clippy *extras:
-  cargo clippy --all-features --all-targets --locked -- --deny warnings --no-deps {{ extras }}
+  cargo +nightly clippy --all-features --all-targets --locked -- --deny warnings --no-deps {{ extras }}
 
 # TODO: --all-features flag doesn't work because examples shenanigans
 check_all_features:

nickel/ci.ncl

@@ -30,7 +30,7 @@ let { uppercase_fields, sync_name_field, run_on_ubuntu_latest, .. } = import "ut
         clippy = {
           steps = [
             checkout,
-            rust_toolchain & { with = { components = "clippy" } },
+            rust_toolchain & { with = { toolchain = "nightly", components = "clippy" } },
             bevy_dependencies,
             cached_target_populate,
             just,

nickel/wasm_example_index_template.ncl

@@ -11,7 +11,7 @@ let global_styles = "height: 100%; width: 100%; margin: 0; padding: 0; border: 0
           <meta charset="utf-8" />
           <title>haalka %{ example } example</title>
           <link data-trunk rel="copy-dir" href="assets" />
-          <link data-trunk rel="rust" data-cargo-features="debug,deployed_wasm_example,%{ features |> std.string.join "," }" data-wasm-opt="s" href="." />
+          <link data-trunk rel="rust" data-cargo-features="deployed_wasm_example,%{ features |> std.string.join "," }" data-wasm-opt="s" href="." />
       </head>
 
       <body style="%{ global_styles }">