ci: improve workflows (#590)

Author: DanielleHuisman

.github/workflows/ci.yml

@@ -9,14 +9,14 @@ on:
 permissions:
     contents: read
 
-env:
-    RUSTFLAGS: '-Dwarnings'
-
 jobs:
-    test:
-        name: Test
+    lint:
+        name: Lint
         runs-on: ubuntu-latest
 
+        env:
+            RUSTFLAGS: '-Dwarnings'
+
         steps:
             - name: Checkout
               uses: actions/checkout@v5
@@ -27,11 +27,40 @@ jobs:
                   components: clippy, rustfmt
                   target: wasm32-unknown-unknown
 
-            - name: Check formatting
-              run: cargo fmt --all --check
+            - name: Install Cargo Binary Install
+              uses: cargo-bins/cargo-binstall@main
+
+            - name: Install crates
+              run: cargo binstall -y --force cargo-deny cargo-machete cargo-sort
 
             - name: Lint
               run: cargo clippy --all-features --locked
 
+            - name: Check dependencies
+              run: cargo deny check
+
+            - name: Check unused dependencies
+              run: cargo machete
+
+            - name: Check manifest formatting
+              run: cargo sort --workspace --check
+
+            - name: Check formatting
+              run: cargo fmt --all --check
+
+    test:
+        name: Test
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v5
+
+            - name: Set up Rust toolchain
+              uses: actions-rust-lang/setup-rust-toolchain@v1
+              with:
+                  components: clippy, rustfmt
+                  target: wasm32-unknown-unknown
+
             - name: Test
               run: cargo test --all-features --locked --release

.github/workflows/website.yml

@@ -23,7 +23,6 @@ jobs:
             - name: Set up Rust toolchain
               uses: actions-rust-lang/setup-rust-toolchain@v1
               with:
-                  components: clippy, rustfmt
                   target: wasm32-unknown-unknown
 
             - name: Install Cargo Binary Install
@@ -49,7 +48,6 @@ jobs:
             - name: Set up Rust toolchain
               uses: actions-rust-lang/setup-rust-toolchain@v1
               with:
-                  components: clippy, rustfmt
                   target: wasm32-unknown-unknown
 
             - name: Install Cargo Binary Install
@@ -59,7 +57,7 @@ jobs:
               run: cargo binstall --force -y mdbook mdbook-tabs mdbook-trunk trunk
 
             - name: Install Node.js dependencies
-              run: npm install
+              run: npm ci
 
             - name: Build Book
               run: mdbook build

.pre-commit-config.yaml

@@ -1,15 +1,40 @@
 repos:
+    - repo: https://github.com/pre-commit/mirrors-prettier
+      rev: v3.1.0
+      hooks:
+          - id: prettier
+            language: node
+            additional_dependencies:
+                - prettier@^3.6.2
+                - prettier-plugin-tailwindcss@^0.6.6
+
     - repo: https://github.com/doublify/pre-commit-rust
       rev: v1.0
       hooks:
           - id: fmt
           - id: clippy
 
-    - repo: https://github.com/pre-commit/mirrors-prettier
-      rev: v3.1.0
+    - repo: https://github.com/EmbarkStudios/cargo-deny
+      rev: 0.18.4
       hooks:
-          - id: prettier
-            language: node
-            additional_dependencies:
-                - prettier@^3.2.5
-                - prettier-plugin-tailwindcss@^0.6.0
+          - id: cargo-deny
+
+    # - repo: https://github.com/bnjbvr/cargo-machete
+    #   rev: ba1bcd4
+    #   hooks:
+    #       - id: cargo-machete
+    - repo: local
+      hooks:
+          - id: cargo-machete
+            name: cargo-machete
+            language: rust
+            entry: cargo machete
+            types: [file, toml]
+            files: Cargo\.(toml|lock)
+            pass_filenames: false
+
+    - repo: https://github.com/DevinR528/cargo-sort
+      rev: v2.0.1
+      hooks:
+          - id: cargo-sort
+            args: ['--workspace']

.prettierrc.json

@@ -3,6 +3,5 @@
     "bracketSpacing": false,
     "printWidth": 120,
     "singleQuote": true,
-    "tabWidth": 4,
-    "trailingComma": "none"
+    "tabWidth": 4
 }

