kaaj fixes (#23)

Author: databasedav

.github/workflows/build_example.yaml

@@ -36,10 +36,10 @@ jobs:
       run: cargo binstall --no-confirm --continue-on-failure wasm-bindgen-cli wasm-opt trunk
     - if: ${{ inputs.api == 'webgl2' }}
       name: build example
-      run: just build_wasm_example ${{ inputs.example }}
+      run: just build_wasm_example haalka ${{ inputs.example }} true
     - if: ${{ inputs.api == 'webgpu' }}
       name: build example
-      run: just build_wasm_example ${{ inputs.example }} webgpu
+      run: just build_wasm_example haalka ${{ inputs.example }} true bevy/webgpu
     - name: upload dist
       uses: actions/upload-artifact@v4
       with:

.github/workflows/cleanup_pr_previews.yaml

@@ -18,7 +18,7 @@ jobs:
         attempt-limit: 100
         commit-message: cleaning up pr preview for https://github.com/databasedav/haalka/pull/${{ env.PR }}
         folder: empty_dir
-        force: false
+        single-commit: true
         target-folder: pr_previews/${{ env.PR }}
 name: cleanup_pr_previews
 on:

.github/workflows/examples_on_main.yaml

@@ -68,7 +68,6 @@ jobs:
         attempt-limit: 100
         commit-message: https://github.com/databasedav/haalka/commit/${{ github.sha }}
         folder: pages
-        force: false
         single-commit: true
         target-folder: examples
   get_examples_:

.github/workflows/pr_previews.yaml

@@ -68,7 +68,6 @@ jobs:
         attempt-limit: 100
         commit-message: https://github.com/databasedav/haalka/pull/${{ github.event.number }}/commits/${{ github.event.pull_request.head.sha }}
         folder: pages
-        force: false
         single-commit: true
         target-folder: pr_previews/${{ github.event.number }}
   deployment_comment:

Cargo.toml

@@ -14,14 +14,6 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/databasedav/haalka"
 documentation = "https://docs.rs/haalka"
 
-[lints.rust]
-missing_docs = "warn"
-unsafe_code = "deny"
-
-[package.metadata.docs.rs]
-cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
-all-features = true
-
 [dependencies]
 bevy_app = { version = "0.16", default-features = false }
 bevy_color = { version = "0.16", optional = true, default-features = false }
@@ -103,15 +95,6 @@ utils = []
 ## `DebugUiPlugin` which enables toggling [`bevy_dev_tools::ui_debug_overlay::DebugUiPlugin`](https://docs.rs/bevy/latest/bevy/dev_tools/ui_debug_overlay/struct.DebugUiPlugin.html) with the `F1` key; requires a camera to be marked with the [`IsDefaultCamera`](https://docs.rs/bevy/latest/bevy/prelude/struct.IsDefaultUiCamera.html#) component.
 debug = ["ui", "bevy_ui/bevy_ui_debug"]
 
-## Pass-through for optionally enabling webgpu for examples.
-webgpu = [
-    "bevy_render?/webgpu",
-    "bevy_core_pipeline?/webgpu",
-    "bevy_pbr?/webgpu",
-    "bevy_gizmos?/webgpu",
-    "bevy_sprite?/webgpu",
-]
-
 deployed_wasm_example = []
 
 [dev-dependencies]
@@ -140,6 +123,14 @@ allowlist = [
     "debug",
 ]
 
+[package.metadata.docs.rs]
+cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
+all-features = true
+
+[lints.rust]
+missing_docs = "warn"
+unsafe_code = "deny"
+
 [[example]]
 name = "align"
 path = "examples/align.rs"

examples/utils.rs

@@ -108,9 +108,6 @@ impl Plugin for FpsOverlayPlugin {
     }
 }
 
