diff --git a/Cargo.lock b/Cargo.lock index ca6eb7bb..27223b56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -945,7 +945,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "html-compare" -version = "0.1.5" +version = "0.1.6" dependencies = [ "colored", "htmlparser", @@ -1502,7 +1502,7 @@ dependencies = [ [[package]] name = "mrml" -version = "6.0.1" +version = "7.0.0" dependencies = [ "async-trait", "concat-idents", @@ -1528,7 +1528,7 @@ dependencies = [ [[package]] name = "mrml-cli" -version = "1.7.3" +version = "1.7.4" dependencies = [ "clap", "env_logger", @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "mrml-python" -version = "0.2.4" +version = "0.2.5" dependencies = [ "mrml", "pyo3", @@ -1548,7 +1548,7 @@ dependencies = [ [[package]] name = "mrml-wasm" -version = "1.6.1" +version = "1.6.2" dependencies = [ "mrml", "serde", diff --git a/examples/axum/Cargo.toml b/examples/axum/Cargo.toml index 527a9b67..90207b97 100644 --- a/examples/axum/Cargo.toml +++ b/examples/axum/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] axum = { version = "0.8", features = ["macros"] } -mrml = { version = "6.0.1", path = "../../packages/mrml-core", features = [ +mrml = { version = "7.0.0", path = "../../packages/mrml-core", features = [ "async", "http-loader-async-reqwest", ] } diff --git a/packages/mrml-cli/CHANGELOG.md b/packages/mrml-cli/CHANGELOG.md index 209c2411..9c21316b 100644 --- a/packages/mrml-cli/CHANGELOG.md +++ b/packages/mrml-cli/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.7.4](https://github.com/jdrouet/mrml/compare/mrml-cli-v1.7.3...mrml-cli-v1.7.4) - 2026-09-13 + +### Other + +- *(mrml-cli)* read input files with fs::read_to_string ([#680](https://github.com/jdrouet/mrml/pull/680)) + ## [1.7.3](https://github.com/jdrouet/mrml/compare/mrml-cli-v1.7.2...mrml-cli-v1.7.3) - 2026-04-25 ### Other diff --git a/packages/mrml-cli/Cargo.toml b/packages/mrml-cli/Cargo.toml index dd3b4f44..1543a0cf 100644 --- a/packages/mrml-cli/Cargo.toml +++ b/packages/mrml-cli/Cargo.toml @@ -2,7 +2,7 @@ name = "mrml-cli" description = "CLI for the Rust implementation of MJML renderer" keywords = ["cli", "email", "mjml"] -version = "1.7.3" +version = "1.7.4" authors.workspace = true edition.workspace = true license.workspace = true @@ -16,7 +16,7 @@ path = "src/main.rs" name = "mrml" [dependencies] -mrml = { version = "6.0.1", path = "../mrml-core", features = [ +mrml = { version = "7.0.0", path = "../mrml-core", features = [ "http-loader-ureq", "local-loader", ] } diff --git a/packages/mrml-core/CHANGELOG.md b/packages/mrml-core/CHANGELOG.md index 71c6e96b..027f6548 100644 --- a/packages/mrml-core/CHANGELOG.md +++ b/packages/mrml-core/CHANGELOG.md @@ -6,6 +6,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [7.0.0](https://github.com/jdrouet/mrml/compare/mrml-v6.0.1...mrml-v7.0.0) - 2026-09-13 + +### Fixed + +- *(mrml-core)* make local loader containment hold ([#695](https://github.com/jdrouet/mrml/pull/695)) +- *(mrml-core)* forward layout context through mj-include ([#696](https://github.com/jdrouet/mrml/pull/696)) +- also consider carriage return when skipping empty tokens ([#656](https://github.com/jdrouet/mrml/pull/656)) +- *(mrml-core)* return typed error for unsupported mj-include type instead of panicking ([#647](https://github.com/jdrouet/mrml/pull/647)) +- *(mrml-core)* accept unitless zero in Pixel::try_from ([#644](https://github.com/jdrouet/mrml/pull/644)) +- *(mrml-core)* warn on duplicate attributes and keep first value ([#638](https://github.com/jdrouet/mrml/pull/638)) + +### Other + +- fold css-compare into html-compare ([#691](https://github.com/jdrouet/mrml/pull/691)) +- *(mrml-core)* scope the dead_code allow to the render feature ([#690](https://github.com/jdrouet/mrml/pull/690)) +- *(mrml-core)* merge the dense and pretty printers ([#682](https://github.com/jdrouet/mrml/pull/682)) +- *(mrml-core)* replace the Map and Set newtypes with type aliases ([#683](https://github.com/jdrouet/mrml/pull/683)) +- *(mrml-core)* simplify the spacing and sort helpers ([#681](https://github.com/jdrouet/mrml/pull/681)) +- *(deps)* remove unused itertools dependency ([#677](https://github.com/jdrouet/mrml/pull/677)) +- rewrap comments for current nightly rustfmt ([#673](https://github.com/jdrouet/mrml/pull/673)) +- *(deps)* Bump mjml from 4.18.0 to 5.0.0 in /scripts ([#653](https://github.com/jdrouet/mrml/pull/653)) +- add zed-mjml to the list of what is using it ([#649](https://github.com/jdrouet/mrml/pull/649)) + ## [6.0.1](https://github.com/jdrouet/mrml/compare/mrml-v6.0.0...mrml-v6.0.1) - 2026-04-25 ### Fixed diff --git a/packages/mrml-core/Cargo.toml b/packages/mrml-core/Cargo.toml index ca368f07..41f87ea2 100644 --- a/packages/mrml-core/Cargo.toml +++ b/packages/mrml-core/Cargo.toml @@ -2,7 +2,7 @@ name = "mrml" description = "Rust implementation of MJML renderer" keywords = ["email", "mjml"] -version = "6.0.1" +version = "7.0.0" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/packages/mrml-core/lib/html-compare/CHANGELOG.md b/packages/mrml-core/lib/html-compare/CHANGELOG.md index 1b20a0c4..d8158d00 100644 --- a/packages/mrml-core/lib/html-compare/CHANGELOG.md +++ b/packages/mrml-core/lib/html-compare/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.6](https://github.com/jdrouet/mrml/compare/html-compare-v0.1.5...html-compare-v0.1.6) - 2026-09-13 + +### Other + +- fold css-compare into html-compare ([#691](https://github.com/jdrouet/mrml/pull/691)) +- rewrap comments for current nightly rustfmt ([#673](https://github.com/jdrouet/mrml/pull/673)) + ## [0.1.5](https://github.com/jdrouet/mrml/compare/html-compare-v0.1.4...html-compare-v0.1.5) - 2025-11-16 ### Fixed diff --git a/packages/mrml-core/lib/html-compare/Cargo.toml b/packages/mrml-core/lib/html-compare/Cargo.toml index 2083d85b..db152009 100644 --- a/packages/mrml-core/lib/html-compare/Cargo.toml +++ b/packages/mrml-core/lib/html-compare/Cargo.toml @@ -2,7 +2,7 @@ name = "html-compare" description = "A simple library to compare html files" license = "MIT" -version = "0.1.5" +version = "0.1.6" edition = "2021" repository = "https://github.com/jdrouet/mrml" diff --git a/packages/mrml-python/CHANGELOG.md b/packages/mrml-python/CHANGELOG.md index a44ce65b..ffd3cf20 100644 --- a/packages/mrml-python/CHANGELOG.md +++ b/packages/mrml-python/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.2.5](https://github.com/jdrouet/mrml/compare/mrml-python-v0.2.4...mrml-python-v0.2.5) - 2026-09-13 + +### Other + +- *(mrml-python)* inline the single-caller warning converter ([#689](https://github.com/jdrouet/mrml/pull/689)) +- *(deps)* Bump pyo3 from 0.28.3 to 0.29.0 ([#648](https://github.com/jdrouet/mrml/pull/648)) + ## [0.2.4](https://github.com/jdrouet/mrml/compare/mrml-python-v0.2.3...mrml-python-v0.2.4) - 2026-04-25 ### Other diff --git a/packages/mrml-python/Cargo.toml b/packages/mrml-python/Cargo.toml index e36eb390..a339311f 100644 --- a/packages/mrml-python/Cargo.toml +++ b/packages/mrml-python/Cargo.toml @@ -2,7 +2,7 @@ name = "mrml-python" description = "Python wrapping on MRML" keywords = ["email", "mjml"] -version = "0.2.4" +version = "0.2.5" authors.workspace = true edition.workspace = true license.workspace = true @@ -16,7 +16,7 @@ name = "mrml" crate-type = ["cdylib"] [dependencies] -mrml = { version = "6.0.1", path = "../mrml-core", features = [ +mrml = { version = "7.0.0", path = "../mrml-core", features = [ "http-loader-ureq", "local-loader", "css-inline", diff --git a/packages/mrml-wasm/CHANGELOG.md b/packages/mrml-wasm/CHANGELOG.md index 967159cf..a6b106a8 100644 --- a/packages/mrml-wasm/CHANGELOG.md +++ b/packages/mrml-wasm/CHANGELOG.md @@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.6.2](https://github.com/jdrouet/mrml/compare/mrml-wasm-v1.6.1...mrml-wasm-v1.6.2) - 2026-09-13 + +### Fixed + +- *(mrml-core)* return typed error for unsupported mj-include type instead of panicking ([#647](https://github.com/jdrouet/mrml/pull/647)) +- *(mrml-core)* warn on duplicate attributes and keep first value ([#638](https://github.com/jdrouet/mrml/pull/638)) + +### Other + +- *(mrml-wasm)* remove orphan utils module and ignored release profile ([#678](https://github.com/jdrouet/mrml/pull/678)) +- *(deps-dev)* Bump mocha from 11.8.0 to 12.0.0 in /packages/mrml-wasm/examples/node ([#669](https://github.com/jdrouet/mrml/pull/669)) + ## [1.6.1](https://github.com/jdrouet/mrml/compare/mrml-wasm-v1.6.0...mrml-wasm-v1.6.1) - 2026-04-25 ### Other diff --git a/packages/mrml-wasm/Cargo.toml b/packages/mrml-wasm/Cargo.toml index 1844b50f..d8382f3c 100644 --- a/packages/mrml-wasm/Cargo.toml +++ b/packages/mrml-wasm/Cargo.toml @@ -2,7 +2,7 @@ name = "mrml-wasm" description = "Wasm wrapping on MRML" keywords = ["email", "mjml"] -version = "1.6.1" +version = "1.6.2" authors.workspace = true edition.workspace = true license.workspace = true @@ -19,7 +19,7 @@ async = ["dep:wasm-bindgen-futures", "mrml/async"] reqwest-include-loader = ["async", "mrml/http-loader-async-reqwest"] [dependencies] -mrml = { version = "6.0.1", path = "../mrml-core", default-features = false, features = [ +mrml = { version = "7.0.0", path = "../mrml-core", default-features = false, features = [ "parse", "render", ] }