chore: upgrade to Dioxus 0.7

.github/workflows/rust-check.yaml

@@ -34,9 +34,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: .env symlink creation
-        run: ln -s .env.dev .env
-      - name: Tailwind CSS output creation
-        run: touch assets/tailwind.css
+        run: ln -s .env.example .env
+      - name: npm build
+        run: npm install && npm run build
       - name: rustfmt check
         run: cargo fmt --all --check
       - name: Clippy check

Dioxus.toml

@@ -2,5 +2,20 @@
 
 [web.app]
 
-# HTML title tag content.
-title = "Todo Baggins"
+# HTML title tag content
+title = "todo_baggins"
+
+# include `assets` in web platform
+[web.resource]
+
+# Additional CSS style files
+style = []
+
+# Additional JavaScript files
+script = []
+
+[web.resource.dev]
+
+# Javascript code file
+# serve: [dev-server] only
+script = []

docker/dev/app/Dockerfile

@@ -1,12 +1,13 @@
 FROM rust:1.92.0-bookworm@sha256:9676d0547a259997add8f5924eb6b959c589ed39055338e23b99aba7958d6d31
 
-RUN useradd -m -u 1000 -s /bin/bash app_user \
- && rustup target add wasm32-unknown-unknown
+RUN useradd -m -u 1000 -s /bin/bash app_user
+
+RUN rustup target add wasm32-unknown-unknown
 
 USER app_user
 
-RUN cargo install --git https://github.com/diesel-rs/diesel --rev 2e85ba060d3d70ea605ea58a79b8a435749a7adc diesel_cli \
- && cargo install --git https://github.com/DioxusLabs/dioxus --rev 8f8b58ea80ba0ec8057807bcd58fb609f7a5f2b1 dioxus-cli
+RUN cargo install --locked dioxus-cli --version 0.7.2 \
+ && cargo install --locked diesel_cli --version 2.3.4
 
 COPY --chown=app_user . /srv/app
 WORKDIR /srv/app

docker/prod/app/Dockerfile

@@ -9,8 +9,6 @@ ARG ANDROID_BUNDLETOOL_VERSION=1.18.3
 ARG ANDROID_BUNDLETOOL_SHA256=a099cfa1543f55593bc2ed16a70a7c67fe54b1747bb7301f37fdfd6d91028e29
 ENV ANDROID_SDK_ROOT=/opt/android-sdk
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
 RUN apt-get update && apt-get install -y --no-install-recommends \
     openjdk-17-jdk-headless=17.0.17+10-1~deb12u1 \
  && curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_COMMAND_LINE_TOOLS_VERSION}_latest.zip" \

src/server/updates.rs

@@ -46,15 +46,8 @@ mod server_only {
         let mut disconnected_client_ids = HashSet::new();
         let subscribed_clients = SUBSCRIBED_CLIENTS.read().await;
         for (id, client) in subscribed_clients.iter() {
-            if client
-                .websocket
-                .lock()
-                .await
-                .send(UpdateEvent)
-                .await
-                .is_err()
-            {
-                disconnected_client_ids.insert(*id);
+            if let Err(_) = client.websocket.lock().await.send(UpdateEvent).await {
+                disconnected_client_ids.insert(id.clone());
             }
         }
         drop(subscribed_clients);

tailwind.css

@@ -1,2 +1 @@
-/* stylelint-disable-next-line import-notation */
 @import "tailwindcss";