Update crate rust edition to 2024.

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
       - main
   pull_request:
     branches:
-      - '**'
+      - "**"
 
 name: CI
 
@@ -15,32 +15,32 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rust-lang/audit@v1
-        name: Audit Rust Dependencies
+      - name: "Generate Cargo.lock"
+        run: cargo generate-lockfile
+      - uses: rustsec/audit-check@v2
         with:
-          denyWarnings: true
-          createIssues: false
+          token: ${{ secrets.GITHUB_TOKEN }}
 
   licenses:
     name: Licenses
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: EmbarkStudios/cargo-deny-action@v2
+      - uses: actions/checkout@v4
+      - uses: EmbarkStudios/cargo-deny-action@v2
 
-    - name: cargo-about cache
-      id: cargo-about-cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.cargo/bin/cargo-about
-        key: cargo-about-${{ runner.os }}
+      - name: cargo-about cache
+        id: cargo-about-cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/bin/cargo-about
+          key: cargo-about-${{ runner.os }}
 
-    - name: cargo-about install
-      if: steps.cargo-about-cache.outputs.cache-hit != 'true'
-      run: cargo install --locked cargo-about
+      - name: cargo-about install
+        if: steps.cargo-about-cache.outputs.cache-hit != 'true'
+        run: cargo install --locked cargo-about
 
-    - name: cargo-about generate licenses
-      run: cargo about generate --workspace --features "server_side_graphviz" about.hbs > doc/src/licenses.html
+      - name: cargo-about generate licenses
+        run: cargo about generate --workspace about.hbs > doc/src/licenses.html
 
   fmt:
     name: Rustfmt
@@ -82,14 +82,14 @@ jobs:
           toolchain: nightly
           components: clippy
 
-      - name: 'Run clippy (client side graphviz)'
+      - name: "Run clippy (client side graphviz)"
         run: |
           cargo clippy --workspace -- -D warnings
 
-      - name: 'Run clippy (server side graphviz)'
+      - name: "Run clippy (server side graphviz)"
         # we cannot use `--all-features` because `dot_ix` has features that are mutually exclusive.
         run: |
-          cargo clippy --workspace --features "server_side_graphviz" -- -D warnings
+          cargo clippy --workspace -- -D warnings
 
   coverage:
     name: Coverage
@@ -104,14 +104,14 @@ jobs:
 
       - uses: taiki-e/install-action@cargo-llvm-cov
 
-      - name: 'Collect coverage'
+      - name: "Collect coverage"
         run: ./coverage.sh
 
-      - name: 'Print directory sizes'
+      - name: "Print directory sizes"
         run: du -sh target/coverage target/llvm-cov-target
 
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           files: ./target/coverage/lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -124,11 +124,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
 
-      - name: 'Build and test'
+      - name: "Build and test"
         run: cargo test --workspace
 
-  build_playground_linux:
-    name: Build Playground (Linux)
+  build_playground_linux_leptos:
+    name: Build Playground (Linux) - cargo-leptos
     # On `ubuntu-latest`, this job fails because the CI runner is CPU bound
     # when `monaco` is built.
     #
@@ -137,32 +137,82 @@ jobs:
     # See <https://github.com/actions/runner-images/issues/6680>
     runs-on: ubuntu-22.04
     timeout-minutes: 25
+    env:
+      # Seems to solve this issue:
+      #
+      # ```text
+      # 0: Unexpected token Semicolon at :1360:9
+      # ```
+      LEPTOS_TAILWIND_VERSION: "v4.1.4"
     steps:
       - uses: actions/checkout@v4
-      - name: 'Install Rust'
+      - name: "Install Rust"
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
           targets: wasm32-unknown-unknown
 
-      - name: cargo-leptos cache
-        id: cargo-leptos-cache
-        uses: actions/cache@v4
+      - name: cargo-leptos cache restore
+        id: cargo_leptos_cache_restore
+        uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/bin/cargo-leptos
-          key: cargo-leptos-${{ runner.os }}
+          key: ${{ runner.os }}-cargo-leptos
+
+      - run: cargo install cargo-leptos
+        if: steps.cargo_leptos_cache_restore.outputs.cache-hit != 'true'
 
