From 0fb1267b6c4f40ffcbea6b65729e78d453884c07 Mon Sep 17 00:00:00 2001 From: Michal Pokrywka Date: Sat, 3 Jan 2026 22:18:46 +0100 Subject: [PATCH] Updated to vertigo 0.10, fmt and sccache in pipeline --- .github/workflows/pipeline.yaml | 43 ++++++++++++++++++++------------ CHANGES.md | 6 +++++ Cargo.toml | 4 +-- README.md | 12 ++++----- examples/manual_form/Cargo.toml | 4 +-- examples/model_form/Cargo.toml | 4 +-- src/form/render/tabs.rs | 1 - src/search_panel.rs | 1 - storybook/Cargo.toml | 4 +-- storybook/src/drop_image_file.rs | 4 +-- storybook/src/form/form1.rs | 2 +- storybook/src/form/form2.rs | 3 +-- storybook/src/form/mod.rs | 2 +- storybook/src/input.rs | 2 +- storybook/src/lib.rs | 2 +- storybook/src/login.rs | 2 +- storybook/src/multi_drop_down.rs | 2 +- storybook/src/multi_select.rs | 2 +- storybook/src/popup.rs | 2 +- storybook/src/search_panel.rs | 2 +- storybook/src/select.rs | 2 +- storybook/src/select_search.rs | 2 +- storybook/src/switch.rs | 2 +- storybook/src/tabs.rs | 3 +-- storybook/src/with_loader.rs | 2 +- 25 files changed, 64 insertions(+), 51 deletions(-) diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml index 5d5ce1f..101d2f7 100644 --- a/.github/workflows/pipeline.yaml +++ b/.github/workflows/pipeline.yaml @@ -4,41 +4,52 @@ on: push: branches: [master] +env: + CARGO_INCREMENTAL: 0 + CARGO_TERM_COLOR: always + RUSTC_WRAPPER: "sccache" + RUSTFLAGS: -D warnings + SCCACHE_GHA_ENABLED: "true" + jobs: nightly-clippy: name: Nightly clippy (wasm32) runs-on: ubuntu-latest - continue-on-error: true steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - name: Checkout + uses: actions/checkout@v4 + - name: Install toolchain + uses: actions-rs/toolchain@v1 with: toolchain: nightly target: wasm32-unknown-unknown - components: clippy + components: clippy, rustfmt override: true - - uses: actions-rs/clippy-check@v1 + - name: Install sccache + uses: mozilla-actions/sccache-action@v0.0.6 + + # Formatting check + - name: Check formatting + run: cargo fmt -- --check + + # Clippy checks + - name: Vertigo-forms Clippy + uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} args: -p vertigo-forms --all-features --target wasm32-unknown-unknown -- -Dwarnings name: Vertigo-forms Clippy Output - - uses: actions-rs/clippy-check@v1 + - name: Examples Clippy + uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} args: -p vertigo-forms-storybook -p vertigo-forms-example-manual-form -p vertigo-forms-example-model-form --all-features --target wasm32-unknown-unknown -- -Dwarnings name: Storybook/Examples Clippy Output - nightly-tests: - name: Nightly tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true - - uses: actions-rs/cargo@v1 + # Unit tests + - name: Unit tests + uses: actions-rs/cargo@v1 with: command: test args: --all-features diff --git a/CHANGES.md b/CHANGES.md index 5127219..9177822 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,12 @@ +## 0.1.2 - 2026-01-05 + +### Changed + +* Updated to vertigo 0.10 + ## 0.1.1 - 2025-12-04 ### Changed diff --git a/Cargo.toml b/Cargo.toml index 1770cda..c87326f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["storybook", "examples/manual_form", "examples/model_form"] [package] name = "vertigo-forms" -version = "0.1.1" +version = "0.1.2" authors = ["Michał Pokrywka "] description = "Building block for forms in vertigo" readme = "README.md" @@ -18,4 +18,4 @@ edition = "2024" [dependencies] base64 = "0.22" either = "1.15.0" -vertigo = "0.9" +vertigo = "0.10" diff --git a/README.md b/README.md index bb8504a..c682110 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Blocks for building forms in [vertigo](https://crates.io/crates/vertigo). [![crates.io](https://img.shields.io/crates/v/vertigo-forms)](https://crates.io/crates/vertigo-forms) [![Documentation](https://docs.rs/vertigo-forms/badge.svg)](https://docs.rs/vertigo-forms) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/vertigo-forms.svg) -[![Dependency Status](https://deps.rs/crate/vertigo-forms/0.1.1/status.svg)](https://deps.rs/crate/vertigo-forms/0.1.1) +[![Dependency Status](https://deps.rs/crate/vertigo-forms/0.1.2/status.svg)](https://deps.rs/crate/vertigo-forms/0.1.2) [![CI](https://github.com/vertigo-web/vertigo-forms/actions/workflows/pipeline.yaml/badge.svg)](https://github.com/vertigo-web/vertigo-forms/actions/workflows/pipeline.yaml) [![downloads](https://img.shields.io/crates/d/vertigo-forms.svg)](https://crates.io/crates/vertigo-forms) @@ -16,14 +16,14 @@ See [Changelog](https://github.com/vertigo-web/vertigo-forms/blob/master/CHANGES Dependencies: ```toml -vertigo = "0.9" +vertigo = "0.10" vertigo-forms = "0.1" ``` Example 1: ```rust -use vertigo::{computed_tuple, main, prelude::*}; +use vertigo::{computed_tuple, prelude::*}; use vertigo_forms::{Input, Select}; #[derive(Default)] @@ -34,7 +34,7 @@ struct FormData { engine: Value, } -#[main] +#[vertigo::main] fn render() -> DomNode { let form_data = FormData::default(); @@ -74,7 +74,7 @@ fn render() -> DomNode { Example 2: ```rust -use vertigo::{bind_rc, main, prelude::*}; +use vertigo::{bind_rc, prelude::*}; use vertigo_forms::form::{DataSection as DS, FormData, FormExport, ModelForm}; #[derive(Clone, Default, PartialEq)] @@ -112,7 +112,7 @@ impl From for Car { } } -#[main] +#[vertigo::main] fn render() -> DomNode { let car = Value::new(Car::default()); diff --git a/examples/manual_form/Cargo.toml b/examples/manual_form/Cargo.toml index 7ee72ad..d8b49f0 100644 --- a/examples/manual_form/Cargo.toml +++ b/examples/manual_form/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vertigo-forms-example-manual-form" -version = "0.1.1" +version = "0.1.2" authors = ["Michał Pokrywka "] edition = "2024" @@ -8,5 +8,5 @@ edition = "2024" crate-type = ["cdylib", "rlib"] [dependencies] -vertigo = "0.9" +vertigo = "0.10" vertigo-forms = { path = "../.." } diff --git a/examples/model_form/Cargo.toml b/examples/model_form/Cargo.toml index ab2dd02..40a8901 100644 --- a/examples/model_form/Cargo.toml +++ b/examples/model_form/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vertigo-forms-example-model-form" -version = "0.1.1" +version = "0.1.2" authors = ["Michał Pokrywka "] edition = "2024" @@ -8,5 +8,5 @@ edition = "2024" crate-type = ["cdylib", "rlib"] [dependencies] -vertigo = "0.9" +vertigo = "0.10" vertigo-forms = { path = "../.." } diff --git a/src/form/render/tabs.rs b/src/form/render/tabs.rs index 1890e5e..eeabdb3 100644 --- a/src/form/render/tabs.rs +++ b/src/form/render/tabs.rs @@ -1,5 +1,4 @@ use std::rc::Rc; - use vertigo::{AttrGroup, Css, DomNode, Value, dom}; use crate::{ diff --git a/src/search_panel.rs b/src/search_panel.rs index c919d7c..3637276 100644 --- a/src/search_panel.rs +++ b/src/search_panel.rs @@ -1,5 +1,4 @@ use std::rc::Rc; - use vertigo::{AutoMap, DomNode, Resource, ToComputed, Value, bind, dom}; pub trait SearchResult { diff --git a/storybook/Cargo.toml b/storybook/Cargo.toml index ff1088c..7d4e2ac 100644 --- a/storybook/Cargo.toml +++ b/storybook/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vertigo-forms-storybook" -version = "0.1.1" +version = "0.1.2" authors = ["Michał Pokrywka "] edition = "2024" @@ -8,5 +8,5 @@ edition = "2024" crate-type = ["cdylib", "rlib"] [dependencies] -vertigo = "0.9" +vertigo = "0.10" vertigo-forms = { path = ".." } diff --git a/storybook/src/drop_image_file.rs b/storybook/src/drop_image_file.rs index afab128..e5b07b8 100644 --- a/storybook/src/drop_image_file.rs +++ b/storybook/src/drop_image_file.rs @@ -1,6 +1,6 @@ use std::rc::Rc; -use vertigo::{css, dom, DomNode, DropFileItem, Value}; -use vertigo_forms::{image_as_uri, DropImageFile, DropImageFileParams}; +use vertigo::{DomNode, DropFileItem, Value, css, dom}; +use vertigo_forms::{DropImageFile, DropImageFileParams, image_as_uri}; pub fn drop_file() -> DomNode { let value = Value::new(Some(Rc::new("https://picsum.photos/200".to_string()))).to_computed(); diff --git a/storybook/src/form/form1.rs b/storybook/src/form/form1.rs index b71cc90..b4041e8 100644 --- a/storybook/src/form/form1.rs +++ b/storybook/src/form/form1.rs @@ -1,4 +1,4 @@ -use vertigo::{bind_rc, component, css, dom, Value}; +use vertigo::{Value, bind_rc, component, css, dom}; use vertigo_forms::form::{ DataSection, FieldsetStyle, FormData, FormExport, FormParams, ModelForm, }; diff --git a/storybook/src/form/form2.rs b/storybook/src/form/form2.rs index 86accaa..67156e0 100644 --- a/storybook/src/form/form2.rs +++ b/storybook/src/form/form2.rs @@ -1,6 +1,5 @@ use std::rc::Rc; - -use vertigo::{bind_rc, component, css, dom, Value}; +use vertigo::{Value, bind_rc, component, css, dom}; use vertigo_forms::form::{DataSection, FormData, FormExport, FormParams, ModelForm}; // Form example 2 diff --git a/storybook/src/form/mod.rs b/storybook/src/form/mod.rs index 7c5e487..7c5823f 100644 --- a/storybook/src/form/mod.rs +++ b/storybook/src/form/mod.rs @@ -1,5 +1,5 @@ use std::rc::Rc; -use vertigo::{dom, DomNode, Value}; +use vertigo::{DomNode, Value, dom}; use vertigo_forms::{Tab, Tabs}; use crate::bordered_tabs; diff --git a/storybook/src/input.rs b/storybook/src/input.rs index 71df725..a25089c 100644 --- a/storybook/src/input.rs +++ b/storybook/src/input.rs @@ -1,4 +1,4 @@ -use vertigo::{dom, DomNode, Value}; +use vertigo::{DomNode, Value, dom}; use vertigo_forms::{Input, InputWithButton, ListInput}; pub fn input() -> DomNode { diff --git a/storybook/src/lib.rs b/storybook/src/lib.rs index 0fd1f42..26deb57 100644 --- a/storybook/src/lib.rs +++ b/storybook/src/lib.rs @@ -1,5 +1,5 @@ use std::{fmt, rc::Rc}; -use vertigo::{css, dom, main, router::Router, DomNode}; +use vertigo::{DomNode, css, dom, main, router::Router}; use vertigo_forms::{Tab, Tabs, TabsParams}; mod drop_image_file; diff --git a/storybook/src/login.rs b/storybook/src/login.rs index 2e7b1f8..08b9fb6 100644 --- a/storybook/src/login.rs +++ b/storybook/src/login.rs @@ -1,4 +1,4 @@ -use vertigo::{bind_rc, dom, DomNode, Resource, Value}; +use vertigo::{DomNode, Resource, Value, bind_rc, dom}; use vertigo_forms::login::{Login, LoginParams}; pub fn login() -> DomNode { diff --git a/storybook/src/multi_drop_down.rs b/storybook/src/multi_drop_down.rs index 5411d46..871a897 100644 --- a/storybook/src/multi_drop_down.rs +++ b/storybook/src/multi_drop_down.rs @@ -1,4 +1,4 @@ -use vertigo::{dom, DomNode, Value}; +use vertigo::{DomNode, Value, dom}; use vertigo_forms::MultiDropDown; pub fn multi_drop_down() -> DomNode { diff --git a/storybook/src/multi_select.rs b/storybook/src/multi_select.rs index 133bad0..d1f3296 100644 --- a/storybook/src/multi_select.rs +++ b/storybook/src/multi_select.rs @@ -1,4 +1,4 @@ -use vertigo::{dom, DomNode, Value}; +use vertigo::{DomNode, Value, dom}; use vertigo_forms::MultiSelect; pub fn multi_select() -> DomNode { diff --git a/storybook/src/popup.rs b/storybook/src/popup.rs index 0044b64..c8a8160 100644 --- a/storybook/src/popup.rs +++ b/storybook/src/popup.rs @@ -1,4 +1,4 @@ -use vertigo::{css, dom, DomNode, Value}; +use vertigo::{DomNode, Value, css, dom}; use vertigo_forms::{Popup, PopupOnHover, PopupParams, Switch}; pub fn popup() -> DomNode { diff --git a/storybook/src/search_panel.rs b/storybook/src/search_panel.rs index ed4cb28..aaabe3b 100644 --- a/storybook/src/search_panel.rs +++ b/storybook/src/search_panel.rs @@ -1,5 +1,5 @@ use std::rc::Rc; -use vertigo::{dom, AutoMap, Computed, DomNode, Resource, Value}; +use vertigo::{AutoMap, Computed, DomNode, Resource, Value, dom}; use vertigo_forms::{SearchPanel, SearchPanelParams}; pub fn search_panel() -> DomNode { diff --git a/storybook/src/select.rs b/storybook/src/select.rs index 5a321b0..8355bd6 100644 --- a/storybook/src/select.rs +++ b/storybook/src/select.rs @@ -1,4 +1,4 @@ -use vertigo::{dom, DomNode, Value}; +use vertigo::{DomNode, Value, dom}; use vertigo_forms::Select; pub fn select() -> DomNode { diff --git a/storybook/src/select_search.rs b/storybook/src/select_search.rs index 4d147b8..58e8439 100644 --- a/storybook/src/select_search.rs +++ b/storybook/src/select_search.rs @@ -1,5 +1,5 @@ use std::collections::HashMap; -use vertigo::{computed_tuple, dom, DomNode, Value}; +use vertigo::{DomNode, Value, computed_tuple, dom}; use vertigo_forms::SelectSearch; pub fn select_search() -> DomNode { diff --git a/storybook/src/switch.rs b/storybook/src/switch.rs index b1dc9cc..4486295 100644 --- a/storybook/src/switch.rs +++ b/storybook/src/switch.rs @@ -1,4 +1,4 @@ -use vertigo::{dom, html_entities, DomNode, Value}; +use vertigo::{DomNode, Value, dom, html_entities}; use vertigo_forms::{Switch, SwitchParams}; pub fn switch() -> DomNode { diff --git a/storybook/src/tabs.rs b/storybook/src/tabs.rs index b75f020..461bb6f 100644 --- a/storybook/src/tabs.rs +++ b/storybook/src/tabs.rs @@ -1,6 +1,5 @@ use std::rc::Rc; - -use vertigo::{bind_rc, dom, DomNode, Value}; +use vertigo::{DomNode, Value, bind_rc, dom}; use vertigo_forms::{Tab, TabsContentMapped, TabsHeader}; use crate::bordered_tabs; diff --git a/storybook/src/with_loader.rs b/storybook/src/with_loader.rs index 31b7092..b465adc 100644 --- a/storybook/src/with_loader.rs +++ b/storybook/src/with_loader.rs @@ -1,4 +1,4 @@ -use vertigo::{bind, bind_rc, dom, DomNode, Resource, Value}; +use vertigo::{DomNode, Resource, Value, bind, bind_rc, dom}; use vertigo_forms::WithLoader; pub fn with_loader() -> DomNode {