Finish move of hbs_renderer to mdbook-html

This updates everything for the move of hbs_renderer to mdbook-html.

Author: ehuss

Cargo.lock

@@ -21,7 +21,11 @@ repository = "https://github.com/rust-lang/mdBook"
 rust-version = "1.85.0" # Keep in sync with installation.md and .github/workflows/main.yml
 
 [workspace.dependencies]
+ammonia = "4.1.1"
 anyhow = "1.0.98"
+elasticlunr-rs = "3.0.2"
+handlebars = "6.3.2"
+hex = "0.4.3"
 log = "0.4.27"
 mdbook-core = { path = "crates/mdbook-core" }
 mdbook-html = { path = "crates/mdbook-html" }
@@ -30,10 +34,12 @@ mdbook-preprocessor = { path = "crates/mdbook-preprocessor" }
 mdbook-renderer = { path = "crates/mdbook-renderer" }
 mdbook-summary = { path = "crates/mdbook-summary" }
 memchr = "2.7.5"
+pretty_assertions = "1.4.1"
 pulldown-cmark = { version = "0.10.3", default-features = false, features = ["html"] } # Do not update, part of the public api.
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
+sha2 = "0.10.9"
 tempfile = "3.20.0"
 toml = "0.5.11" # Do not update, see https://github.com/rust-lang/mdBook/issues/2037
 
@@ -61,8 +67,6 @@ chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
 clap = { version = "4.3.12", features = ["cargo", "wrap_help"] }
 clap_complete = "4.3.2"
 env_logger = "0.11.1"
-handlebars = "6.0"
-hex = "0.4.3"
 log.workspace = true
 mdbook-core.workspace = true
 mdbook-html.workspace = true
@@ -76,7 +80,6 @@ pulldown-cmark.workspace = true
 regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-sha2 = "0.10.8"
 shlex = "1.3.0"
 tempfile.workspace = true
 toml.workspace = true