-#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
-struct MarkDefaultUiCameraSet;
-
 #[allow(clippy::type_complexity)]
 fn mark_default_ui_camera(cameras: Query<Entity, Or<(With<Camera2d>, With<Camera3d>)>>, mut commands: Commands) {
     if let Ok(entity) = cameras.single()
@@ -145,9 +142,7 @@ pub(crate) fn examples_plugin(app: &mut App) {
     .add_systems(
         PostStartup,
         (
-            mark_default_ui_camera
-                .in_set(MarkDefaultUiCameraSet)
-                .run_if(not(any_with_component::<IsDefaultUiCamera>)),
+            mark_default_ui_camera.run_if(not(any_with_component::<IsDefaultUiCamera>)),
             |world: &mut World| {
                 let mut el = Column::<Node>::new()
                     .align(Align::new().bottom().left())

justfile

@@ -1,7 +1,5 @@
-KAAJ_HAALKA_COMMIT := "5e06f448c3515fa0dc1cb9ad66fcc0192756fdaf"
-
 fetch_kaaj_justfile:
-  curl https://raw.githubusercontent.com/databasedav/haalka/{{ KAAJ_HAALKA_COMMIT }}/kaaj/justfile > kaaj.just
+  cp kaaj/justfile kaaj.just
 
 import? 'kaaj.just'
 

kaaj.just

@@ -34,11 +34,11 @@ sign_tag tag:
 list_examples:
   @cargo metadata --no-deps --format-version 1 | jq -c --argjson exclude '[{{ exclude_examples }}]' '[.packages[].targets[] | select(.kind[] == "example" and (.name as $name | $exclude | index($name) | not)) | .name]'
 
-generate_wasm_example_index example *features:
-  echo '(import kaaj).wasm_example_index_template' | nickel eval --field index_html --manifest-path nickel/Nickel-pkg.ncl -- 'example="{{ example }}"' --override 'features=["{{ features }}"]' | sed 's/^"//; s/"$//; s/\\"/"/g; s/\\n/\n/g'
+generate_wasm_example_index library example has_assets *features:
+  echo '(import kaaj).wasm_example_index_template' | nickel eval --field index_html --manifest-path nickel/Nickel-pkg.ncl -- 'library="{{ library }}"' 'example="{{ example }}"' --override 'features=["{{ features }}"]' --override 'has_assets="{{ has_assets }}"' | sed 's/^"//; s/"$//; s/\\"/"/g; s/\\n/\n/g'
 
-build_wasm_example example *features:
-  just generate_wasm_example_index {{ example }} {{ features }} > index.html
+build_wasm_example library example has_assets *features:
+  just generate_wasm_example_index {{ library }} {{ example }} {{ has_assets }} {{ features }} > index.html
   RUSTFLAGS='--cfg getrandom_backend="wasm_js"' trunk build --locked --release --public-url . --example {{ example }}
 
 format_nickels:

kaaj/README.md

@@ -29,7 +29,7 @@ let GITHUB_PAGES_URL = "https://databasedav.github.io/haalka" in
     ci_ = ci,
     cleanup_pr_previews_ = cleanup_pr_previews REPO,
     pr_previews_ = pr_previews REPO GITHUB_PAGES_URL,
-    examples_on_main_ = examples_on_main,
+    examples_on_main_ = examples_on_main REPO,
     release_ = release,
 }
 

kaaj/justfile

@@ -34,11 +34,11 @@ sign_tag tag:
 list_examples:
   @cargo metadata --no-deps --format-version 1 | jq -c --argjson exclude '[{{ exclude_examples }}]' '[.packages[].targets[] | select(.kind[] == "example" and (.name as $name | $exclude | index($name) | not)) | .name]'
 
-generate_wasm_example_index example *features:
-  echo '(import kaaj).wasm_example_index_template' | nickel eval --field index_html --manifest-path nickel/Nickel-pkg.ncl -- 'example="{{ example }}"' --override 'features=["{{ features }}"]' | sed 's/^"//; s/"$//; s/\\"/"/g; s/\\n/\n/g'
+generate_wasm_example_index library example has_assets *features:
+  echo '(import kaaj).wasm_example_index_template' | nickel eval --field index_html --manifest-path nickel/Nickel-pkg.ncl -- 'library="{{ library }}"' 'example="{{ example }}"' --override 'features=["{{ features }}"]' --override 'has_assets="{{ has_assets }}"' | sed 's/^"//; s/"$//; s/\\"/"/g; s/\\n/\n/g'
 
-build_wasm_example example *features:
-  just generate_wasm_example_index {{ example }} {{ features }} > index.html
+build_wasm_example library example has_assets *features:
+  just generate_wasm_example_index {{ library }} {{ example }} {{ has_assets }} {{ features }} > index.html
   RUSTFLAGS='--cfg getrandom_backend="wasm_js"' trunk build --locked --release --public-url . --example {{ example }}
 
 format_nickels: