From 6aac5d3b850962b34a1c32fc6e9c2875e8a955b9 Mon Sep 17 00:00:00 2001 From: Hill Date: Wed, 8 Oct 2025 13:34:52 +0800 Subject: [PATCH 1/2] upgrade mdbook-mermaid = { version = "0.16.0" } --- Dockerfile | 3 +- README.md | 2 +- docker/mybook/Cargo.lock | 284 ++++++++------------------------------- docker/mybook/Cargo.toml | 6 +- install-packages.sh | 4 +- 5 files changed, 60 insertions(+), 239 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a33822..e189667 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,7 @@ COPY --from=builder \ /home/rust/src/.bin/rust-${RUST_VER}/mdbook/0.4.52/bin/mdbook \ /home/rust/src/.bin/rust-${RUST_VER}/mdbook-plantuml/0.8.0/bin/mdbook-plantuml \ /home/rust/src/.bin/rust-${RUST_VER}/mdbook-toc/0.14.2/bin/mdbook-toc \ - /home/rust/src/.bin/rust-${RUST_VER}/mdbook-mermaid/0.15.0/bin/mdbook-mermaid \ - /home/rust/src/.bin/rust-${RUST_VER}/mdbook-pandoc/0.10.5/bin/mdbook-pandoc \ + /home/rust/src/.bin/rust-${RUST_VER}/mdbook-mermaid/0.16.0/bin/mdbook-mermaid \ /usr/local/bin/ # init packages diff --git a/README.md b/README.md index 89ddb5d..35d8dbe 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ | --------------- | ------- | | mdbook | 0.4.52 | | mdbook-toc | 0.14.2 | -| mdbook-mermaid | 0.15.0 | +| mdbook-mermaid | 0.16.0 | | mdbook-plantuml | 0.8.0 | | mdbook-pandoc | 0.10.5 | diff --git a/docker/mybook/Cargo.lock b/docker/mybook/Cargo.lock index 879fa2d..5ad7575 100644 --- a/docker/mybook/Cargo.lock +++ b/docker/mybook/Cargo.lock @@ -38,7 +38,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459" dependencies = [ - "html5ever 0.27.0", + "html5ever", "maplit", "once_cell", "tendril", @@ -134,7 +134,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", "winapi", ] @@ -483,29 +483,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cssparser" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf", - "smallvec", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.98", -] - [[package]] name = "darling" version = "0.20.10" @@ -625,27 +602,6 @@ dependencies = [ "syn 2.0.98", ] -[[package]] -name = "dtoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] - -[[package]] -name = "ego-tree" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2972feb8dffe7bc8c5463b1dacda1b0dfbed3710e50f977d965429692d74cd8" - [[package]] name = "either" version = "1.13.0" @@ -685,27 +641,14 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] @@ -982,12 +925,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - [[package]] name = "hex" version = "0.4.3" @@ -1002,23 +939,12 @@ checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" dependencies = [ "log", "mac", - "markup5ever 0.12.1", + "markup5ever", "proc-macro2", "quote", "syn 2.0.98", ] -[[package]] -name = "html5ever" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" -dependencies = [ - "log", - "markup5ever 0.35.0", - "match_token", -] - [[package]] name = "http" version = "0.2.12" @@ -1375,7 +1301,6 @@ checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown 0.15.2", - "serde", ] [[package]] @@ -1404,17 +1329,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" -[[package]] -name = "is-terminal" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -1436,6 +1350,30 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "js-sys" version = "0.3.77" @@ -1574,28 +1512,6 @@ dependencies = [ "tendril", ] -[[package]] -name = "markup5ever" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" -dependencies = [ - "log", - "tendril", - "web_atoms", -] - -[[package]] -name = "match_token" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "matchit" version = "0.8.4" @@ -1615,7 +1531,7 @@ dependencies = [ "clap 4.5.27", "clap_complete", "elasticlunr-rs", - "env_logger 0.11.6", + "env_logger", "futures-util", "handlebars", "hex", @@ -1634,7 +1550,7 @@ dependencies = [ "shlex", "tempfile", "tokio", - "toml 0.5.11", + "toml", "topological-sort", "tower-http", "walkdir", @@ -1642,49 +1558,19 @@ dependencies = [ [[package]] name = "mdbook-mermaid" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77025b909410b7a0f05b25b4298b693b0081c52d23b6acb1596f8ae85b7ff1e" +checksum = "62afd2342d4110e338a557c75c24b4092c7d7007fe737b1fd861785cdf07acab" dependencies = [ "clap 4.5.27", - "env_logger 0.10.2", + "env_logger", "log", "mdbook", - "pulldown-cmark 0.9.6", + "pulldown-cmark 0.10.3", "serde_json", "toml_edit", ] -[[package]] -name = "mdbook-pandoc" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df70fe4cedd6334e03cc2534638f5594972668c955e124fcc204dd146a45b0c1" -dependencies = [ - "aho-corasick", - "anyhow", - "chrono", - "cssparser", - "ego-tree", - "env_logger 0.11.6", - "html5ever 0.35.0", - "indexmap 2.7.1", - "log", - "mdbook", - "normpath", - "once_cell", - "pulldown-cmark 0.13.0", - "regex", - "replace_with", - "semver", - "serde", - "serde_yaml", - "tempfile", - "toml 0.9.5", - "utf8parse", - "walkdir", -] - [[package]] name = "mdbook-plantuml" version = "0.8.0" @@ -1717,7 +1603,7 @@ dependencies = [ "mdbook", "pulldown-cmark 0.9.6", "serde_json", - "toml 0.5.11", + "toml", ] [[package]] @@ -1769,7 +1655,6 @@ version = "0.1.0" dependencies = [ "mdbook", "mdbook-mermaid", - "mdbook-pandoc", "mdbook-plantuml", "mdbook-toc", ] @@ -2038,7 +1923,6 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ - "phf_macros", "phf_shared", ] @@ -2062,19 +1946,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "phf_shared" version = "0.11.3" @@ -2102,6 +1973,21 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -2174,17 +2060,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "pulldown-cmark" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" -dependencies = [ - "bitflags 2.8.0", - "memchr", - "unicase", -] - [[package]] name = "pulldown-cmark-escape" version = "0.10.1" @@ -2297,12 +2172,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "replace_with" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51743d3e274e2b18df81c4dc6caf8a5b8e15dbe799e0dca05c7617380094e884" - [[package]] name = "reqwest" version = "0.11.27" @@ -2430,12 +2299,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" - [[package]] name = "serde" version = "1.0.217" @@ -2488,15 +2351,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" -dependencies = [ - "serde", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2871,32 +2725,12 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime 0.7.0", -] - [[package]] name = "toml_datetime" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" -[[package]] -name = "toml_datetime" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" -dependencies = [ - "serde", -] - [[package]] name = "toml_edit" version = "0.15.0" @@ -2906,7 +2740,7 @@ dependencies = [ "combine", "indexmap 1.9.3", "itertools", - "toml_datetime 0.5.1", + "toml_datetime", ] [[package]] @@ -3228,18 +3062,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "web_atoms" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" -dependencies = [ - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/docker/mybook/Cargo.toml b/docker/mybook/Cargo.toml index 4446e3f..5828adc 100644 --- a/docker/mybook/Cargo.toml +++ b/docker/mybook/Cargo.toml @@ -9,12 +9,10 @@ crate-type = ["staticlib"] mdbook = { version = "0.4.52", locked = true } mdbook-plantuml = { version = "0.8.0" } mdbook-toc = { version = "0.14.2" } -mdbook-mermaid = { version = "0.15.0" } -mdbook-pandoc = { version = "0.10.5" } +mdbook-mermaid = { version = "0.16.0" } [dependencies] mdbook = "0.4.52" mdbook-plantuml = "0.8.0" mdbook-toc = "0.14.2" -mdbook-mermaid = { version = "0.15.0" } -mdbook-pandoc = { version = "0.10.5" } +mdbook-mermaid = { version = "0.16.0" } diff --git a/install-packages.sh b/install-packages.sh index 93ce6b4..e511a0a 100755 --- a/install-packages.sh +++ b/install-packages.sh @@ -13,7 +13,9 @@ chmod 0777 -R /var/cache/fontconfig # https://github.com/allfunc/docker-mdbook/issues/8 ## cd /tmp && wget http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb && dpkg -i *.deb -apt-get update && apt-get --yes install pandoc + +# Disable pandoc +# apt-get update && apt-get --yes install pandoc # Clean apt-get clean autoclean \ From 2b9a694dd913cf6ae80c12e6c1945a6022095a2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 05:36:29 +0000 Subject: [PATCH 2/2] Bump ammonia from 4.0.0 to 4.1.2 in /docker/mybook Bumps [ammonia](https://github.com/rust-ammonia/ammonia) from 4.0.0 to 4.1.2. - [Release notes](https://github.com/rust-ammonia/ammonia/releases) - [Changelog](https://github.com/rust-ammonia/ammonia/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-ammonia/ammonia/compare/v4.0.0...v4.1.2) --- updated-dependencies: - dependency-name: ammonia dependency-version: 4.1.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- docker/mybook/Cargo.lock | 99 ++++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 15 deletions(-) diff --git a/docker/mybook/Cargo.lock b/docker/mybook/Cargo.lock index 5ad7575..e49fdbc 100644 --- a/docker/mybook/Cargo.lock +++ b/docker/mybook/Cargo.lock @@ -34,13 +34,13 @@ dependencies = [ [[package]] name = "ammonia" -version = "4.0.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459" +checksum = "17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6" dependencies = [ + "cssparser", "html5ever", "maplit", - "once_cell", "tendril", "url", ] @@ -483,6 +483,29 @@ dependencies = [ "typenum", ] +[[package]] +name = "cssparser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.98", +] + [[package]] name = "darling" version = "0.20.10" @@ -602,6 +625,21 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "dtoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + [[package]] name = "either" version = "1.13.0" @@ -933,16 +971,13 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "html5ever" -version = "0.27.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" dependencies = [ "log", - "mac", "markup5ever", - "proc-macro2", - "quote", - "syn 2.0.98", + "match_token", ] [[package]] @@ -1500,16 +1535,24 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" -version = "0.12.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" dependencies = [ "log", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", "tendril", + "web_atoms", +] + +[[package]] +name = "match_token" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", ] [[package]] @@ -1923,6 +1966,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ + "phf_macros", "phf_shared", ] @@ -1946,6 +1990,19 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "phf_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "phf_shared" version = "0.11.3" @@ -3062,6 +3119,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web_atoms" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" +dependencies = [ + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", +] + [[package]] name = "winapi" version = "0.3.9"