Skip to content

Commit e5ed84c

Browse files
chore(deps): update rust crate mdbook to 0.5.0 (#148)
* chore(deps): update rust crate mdbook to 0.5.0 * fix(deps): migrate to mdBook v0.5 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniëlle Huisman <[email protected]>
1 parent 055396f commit e5ed84c

File tree

14 files changed

+253
-797
lines changed

14 files changed

+253
-797
lines changed

Cargo.lock

Lines changed: 208 additions & 755 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ anyhow = "1.0.86"
1414
clap = { version = "4.5.8", features = ["derive"] }
1515
env_logger = "0.11.3"
1616
log = "0.4.22"
17-
mdbook = "0.4.43"
17+
mdbook-core = "0.5.0"
18+
mdbook-driver = "0.5.0"
19+
mdbook-preprocessor = "0.5.0"
20+
mdbook-renderer = "0.5.0"
1821
pulldown-cmark = "0.13.0"
1922
semver = "1.0.23"
2023
serde = { version = "1.0.204", features = ["derive"] }

book/book.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[book]
22
authors = ["Daniëlle Huisman"]
33
language = "en"
4-
multilingual = false
54
src = "src"
65
title = "mdBook Plugins"
76

deny.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ allow = [
1717
"BSD-2-Clause",
1818
"BSD-3-Clause",
1919
"BSL-1.0",
20+
"CC-BY-4.0",
2021
"CC0-1.0",
2122
"ISC",
2223
"MIT",

packages/mdbook-tabs/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ anyhow.workspace = true
1414
clap.workspace = true
1515
env_logger.workspace = true
1616
log.workspace = true
17-
mdbook.workspace = true
17+
mdbook-driver.workspace = true
1818
mdbook-plugin-utils = { path = "../mdbook-plugin-utils", version = "0.2.1" }
19+
mdbook-preprocessor.workspace = true
1920
pulldown-cmark.workspace = true
2021
semver.workspace = true
2122
serde.workspace = true

packages/mdbook-tabs/src/bin/mdbook-tabs.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ use std::{
66
use anyhow::{Result, anyhow};
77
use clap::{Args, Parser, Subcommand};
88
use log::warn;
9-
use mdbook::{
10-
MDBook,
11-
preprocess::{CmdPreprocessor, Preprocessor},
12-
};
9+
use mdbook_driver::MDBook;
10+
use mdbook_preprocessor::Preprocessor;
11+
use mdbook_preprocessor::{MDBOOK_VERSION, parse_input};
1312
use mdbook_tabs::TabsPreprocessor;
1413
use semver::{Version, VersionReq};
1514

@@ -72,23 +71,23 @@ fn handle_supports(
7271
preprocessor: &dyn Preprocessor,
7372
SupportsArgs { renderer }: &SupportsArgs,
7473
) -> Result<()> {
75-
match preprocessor.supports_renderer(renderer) {
74+
match preprocessor.supports_renderer(renderer)? {
7675
true => Ok(()),
7776
false => Err(anyhow!("Renderer `{renderer}` is not supported.")),
7877
}
7978
}
8079

8180
fn handle_preprocessing<R: Read>(preprocessor: &dyn Preprocessor, reader: R) -> Result<()> {
82-
let (ctx, book) = CmdPreprocessor::parse_input(reader)?;
81+
let (ctx, book) = parse_input(reader)?;
8382

8483
let book_version = Version::parse(&ctx.mdbook_version)?;
85-
let version_req = VersionReq::parse(mdbook::MDBOOK_VERSION)?;
84+
let version_req = VersionReq::parse(MDBOOK_VERSION)?;
8685

8786
if !version_req.matches(&book_version) {
8887
warn!(
8988
"The {} plugin was built against version {} of mdbook, but we're being called from version {}",
9089
preprocessor.name(),
91-
mdbook::MDBOOK_VERSION,
90+
MDBOOK_VERSION,
9291
ctx.mdbook_version
9392
);
9493
}

packages/mdbook-tabs/src/parser/tabs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::ops::Range;
22

33
use anyhow::{Result, bail};
44
use log::debug;
5-
use mdbook::book::Chapter;
65
use mdbook_plugin_utils::markdown::parse_blocks;
6+
use mdbook_preprocessor::book::Chapter;
77
use pulldown_cmark::Event;
88

99
use crate::config::{TabConfig, TabsConfig};

packages/mdbook-tabs/src/preprocessor.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
use std::str;
22

33
use anyhow::{Result, bail};
4-
use mdbook::{
5-
BookItem,
6-
book::Book,
7-
preprocess::{Preprocessor, PreprocessorContext},
4+
use mdbook_preprocessor::{
5+
Preprocessor, PreprocessorContext,
6+
book::{Book, BookItem},
87
};
98

109
use crate::{parser::tabs::parse_tabs, tabs::tabs};
@@ -31,13 +30,13 @@ impl Preprocessor for TabsPreprocessor {
3130
fn run(&self, _ctx: &PreprocessorContext, book: Book) -> Result<Book> {
3231
let mut book = book.clone();
3332

34-
process_items(&mut book.sections)?;
33+
process_items(&mut book.items)?;
3534

3635
Ok(book)
3736
}
3837

39-
fn supports_renderer(&self, _renderer: &str) -> bool {
40-
true
38+
fn supports_renderer(&self, _renderer: &str) -> Result<bool> {
39+
Ok(true)
4140
}
4241
}
4342

packages/mdbook-trunk/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ fs_extra = "1.3.0"
1818
html_parser = "0.7.0"
1919
htmlentity = "1.3.2"
2020
log.workspace = true
21-
mdbook.workspace = true
21+
mdbook-core.workspace = true
22+
mdbook-driver.workspace = true
2223
mdbook-plugin-utils = { path = "../mdbook-plugin-utils", version = "0.2.1" }
24+
mdbook-preprocessor.workspace = true
25+
mdbook-renderer.workspace = true
2326
peekread = "0.1.1"
2427
pulldown-cmark.workspace = true
2528
semver.workspace = true

packages/mdbook-trunk/src/bin/mdbook-trunk.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ use anyhow::{Result, anyhow};
77
use clap::{Args, Parser, Subcommand};
88
use fs_extra::dir::{CopyOptions, DirOptions, copy, get_dir_content2};
99
use log::warn;
10-
use mdbook::{
11-
MDBook, Renderer,
12-
preprocess::{CmdPreprocessor, Preprocessor},
13-
renderer::RenderContext,
14-
};
10+
use mdbook_core::MDBOOK_VERSION;
11+
use mdbook_driver::MDBook;
12+
use mdbook_preprocessor::{Preprocessor, parse_input};
13+
use mdbook_renderer::{RenderContext, Renderer};
1514
use mdbook_trunk::{TrunkPreprocessor, TrunkRenderer};
1615
use peekread::{BufPeekReader, PeekRead};
1716
use semver::{Version, VersionReq};
@@ -124,23 +123,23 @@ fn handle_supports(
124123
preprocessor: &dyn Preprocessor,
125124
SupportsArgs { renderer }: &SupportsArgs,
126125
) -> Result<()> {
127-
match preprocessor.supports_renderer(renderer) {
126+
match preprocessor.supports_renderer(renderer)? {
128127
true => Ok(()),
129128
false => Err(anyhow!("Renderer `{renderer}` is not supported.")),
130129
}
131130
}
132131

133132
fn handle_preprocessing<R: Read>(preprocessor: &dyn Preprocessor, reader: R) -> Result<()> {
134-
let (ctx, book) = CmdPreprocessor::parse_input(reader)?;
133+
let (ctx, book) = parse_input(reader)?;
135134

136135
let book_version = Version::parse(&ctx.mdbook_version)?;
137-
let version_req = VersionReq::parse(mdbook::MDBOOK_VERSION)?;
136+
let version_req = VersionReq::parse(MDBOOK_VERSION)?;
138137

139138
if !version_req.matches(&book_version) {
140139
warn!(
141140
"The {} plugin was built against version {} of mdbook, but we're being called from version {}",
142141
preprocessor.name(),
143-
mdbook::MDBOOK_VERSION,
142+
MDBOOK_VERSION,
144143
ctx.mdbook_version
145144
);
146145
}
@@ -155,13 +154,13 @@ fn handle_renderer<R: Read>(renderer: &dyn Renderer, reader: R) -> Result<()> {
155154
let ctx = RenderContext::from_json(reader).unwrap();
156155

157156
let book_version = Version::parse(&ctx.version)?;
158-
let version_req = VersionReq::parse(mdbook::MDBOOK_VERSION)?;
157+
let version_req = VersionReq::parse(MDBOOK_VERSION)?;
159158

160159
if !version_req.matches(&book_version) {
161160
warn!(
162161
"The {} plugin was built against version {} of mdbook, but we're being called from version {}",
163162
renderer.name(),
164-
mdbook::MDBOOK_VERSION,
163+
MDBOOK_VERSION,
165164
ctx.version
166165
);
167166
}

0 commit comments

Comments
 (0)