-      - name: cargo-leptos install
-        if: steps.cargo-leptos-cache.outputs.cache-hit != 'true'
-        run: cargo install cargo-leptos
+      - name: cargo-leptos cache save
+        id: cargo_leptos_cache_save
+        uses: actions/cache/save@v4
+        if: always() && steps.cargo_leptos_cache_restore.outputs.cache-hit != 'true'
+        with:
+          path: ~/.cargo/bin/cargo-leptos
+          key: ${{ runner.os }}-cargo-leptos
 
-      - name: 'Build playground'
+      - name: "Build playground"
         working-directory: ./playground
         run: cargo leptos build -v
 
-      - name: 'Build playground (server side graphviz)'
+  build_playground_linux_trunk:
+    name: Build Playground (Linux) - trunk
+    # On `ubuntu-latest`, this job fails because the CI runner is CPU bound
+    # when `monaco` is built.
+    #
+    # Trying 22.04 to see if it alleviates the problem.
+    #
+    # See <https://github.com/actions/runner-images/issues/6680>
+    runs-on: ubuntu-22.04
+    timeout-minutes: 25
+    steps:
+      - uses: actions/checkout@v4
+      - name: "Install Rust"
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          targets: wasm32-unknown-unknown
+
+      - name: trunk cache restore
+        id: trunk_cache_restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ~/.cargo/bin/trunk
+          key: ${{ runner.os }}-trunk
+
+      - run: cargo install trunk
+        if: steps.trunk_cache_restore.outputs.cache-hit != 'true'
+
+      - name: trunk cache save
+        id: trunk_cache_save
+        uses: actions/cache/save@v4
+        if: always() && steps.trunk_cache_restore.outputs.cache-hit != 'true'
+        with:
+          path: ~/.cargo/bin/trunk
+          key: ${{ runner.os }}-trunk
+
+      - name: "Build playground"
         working-directory: ./playground
-        run: cargo leptos build --features "server_side_graphviz" -v
+        run: trunk build -v
 
   build_and_test_windows:
     name: Build and Test (Windows)
@@ -175,41 +225,42 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
 
-      - name: 'Build and test'
+      - name: "Build and test"
         run: cargo test --workspace
 
-  build_playground_windows:
-    name: Build Playground (Windows)
+  build_playground_windows_trunk:
+    name: Build Playground (Windows) - trunk
     runs-on: windows-latest
     timeout-minutes: 30
     steps:
       - name: Prepare symlink configuration
         run: git config --global core.symlinks true
 
       - uses: actions/checkout@v4
-      - name: 'Install Rust'
+      - name: "Install Rust"
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
           targets: wasm32-unknown-unknown
 
-      - name: cargo-leptos cache
-        id: cargo-leptos-cache
-        uses: actions/cache@v4
+      - name: trunk cache restore
+        id: trunk_cache_restore
+        uses: actions/cache/restore@v4
         with:
-          path: 'C:\Users\runneradmin\.cargo\bin\cargo-leptos.exe'
-          key: cargo-leptos-${{ runner.os }}
+          path: 'C:\Users\runneradmin\.cargo\bin\trunk.exe'
+          key: ${{ runner.os }}-trunk
 
-      - name: cargo-leptos install
-        if: steps.cargo-leptos-cache.outputs.cache-hit != 'true'
-        # --locked: fix is in-progress at https://github.com/leptos-rs/cargo-leptos/pull/274
-        run: |-
-          cargo install cargo-leptos --locked
+      - run: cargo install trunk
+        if: steps.trunk_cache_restore.outputs.cache-hit != 'true'
 
-      - name: 'Build playground'
-        working-directory: ./playground
-        run: cargo leptos build -v
+      - name: trunk cache save
+        id: trunk_cache_save
+        uses: actions/cache/save@v4
+        if: always() && steps.trunk_cache_restore.outputs.cache-hit != 'true'
+        with:
+          path: 'C:\Users\runneradmin\.cargo\bin\trunk.exe'
+          key: ${{ runner.os }}-trunk
 