Cargo.lock

@@ -49,12 +49,12 @@ console_error_panic_hook = "0.1.7"
 console_log = "1.0.0"
 dioxus = "0.6.1"
 leptos = "0.8.0"
-leptos_dom = "0.8.0"
-leptos_router = "0.8.0"
 leptos-maybe-callback = "0.2.0"
 leptos-node-ref = "0.2.0"
 leptos-style = "0.2.0"
 leptos-typed-fallback-show = "0.2.0"
+leptos_dom = "0.8.0"
+leptos_router = "0.8.0"
 log = "0.4.22"
 radix-dioxus-icons = { path = "./packages/icons/dioxus", version = "0.0.2" }
 radix-leptos-accessible-icon = { path = "./packages/primitives/leptos/accessible-icon", version = "0.0.2" }
@@ -75,10 +75,10 @@ radix-leptos-portal = { path = "./packages/primitives/leptos/portal", version =
 radix-leptos-primitive = { path = "./packages/primitives/leptos/primitive", version = "0.0.2" }
 # radix-leptos-roving-focus = { path = "./packages/primitives/leptos/roving-focus", version = "0.0.2" }
 radix-leptos-separator = { path = "./packages/primitives/leptos/separator", version = "0.0.2" }
-radix-leptos-visually-hidden = { path = "./packages/primitives/leptos/visually-hidden", version = "0.0.2" }
 radix-leptos-use-controllable-state = { path = "./packages/primitives/leptos/use-controllable-state", version = "0.0.2" }
 radix-leptos-use-previous = { path = "./packages/primitives/leptos/use-previous", version = "0.0.2" }
 radix-leptos-use-size = { path = "./packages/primitives/leptos/use-size", version = "0.0.2" }
+radix-leptos-visually-hidden = { path = "./packages/primitives/leptos/visually-hidden", version = "0.0.2" }
 radix-number = { path = "./packages/primitives/core/number", version = "0.0.2" }
 radix-yew-arrow = { path = "./packages/primitives/yew/arrow", version = "0.0.2" }
 radix-yew-aspect-ratio = { path = "./packages/primitives/yew/aspect-ratio", version = "0.0.2" }
@@ -87,8 +87,8 @@ radix-yew-checkbox = { path = "./packages/primitives/yew/checkbox", version = "0
 radix-yew-collection = { path = "./packages/primitives/yew/collection", version = "0.0.2" }
 radix-yew-compose-refs = { path = "./packages/primitives/yew/compose-refs", version = "0.0.2" }
 radix-yew-dialog = { path = "./packages/primitives/yew/dialog", version = "0.0.2" }
-radix-yew-dismissable-layer = { path = "./packages/primitives/yew/dismissable-layer", version = "0.0.2" }
 radix-yew-direction = { path = "./packages/primitives/yew/direction", version = "0.0.2" }
+radix-yew-dismissable-layer = { path = "./packages/primitives/yew/dismissable-layer", version = "0.0.2" }
 radix-yew-focus-guards = { path = "./packages/primitives/yew/focus-guards", version = "0.0.2" }
 radix-yew-focus-scope = { path = "./packages/primitives/yew/focus-scope", version = "0.0.2" }
 radix-yew-icons = { path = "./packages/icons/yew", version = "0.0.2" }
@@ -105,10 +105,10 @@ radix-yew-separator = { path = "./packages/primitives/yew/separator", version =
 radix-yew-switch = { path = "./packages/primitives/yew/switch", version = "0.0.2" }
 radix-yew-themes = { path = "./packages/themes/yew", version = "0.0.2" }
 radix-yew-tooltip = { path = "./packages/primitives/yew/tooltip", version = "0.0.2" }
-radix-yew-visually-hidden = { path = "./packages/primitives/yew/visually-hidden", version = "0.0.2" }
 radix-yew-use-controllable-state = { path = "./packages/primitives/yew/use-controllable-state", version = "0.0.2" }
 radix-yew-use-previous = { path = "./packages/primitives/yew/use-previous", version = "0.0.2" }
 radix-yew-use-size = { path = "./packages/primitives/yew/use-size", version = "0.0.2" }
+radix-yew-visually-hidden = { path = "./packages/primitives/yew/visually-hidden", version = "0.0.2" }
 send_wrapper = "0.6.0"
 serde = "1.0.198"
 serde_json = "1.0.116"

Cargo.toml

@@ -9,13 +9,13 @@ license.workspace = true
 repository.workspace = true
 version.workspace = true
 
+[features]
+default = []
+icons = ["dep:radix-dioxus-icons"]
+
 [dependencies]
 console_error_panic_hook.workspace = true
 console_log.workspace = true
+dioxus = { workspace = true, features = ["web"] }
 log.workspace = true
 radix-dioxus-icons = { workspace = true, optional = true }
-dioxus = { workspace = true, features = ["web"] }
-
-[features]
-default = []
-icons = ["dep:radix-dioxus-icons"]

book-examples/dioxus/icons/Cargo.toml

@@ -9,11 +9,11 @@ license.workspace = true
 repository.workspace = true
 version.workspace = true
 
+[features]
+default = []
+
 [dependencies]
 console_error_panic_hook.workspace = true
 console_log.workspace = true
-log.workspace = true
 dioxus = { workspace = true, features = ["web"] }
-
-[features]
-default = []
+log.workspace = true

book-examples/dioxus/primitives/Cargo.toml

@@ -9,13 +9,13 @@ license.workspace = true
 repository.workspace = true
 version.workspace = true
 
+[features]
+default = []
+icons = ["dep:radix-leptos-icons"]
+
 [dependencies]
 console_error_panic_hook.workspace = true
 console_log.workspace = true
 leptos = { workspace = true, features = ["csr"] }
 log.workspace = true
 radix-leptos-icons = { workspace = true, optional = true }
-
-[features]
-default = []
-icons = ["dep:radix-leptos-icons"]

book-examples/leptos/icons/Cargo.toml

@@ -8,19 +8,6 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 version.workspace = true
-
-[dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-leptos = { workspace = true, features = ["csr"] }
-log.workspace = true
-radix-leptos-aspect-ratio = { workspace = true, optional = true }
-# radix-leptos-avatar = { workspace = true, optional = true }
-# radix-leptos-checkbox = { workspace = true, optional = true }
-# radix-leptos-icons = { workspace = true, optional = true }
-radix-leptos-label = { workspace = true, optional = true }
-# radix-leptos-progress = { workspace = true, optional = true }
-radix-leptos-separator = { workspace = true, optional = true }
 # radix-leptos-switch = { workspace = true, optional = true }
 # radix-leptos-toggle = { workspace = true, optional = true }
 
@@ -43,6 +30,19 @@ progress = []
 separator = ["dep:radix-leptos-separator"]
 switch = []
 toggle = []
+
+[dependencies]
+console_error_panic_hook.workspace = true
+console_log.workspace = true
+leptos = { workspace = true, features = ["csr"] }
+log.workspace = true
+radix-leptos-aspect-ratio = { workspace = true, optional = true }
+# radix-leptos-avatar = { workspace = true, optional = true }
+# radix-leptos-checkbox = { workspace = true, optional = true }
+# radix-leptos-icons = { workspace = true, optional = true }
+radix-leptos-label = { workspace = true, optional = true }
+# radix-leptos-progress = { workspace = true, optional = true }
+radix-leptos-separator = { workspace = true, optional = true }
 # avatar = ["dep:radix-leptos-avatar"]
 # checkbox = ["dep:radix-leptos-checkbox", "dep:radix-leptos-icons"]
 # progress = ["dep:radix-leptos-progress"]