Switch from trunk to bevy run web

.github/workflows/release.yaml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version number in the format `v1.2.3`'
+        description: "Version number in the format `v1.2.3`"
         required: true
         type: string
 
@@ -159,15 +159,15 @@ jobs:
       - name: Prepare output directories
         run: rm -rf tmp; mkdir -p tmp/binary '${{ env.app }}'
 
-      - name: Install cargo-binstall (Web)
+      - name: Install and run Bevy CLI (Web)
         if: ${{ matrix.platform == 'web' }}
-        uses: cargo-bins/cargo-binstall@v1.9.0
+        run: |
+          cargo install --git=https://github.com/TheBevyFlock/bevy_cli --locked bevy_cli
+          bevy build --locked --release --yes web --bundle
 
-      - name: Install and run trunk (Web)
+      - name: Move web bundle (Web)
         if: ${{ matrix.platform == 'web' }}
-        run: |
-          cargo binstall --no-confirm trunk wasm-bindgen-cli wasm-opt
-          trunk build --locked --release --dist '${{ env.app }}'
+        run: mv 'target/bevy_web/web-release/${{ env.cargo_build_binary_name }}' '${{ env.app }}'
 
       - name: Build binaries (non-Web)
         if: ${{ matrix.platform != 'web' }}
@@ -266,7 +266,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Do nothing
-        run: 'true'
+        run: "true"
     outputs:
       target: ${{ env.upload_to_itch }}
 

.github/workflows/release.yaml.template

@@ -168,15 +168,15 @@ jobs:
       - name: Prepare output directories
         run: rm -rf tmp; mkdir -p tmp/binary '${{ env.app }}'
 
-      - name: Install cargo-binstall (Web)
+      - name: Install and run Bevy CLI (Web)
         if: ${{ matrix.platform == 'web' }}
-        uses: cargo-bins/cargo-binstall@v1.9.0
+        run: |
+          cargo install --git=https://github.com/TheBevyFlock/bevy_cli --locked bevy_cli
+          bevy build --locked --release --yes web --bundle
 
-      - name: Install and run trunk (Web)
+      - name: Move web bundle (Web)
         if: ${{ matrix.platform == 'web' }}
-        run: |
-          cargo binstall --no-confirm trunk wasm-bindgen-cli wasm-opt
-          trunk build --locked --release --dist '${{ env.app }}'
+        run: mv 'target/bevy_web/web-release/${{ env.cargo_build_binary_name }}' '${{ env.app }}'
 
       - name: Build binaries (non-Web)
         if: ${{ matrix.platform != 'web' }}

.vscode/tasks.json

@@ -13,9 +13,7 @@
             "presentation": {
                 "clear": true
             },
-            "problemMatcher": [
-                "$rustc"
-            ],
+            "problemMatcher": ["$rustc"],
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -25,25 +23,18 @@
             "label": "Run native release",
             "type": "cargo",
             "command": "run",
-            "args": [
-                "--release",
-                "--no-default-features"
-            ],
+            "args": ["--release", "--no-default-features"],
             "presentation": {
                 "clear": true
             },
-            "problemMatcher": [
-                "$rustc"
-            ],
+            "problemMatcher": ["$rustc"],
             "group": "build"
         },
         {
             "label": "Run web dev",
             "type": "process",
-            "command": "trunk",
-            "args": [
-                "serve"
-            ],
+            "command": "bevy",
+            "args": ["run", "--yes", "--no-default-features", "web"],
             "options": {
                 "env": {
                     "RUST_BACKTRACE": "full"
@@ -52,27 +43,25 @@
             "presentation": {
                 "clear": true
             },
-            "problemMatcher": [
-                "$rustc"
-            ],
+            "problemMatcher": ["$rustc"],
             "group": "build"
         },
         {
             "label": "Run web release",
             "type": "process",
-            "command": "trunk",
+            "command": "bevy",
             "args": [
-                "serve",
+                "run",
+                "--yes",
                 "--release",
-                "--no-default-features"
+                "--no-default-features",
+                "web"
             ],
             "presentation": {
                 "clear": true
             },
-            "problemMatcher": [
-                "$rustc"
-            ],
+            "problemMatcher": ["$rustc"],
             "group": "build"
         }
     ]
-}
+}

Cargo.toml