@@ -95,22 +98,17 @@ tokio = { version = "1.43.1", features = ["macros", "rt-multi-thread"], optional
 axum = { version = "0.8.0", features = ["ws"], optional = true }
 tower-http = { version = "0.6.0", features = ["fs", "trace"], optional = true }
 
-# Search feature
-elasticlunr-rs = { version = "3.0.2", optional = true }
-ammonia = { version = "4.0.0", optional = true }
-
 [dev-dependencies]
 select = "0.6.0"
 semver = "1.0.17"
 snapbox = { version = "0.6.21", features = ["diff", "dir", "term-svg", "regex", "json"] }
-pretty_assertions = "1.3.0"
 walkdir = "2.3.3"
 
 [features]
 default = ["watch", "serve", "search"]
 watch = ["dep:notify", "dep:notify-debouncer-mini", "dep:ignore", "dep:pathdiff", "dep:walkdir"]
 serve = ["dep:futures-util", "dep:tokio", "dep:axum", "dep:tower-http"]
-search = ["dep:elasticlunr-rs", "dep:ammonia", "mdbook-html/search"]
+search = ["mdbook-html/search"]
 
 [[bin]]
 doc = false

Cargo.toml

@@ -8,14 +8,28 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+ammonia = { workspace = true, optional = true }
 anyhow.workspace = true
+elasticlunr-rs = { workspace = true, optional = true }
+handlebars.workspace = true
+hex.workspace = true
 log.workspace = true
+mdbook-core.workspace = true
+mdbook-markdown.workspace = true
+mdbook-renderer.workspace = true
+pulldown-cmark.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sha2.workspace = true
 
 [dev-dependencies]
+pretty_assertions.workspace = true
 tempfile.workspace = true
+toml.workspace = true
 
 [lints]
 workspace = true
 
 [features]
-search = []
+search = ["dep:ammonia", "dep:elasticlunr-rs"]

crates/mdbook-html/Cargo.toml

@@ -1,26 +1,23 @@
-use crate::book::{Book, BookItem};
-use crate::renderer::html_handlebars::StaticFiles;
-use crate::renderer::html_handlebars::helpers;
-use crate::renderer::{RenderContext, Renderer};
-
-use std::borrow::Cow;
-use std::collections::BTreeMap;
-use std::collections::HashMap;
-use std::fs::{self, File};
-use std::path::{Path, PathBuf};
-use std::sync::LazyLock;
-
+use super::helpers;
+use super::static_files::StaticFiles;
+use crate::theme::Theme;
 use anyhow::{Context, Result, bail};
 use handlebars::Handlebars;
 use log::{debug, info, trace, warn};
+use mdbook_core::book::{Book, BookItem};
 use mdbook_core::config::{BookConfig, Code, Config, HtmlConfig, Playground, RustEdition};
 use mdbook_core::utils;
 use mdbook_core::utils::fs::get_404_output_file;
-use mdbook_html::theme::Theme;
 use mdbook_markdown::{render_markdown, render_markdown_with_path};
-
+use mdbook_renderer::{RenderContext, Renderer};
 use regex::{Captures, Regex};
 use serde_json::json;
+use std::borrow::Cow;
+use std::collections::BTreeMap;
+use std::collections::HashMap;
+use std::fs::{self, File};
+use std::path::{Path, PathBuf};
+use std::sync::LazyLock;
 
 /// The HTML renderer for mdBook.
 #[derive(Default)]

crates/mdbook-html/src/html_handlebars/hbs_renderer.rs

@@ -1,9 +1,7 @@
-pub use self::hbs_renderer::HtmlHandlebars;
-pub use self::static_files::StaticFiles;
-
 mod hbs_renderer;
 mod helpers;
-mod static_files;
-
 #[cfg(feature = "search")]
 mod search;
+mod static_files;
+
+pub use self::hbs_renderer::HtmlHandlebars;

crates/mdbook-html/src/html_handlebars/mod.rs

@@ -1,20 +1,18 @@
-use std::borrow::Cow;
-use std::collections::{HashMap, HashSet};
-use std::path::{Path, PathBuf};
-use std::sync::LazyLock;
-
+use super::static_files::StaticFiles;
+use crate::theme::searcher;
 use anyhow::{Context, Result, bail};
 use elasticlunr::{Index, IndexBuilder};
 use log::{debug, warn};
+use mdbook_core::book::{Book, BookItem, Chapter};
 use mdbook_core::config::{Search, SearchChapterSettings};
 use mdbook_core::utils;
-use mdbook_html::theme::searcher;
 use mdbook_markdown::new_cmark_parser;
 use pulldown_cmark::*;
 use serde::Serialize;
-
-use crate::book::{Book, BookItem, Chapter};
-use crate::renderer::html_handlebars::StaticFiles;
+use std::borrow::Cow;
+use std::collections::{HashMap, HashSet};
+use std::path::{Path, PathBuf};
+use std::sync::LazyLock;
 
 const MAX_WORD_LENGTH_TO_INDEX: usize = 80;
 
@@ -394,7 +392,7 @@ fn chapter_settings_priority() {
         "cli/inner" = { enable = true }
         "foo" = {} # Just to make sure empty table is allowed.
     "#;
-    let cfg: crate::Config = toml::from_str(cfg).unwrap();
+    let cfg: mdbook_core::config::Config = toml::from_str(cfg).unwrap();
     let html = cfg.html_config().unwrap();
     let chapter_configs = sort_search_config(&html.search.unwrap().chapter);
     for (path, enable) in [

crates/mdbook-html/src/html_handlebars/search.rs

@@ -1,13 +1,11 @@
 //! Support for writing static files.
 
+use super::helpers::resources::ResourceHelper;
+use crate::theme::{self, Theme, playground_editor};
 use anyhow::{Context, Result};
 use log::{debug, warn};
 use mdbook_core::config::HtmlConfig;
 use mdbook_core::utils;
-use mdbook_html::theme::{self, Theme, playground_editor};
-
-use crate::renderer::html_handlebars::helpers::resources::ResourceHelper;
-
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fs::{self, File};
@@ -300,9 +298,9 @@ impl StaticFiles {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::theme::Theme;
     use mdbook_core::config::HtmlConfig;
     use mdbook_core::utils::fs::write_file;
-    use mdbook_html::theme::Theme;
     use tempfile::TempDir;
 
     #[test]

crates/mdbook-html/src/html_handlebars/static_files.rs

@@ -1,3 +1,6 @@
 //! mdBook HTML renderer.
 
+mod html_handlebars;
 pub mod theme;
+
+pub use html_handlebars::HtmlHandlebars;

crates/mdbook-html/src/lib.rs

@@ -10,11 +10,14 @@ mod init;
 
 pub use self::book::load_book;
 pub use self::init::BookBuilder;
+use crate::preprocess::{CmdPreprocessor, IndexPreprocessor, LinkPreprocessor};
+use crate::renderer::{CmdRenderer, MarkdownRenderer};
 use anyhow::{Context, Error, Result, bail};
 use log::{debug, error, info, log_enabled, trace, warn};
 pub use mdbook_core::book::{Book, BookItem, BookItems, Chapter, SectionNumber};
 use mdbook_core::config::{Config, RustEdition};
 use mdbook_core::utils;
+use mdbook_html::HtmlHandlebars;
 use mdbook_preprocessor::{Preprocessor, PreprocessorContext};
 use mdbook_renderer::{RenderContext, Renderer};
 pub use mdbook_summary::{Link, Summary, SummaryItem, parse_summary};
@@ -26,9 +29,6 @@ use tempfile::Builder as TempFileBuilder;
 use toml::Value;
 use topological_sort::TopologicalSort;
 
-use crate::preprocess::{CmdPreprocessor, IndexPreprocessor, LinkPreprocessor};
-use crate::renderer::{CmdRenderer, HtmlHandlebars, MarkdownRenderer};
-
 /// The object used to manage and build a book.
 pub struct MDBook {
     /// The book's root directory.

src/book/mod.rs

@@ -21,10 +21,8 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use toml::Value;
 
-pub use self::html_handlebars::HtmlHandlebars;
 pub use self::markdown_renderer::MarkdownRenderer;
 
-mod html_handlebars;
 mod markdown_renderer;
 
 /// A generic renderer which will shell out to an arbitrary executable.