246 lines
6.6 KiB
Diff
246 lines
6.6 KiB
Diff
diff --git a/Cargo.lock b/Cargo.lock
|
|
index ae63793..4068e02 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -162,12 +162,46 @@ dependencies = [
|
|
"ansi_term",
|
|
"atty",
|
|
"bitflags",
|
|
- "strsim",
|
|
- "textwrap",
|
|
+ "strsim 0.8.0",
|
|
+ "textwrap 0.11.0",
|
|
"unicode-width",
|
|
"vec_map",
|
|
]
|
|
|
|
+[[package]]
|
|
+name = "clap"
|
|
+version = "3.2.2"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6"
|
|
+dependencies = [
|
|
+ "atty",
|
|
+ "bitflags",
|
|
+ "clap_lex",
|
|
+ "indexmap",
|
|
+ "lazy_static",
|
|
+ "strsim 0.10.0",
|
|
+ "termcolor",
|
|
+ "textwrap 0.15.1",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
+name = "clap_complete"
|
|
+version = "3.2.5"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
|
|
+dependencies = [
|
|
+ "clap 3.2.2",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
+name = "clap_lex"
|
|
+version = "0.2.4"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
|
+dependencies = [
|
|
+ "os_str_bytes",
|
|
+]
|
|
+
|
|
[[package]]
|
|
name = "cpufeatures"
|
|
version = "0.2.1"
|
|
@@ -222,9 +256,9 @@ dependencies = [
|
|
|
|
[[package]]
|
|
name = "env_logger"
|
|
-version = "0.7.1"
|
|
+version = "0.9.1"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
|
+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
|
|
dependencies = [
|
|
"atty",
|
|
"humantime",
|
|
@@ -385,15 +419,6 @@ dependencies = [
|
|
"version_check",
|
|
]
|
|
|
|
-[[package]]
|
|
-name = "getopts"
|
|
-version = "0.2.21"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
|
|
-dependencies = [
|
|
- "unicode-width",
|
|
-]
|
|
-
|
|
[[package]]
|
|
name = "getrandom"
|
|
version = "0.1.16"
|
|
@@ -471,7 +496,7 @@ dependencies = [
|
|
"log",
|
|
"pest",
|
|
"pest_derive",
|
|
- "quick-error 2.0.1",
|
|
+ "quick-error",
|
|
"serde",
|
|
"serde_json",
|
|
]
|
|
@@ -575,12 +600,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
|
|
|
|
[[package]]
|
|
name = "humantime"
|
|
-version = "1.3.0"
|
|
+version = "2.1.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
|
-dependencies = [
|
|
- "quick-error 1.2.3",
|
|
-]
|
|
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
|
|
|
[[package]]
|
|
name = "hyper"
|
|
@@ -822,13 +844,14 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
|
|
|
|
[[package]]
|
|
name = "mdbook"
|
|
-version = "0.4.15"
|
|
+version = "0.4.21"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6"
|
|
+checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9"
|
|
dependencies = [
|
|
"anyhow",
|
|
"chrono",
|
|
- "clap",
|
|
+ "clap 3.2.2",
|
|
+ "clap_complete",
|
|
"env_logger",
|
|
"handlebars",
|
|
"lazy_static",
|
|
@@ -838,7 +861,6 @@ dependencies = [
|
|
"pulldown-cmark",
|
|
"regex",
|
|
"serde",
|
|
- "serde_derive",
|
|
"serde_json",
|
|
"shlex",
|
|
"tempfile",
|
|
@@ -1062,6 +1084,12 @@ dependencies = [
|
|
"winapi 0.3.9",
|
|
]
|
|
|
|
+[[package]]
|
|
+name = "os_str_bytes"
|
|
+version = "6.3.0"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
|
|
+
|
|
[[package]]
|
|
name = "parking_lot"
|
|
version = "0.11.2"
|
|
@@ -1258,17 +1286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"
|
|
dependencies = [
|
|
"bitflags",
|
|
- "getopts",
|
|
"memchr",
|
|
"unicase",
|
|
]
|
|
|
|
-[[package]]
|
|
-name = "quick-error"
|
|
-version = "1.2.3"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
|
-
|
|
[[package]]
|
|
name = "quick-error"
|
|
version = "2.0.1"
|
|
@@ -1386,9 +1407,9 @@ dependencies = [
|
|
|
|
[[package]]
|
|
name = "regex"
|
|
-version = "1.5.4"
|
|
+version = "1.6.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
|
|
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
|
|
dependencies = [
|
|
"aho-corasick",
|
|
"memchr",
|
|
@@ -1403,9 +1424,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
|
|
|
[[package]]
|
|
name = "regex-syntax"
|
|
-version = "0.6.25"
|
|
+version = "0.6.27"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
|
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
|
|
|
|
[[package]]
|
|
name = "remove_dir_all"
|
|
@@ -1577,13 +1598,19 @@ version = "0.8.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
|
|
|
+[[package]]
|
|
+name = "strsim"
|
|
+version = "0.10.0"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
|
+
|
|
[[package]]
|
|
name = "structopt"
|
|
version = "0.3.26"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
|
|
dependencies = [
|
|
- "clap",
|
|
+ "clap 2.33.3",
|
|
"lazy_static",
|
|
"structopt-derive",
|
|
]
|
|
@@ -1673,6 +1700,12 @@ dependencies = [
|
|
"unicode-width",
|
|
]
|
|
|
|
+[[package]]
|
|
+name = "textwrap"
|
|
+version = "0.15.1"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
|
|
+
|
|
[[package]]
|
|
name = "thiserror"
|
|
version = "1.0.30"
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index dfeeb45..8b1e4e5 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -38,7 +38,7 @@ handlebars = "4.2.1"
|
|
ignore = "0.4.18"
|
|
lazy_static = "1.4.0"
|
|
lazy-regex = "2.2.2"
|
|
-mdbook = { version = "0.4.15", default-features = false }
|
|
+mdbook = { version = "0.4.21", default-features = false }
|
|
notify = "4.0.17"
|
|
pest = "2.1.3"
|
|
pest_derive = "2.1.0"
|
|
diff --git a/src/renderer/mdzk_renderer.rs b/src/renderer/mdzk_renderer.rs
|
|
index 55b2423..f8480ca 100644
|
|
--- a/src/renderer/mdzk_renderer.rs
|
|
+++ b/src/renderer/mdzk_renderer.rs
|
|
@@ -92,7 +92,7 @@ impl Renderer for HtmlMdzk {
|
|
"description",
|
|
json!(ctx.config.book.description.clone().unwrap_or_default()),
|
|
);
|
|
- if let Some(ref livereload) = html_config.livereload_url {
|
|
+ if let Some(ref livereload) = html_config.live_reload_endpoint {
|
|
data.insert("livereload", json!(livereload));
|
|
}
|
|
data.insert("fold_enable", json!(html_config.fold.enable));
|