-      - name: 'Build playground (server side graphviz)'
+      - name: "Build playground"
         working-directory: ./playground
-        run: cargo leptos build --features "server_side_graphviz" -v
+        run: trunk build -v

.github/workflows/pages.yml

@@ -32,29 +32,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: 'Install Rust'
+      - name: "Install Rust"
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly
           targets: wasm32-unknown-unknown
 
-      - name: cargo-leptos cache
-        id: cargo-leptos-cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cargo/bin/cargo-leptos
-          key: cargo-leptos-${{ runner.os }}
-
-      - name: cargo-leptos install
-        if: steps.cargo-leptos-cache.outputs.cache-hit != 'true'
-        run: cargo install cargo-leptos
-
       - name: Setup Pages
         uses: actions/configure-pages@v5
 
-      - name: Download and install tailwindcss binary
-        run: npm install -D tailwindcss
-
       - name: Download and install Trunk binary
         run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
 
@@ -81,7 +67,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload playground/dist directory
-          path: 'playground/dist'
+          path: "playground/dist"
 
       - name: Deploy to GitHub Pages
         id: deployment

.github/workflows/publish.yml

@@ -1,7 +1,7 @@
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 name: Publish
 
@@ -12,11 +12,11 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rust-lang/audit@v1
-        name: Audit Rust Dependencies
+      - name: "Generate Cargo.lock"
+        run: cargo generate-lockfile
+      - uses: rustsec/audit-check@v2
         with:
-          denyWarnings: true
-          createIssues: false
+          token: ${{ secrets.GITHUB_TOKEN }}
 
   build_and_test_linux:
     name: Build and Test (Linux)
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
 
-      - name: 'Build and test'
+      - name: "Build and test"
         run: cargo test --workspace
 
   build_and_test_windows:
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
 
-      - name: 'Build and test'
+      - name: "Build and test"
         run: cargo test --workspace
 
   crates_io_publish:
@@ -56,34 +56,30 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
 
-      - name: cargo-release Cache
-        id: cargo_release_cache
-        uses: actions/cache@v4
+      - name: cargo-release cache restore
+        id: cargo_release_cache_restore
+        uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/bin/cargo-release
           key: ${{ runner.os }}-cargo-release
 
       - run: cargo install cargo-release
-        if: steps.cargo_release_cache.outputs.cache-hit != 'true'
+        if: steps.cargo_release_cache_restore.outputs.cache-hit != 'true'
+
+      - name: cargo-release cache save
+        id: cargo_release_cache_save
+        uses: actions/cache/save@v4
+        if: always() && steps.cargo_release_cache_restore.outputs.cache-hit != 'true'
+        with:
+          path: ~/.cargo/bin/cargo-release
+          key: ${{ runner.os }}-cargo-release
 
       - name: cargo login
-        run: cargo login ${{ secrets.CRATES_IO_API_TOKEN }}
+        run: |-
+          echo "${{ secrets.CRATES_IO_API_TOKEN }}" | cargo login
 
       # allow-branch HEAD is because GitHub actions switches
       # to the tag while building, which is a detached head
-
-      # Publishing is currently messy, because:
-      #
-      # * `peace_rt_model_core` exports `NativeError` or `WebError` depending on the target.
-      # * `peace_rt_model_web` fails to build when publishing the workspace for a native target.
-      # * `peace_rt_model_web` still needs its dependencies to be published before it can be
-      #    published.
-      # * `peace_rt_model_hack` needs `peace_rt_model_web` to be published before it can be
-      #    published.
-      #
-      # We *could* pass through `--no-verify` so `cargo` doesn't build the crate before publishing,
-      # which is reasonable, since this job only runs after the Linux, Windows, and WASM builds
-      # have passed.
       - name: "cargo release publish"
         run: |-
           cargo release \