Merge pull request cobalt-org#1140 from epage/vim

fix!: Remove vimwiki support

Cargo.toml

@@ -96,7 +96,6 @@ normalize-line-endings = "0.3.0"
 sitemap = "0.4"
 open = "4"
 dunce = "1.0.4"
-vimwiki = { version = "0.1", features = ["html"] }
 
 file-serve = { version = "0.2.3", path = "crates/file-serve", optional = true }
 notify = { version = "6", optional = true, default-features = false, features = ["macos_fsevent"] }
@@ -106,6 +105,7 @@ sass-rs = { version = "0.2", optional = true }
 html-minifier = {version="3.0", optional = true }
 anyhow = "1.0.71"
 anstream = "0.3.2"
+chrono = "0.4.26"
 
 [dev-dependencies]
 trycmd = "0.14"

crates/config/src/frontmatter.rs

@@ -65,7 +65,6 @@ impl Frontmatter {
 
             let format = match split_name.1 {
                 Some("md") => SourceFormat::Markdown,
-                Some("wiki") => SourceFormat::Vimwiki,
                 _ => SourceFormat::Raw,
             };
             self.format.get_or_insert(format);
@@ -284,7 +283,6 @@ pub enum SourceFormat {
     #[default]
     Raw,
     Markdown,
-    Vimwiki,
     #[cfg(not(feature = "unstable"))]
     #[doc(hidden)]
     #[serde(other)]

src/cobalt.rs

@@ -31,7 +31,6 @@ struct Context {
     pub layouts: HashMap<String, String>,
     pub liquid: cobalt_model::Liquid,
     pub markdown: cobalt_model::Markdown,
-    pub vimwiki: cobalt_model::Vimwiki,
     pub assets: cobalt_model::Assets,
     pub minify: Minify,
 }
@@ -50,7 +49,6 @@ impl Context {
             layouts_path,
             liquid,
             markdown,
-            vimwiki,
             syntax: _,
             assets,
             minify,
@@ -60,7 +58,6 @@ impl Context {
         let site_attributes = site.load(&source)?;
         let liquid = liquid.build()?;
         let markdown = markdown.build();
-        let vimwiki = vimwiki.build();
         let assets = assets.build()?;
 
         let layouts = find_layouts(&layouts_path)?;
@@ -78,7 +75,6 @@ impl Context {
             layouts,
             liquid,
             markdown,
-            vimwiki,
             assets,
             minify,
         };
@@ -205,7 +201,6 @@ fn generate_doc(
         let render_context = RenderContext {
             parser: &context.liquid,
             markdown: &context.markdown,
-            vimwiki: &context.vimwiki,
             globals: &globals,
             minify: context.minify.clone(),
         };
@@ -226,7 +221,6 @@ fn generate_doc(
     let render_context = RenderContext {
         parser: &context.liquid,
         markdown: &context.markdown,
-        vimwiki: &context.vimwiki,
         globals: &globals,
         minify: context.minify.clone(),
     };

src/cobalt_model/config.rs

@@ -12,7 +12,6 @@ use super::collection;
 use super::mark;
 use super::site;
 use super::template;
-use super::vwiki;
 use crate::SyntaxHighlight;
 
 #[derive(Debug, Clone, Serialize)]
@@ -29,7 +28,6 @@ pub struct Config {
     pub layouts_path: path::PathBuf,
     pub liquid: template::LiquidBuilder,
     pub markdown: mark::MarkdownBuilder,
-    pub vimwiki: vwiki::VimwikiBuilder,
     #[serde(skip)]
     pub syntax: std::sync::Arc<SyntaxHighlight>,
     pub assets: assets::AssetsBuilder,
@@ -120,10 +118,6 @@ impl Config {
                 .enabled
                 .then(|| syntax_highlight.theme.clone()),
         };
-        let vimwiki = vwiki::VimwikiBuilder {
-            theme: syntax_highlight.theme,
-            syntax_highlight_enabled: syntax_highlight.enabled,
-        };
 
         let config = Config {
             source,
@@ -137,7 +131,6 @@ impl Config {
             layouts_path,
             liquid,
             markdown,
-            vimwiki,
             syntax,
             assets,
             minify,

src/cobalt_model/mod.rs

@@ -6,7 +6,6 @@ mod mark;
 mod sass;
 mod site;
 mod template;
-mod vwiki;
 
 pub mod files;
 pub mod pagination;
@@ -33,5 +32,3 @@ pub use self::sass::SassCompiler;
 pub use self::site::Site;
 pub use self::template::Liquid;
 pub use self::template::LiquidBuilder;
-pub use self::vwiki::Vimwiki;
-pub use self::vwiki::VimwikiBuilder;

src/document.rs

@@ -21,7 +21,6 @@ use crate::error::*;
 pub struct RenderContext<'a> {
     pub parser: &'a cobalt_model::Liquid,
     pub markdown: &'a cobalt_model::Markdown,
-    pub vimwiki: &'a cobalt_model::Vimwiki,
     pub globals: &'a Object,
     pub minify: Minify,
 }
@@ -272,7 +271,7 @@ impl Document {
         let mut url = sitemap::structs::UrlEntry::builder();
         url = url.loc(link);
         if let Some(date) = self.front.published_date {
-            let date = vimwiki::vendor::chrono::DateTime::parse_from_rfc2822(&date.to_rfc2822())
+            let date = chrono::DateTime::parse_from_rfc2822(&date.to_rfc2822())
                 .expect("chrono/time compatible RFC 2822 implementations");
             url = url.lastmod(date);
         }
@@ -317,7 +316,6 @@ impl Document {
         let html = match self.front.format {
             cobalt_model::SourceFormat::Raw => html,
             cobalt_model::SourceFormat::Markdown => context.markdown.parse(&html)?,
-            cobalt_model::SourceFormat::Vimwiki => context.vimwiki.parse(&html)?,
         };
 
         Ok(html)
@@ -436,8 +434,6 @@ fn extract_excerpt(
         cobalt_model::SourceFormat::Markdown => {
             extract_excerpt_markdown(content, excerpt_separator)
         }
-        cobalt_model::SourceFormat::Vimwiki | cobalt_model::SourceFormat::Raw => {
-            extract_excerpt_raw(content, excerpt_separator)
-        }
+        cobalt_model::SourceFormat::Raw => extract_excerpt_raw(content, excerpt_separator),
     }
 }