@@ -62,27 +62,20 @@ opt-level = 3
 [profile.dev.package.wgpu-types]
 debug-assertions = false
 
-# The default profile is optimized for Wasm builds because
-# that's what [Trunk reads](https://github.com/trunk-rs/trunk/issues/605).
-# Optimize for size in the wasm-release profile to reduce load times and bandwidth usage on web.
 [profile.release]
 # Compile the entire crate as one unit.
 # Slows compile times, marginal improvements.
 codegen-units = 1
 # Do a second optimization pass over the entire program, including dependencies.
 # Slows compile times, marginal improvements.
 lto = "thin"
+
+# This profile will be used for `bevy run web` automatically
+[profile.web-release]
+# Default to release profile values.
+inherits = "release"
 # Optimize with size in mind (also try "z", sometimes it is better).
 # Slightly slows compile times, great improvements to file size and runtime performance.
 opt-level = "s"
 # Strip all debugging information from the binary to slightly reduce file size.
 strip = "debuginfo"
-
-# Override some settings for native builds.
-[profile.release-native]
-# Default to release profile values.
-inherits = "release"
-# Optimize with performance in mind.
-opt-level = 3
-# Keep debug information in the binary.
-strip = "none"

Cargo.toml.template

@@ -61,28 +61,3 @@ opt-level = 3
 # Remove expensive debug assertions due to <https://github.com/bevyengine/bevy/issues/14291>
 [profile.dev.package.wgpu-types]
 debug-assertions = false
-
-# The default profile is optimized for Wasm builds because
-# that's what [Trunk reads](https://github.com/trunk-rs/trunk/issues/605).
-# Optimize for size in the wasm-release profile to reduce load times and bandwidth usage on web.
-[profile.release]
-# Compile the entire crate as one unit.
-# Slows compile times, marginal improvements.
-codegen-units = 1
-# Do a second optimization pass over the entire program, including dependencies.
-# Slows compile times, marginal improvements.
-lto = "thin"
-# Optimize with size in mind (also try "z", sometimes it is better).
-# Slightly slows compile times, great improvements to file size and runtime performance.
-opt-level = "s"
-# Strip all debugging information from the binary to slightly reduce file size.
-strip = "debuginfo"
-
-# Override some settings for native builds.
-[profile.release-native]
-# Default to release profile values.
-inherits = "release"
-# Optimize with performance in mind.
-opt-level = 3
-# Keep debug information in the binary.
-strip = "none"

README.md

@@ -48,18 +48,20 @@ Feel free to move things around however you want, though.
 
 ## Run your game
 
+We recommend running your game with the [Bevy CLI](https://github.com/TheBevyFlock/bevy_cli).
+
 Running your game locally is very simple:
 
-- Use `cargo run` to run a native dev build.
-- Use [`trunk serve`](https://trunkrs.dev/) to run a web dev build.
+- Use `bevy run` to run a native dev build.
+- Use `bevy run --no-default-features web` to run a web dev build.
 
 If you're using [VS Code](https://code.visualstudio.com/), this template comes with a [`.vscode/tasks.json`](./.vscode/tasks.json) file.
 
 <details>
   <summary>Run release builds</summary>
 
-- Use `cargo run --profile release-native --no-default-features` to run a native release build.
-- Use `trunk serve --release --no-default-features` to run a web release build.
+- Use `bevy run --release --no-default-features` to run a native release build.
+- Use `bevy run --release --no-default-features web` to run a web release build.
 
 </details>
 

post-generate.rhai

@@ -1,7 +1,6 @@
 // Rename template files.
 file::rename(".github/workflows/release.yaml.template", ".github/workflows/release.yaml");
 file::rename("Cargo.toml.template", "Cargo.toml");
-file::rename("web/index.html.template", "web/index.html");
 file::rename("src/main.rs.template", "src/main.rs");
 file::rename("src/lib.rs.template", "src/lib.rs");
 file::rename("src/audio.rs.template", "src/audio.rs");

src/lib.rs

@@ -38,9 +38,7 @@ impl Plugin for AppPlugin {
                 .set(WindowPlugin {
                     primary_window: Window {
                         title: "Bevy New 2D".to_string(),
-                        canvas: Some("#bevy".to_string()),
                         fit_canvas_to_parent: true,
-                        prevent_default_event_handling: true,
                         ..default()
                     }
                     .into(),