diff --git a/Cargo.lock b/Cargo.lock index d863892a..a2d5d896 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5162,6 +5162,7 @@ dependencies = [ "arborium", "arborium-vix", "facet", + "facet-postcard", "facet-toml", "facet-value", "facet-yaml", @@ -5170,6 +5171,8 @@ dependencies = [ "pulldown-latex", "regex", "thiserror 2.0.18", + "tokio", + "tree-sitter-vixen", ] [[package]] @@ -8702,6 +8705,16 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782" +[[package]] +name = "tree-sitter-vixen" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb3c7202cbc879bf0dad79aefa385e573cd5003b2501455a37b74743d83fa41" +dependencies = [ + "cc", + "tree-sitter-language", +] + [[package]] name = "triomphe" version = "0.1.15" diff --git a/Cargo.toml b/Cargo.toml index 55cd1929..62e228bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["crates/*", "cells/*", "xtask"] +members = ["crates/*", "cells/*", "xtask", "libs/marq"] default-members = ["crates/*", "cells/*"] exclude = [ "libs/aasvg", @@ -7,7 +7,6 @@ exclude = [ "libs/hotmeal/hotmeal", "libs/hotmeal/hotmeal-server", "libs/hotmeal/hotmeal-wasm", - "libs/marq", "libs/pikru", "libs/svag", ] @@ -144,6 +143,10 @@ fontcull = { path = "libs/fontcull/fontcull", default-features = false } # Markdown marq = { path = "libs/marq" } pulldown-cmark = "0.13" +pulldown-latex = "0.7" +aasvg = "1.0" +pikru = "2.0.0-rc.0" +arborium = { version = "2", default-features = false } strictdoc-parser = "0.1.1" arborium-theme = "2" arborium-tree-sitter = "2.18.0" diff --git a/libs/marq/Cargo.toml b/libs/marq/Cargo.toml index 8278edc4..3e8e71cc 100644 --- a/libs/marq/Cargo.toml +++ b/libs/marq/Cargo.toml @@ -174,58 +174,3 @@ tree-sitter-vixen = { version = "0.1.0", optional = true } tokio = { workspace = true, features = ["rt", "macros"] } facet-postcard.workspace = true -[workspace.dependencies] -# Serialization - Facet ecosystem (git) -facet = { version = "0.50.0-rc.5" } -facet-postcard = { version = "0.50.0-rc.5" } -facet-toml = { version = "0.50.0-rc.5" } -facet-value = { version = "0.50.0-rc.5" } -facet-yaml = { version = "0.50.0-rc.5" } - -# Markdown -pulldown-cmark = "0.13" -pulldown-latex = "0.7" - -# Error handling -thiserror = "2.0" - -# Regex -regex = "1.12" - -# Async runtime -tokio = { version = "1.48", features = [ - "full", - "macros", - "process", - "rt", - "rt-multi-thread", - "sync", - "time", -] } - -# ASCII diagrams to SVG -aasvg = "1.0" - -# Pikchr diagrams -pikru = { version = "2.0.0-rc.0" } - -# Syntax highlighting - features controlled by marq's lang-* features -arborium = { version = "2", default-features = false } - -# # Force all transitive facet dependencies to use git version -# [patch.crates-io] -# facet-xml = { git = "https://github.com/facet-rs/facet-xml", branch = "main" } -# facet-svg = { git = "https://github.com/facet-rs/facet-xml", branch = "main" } -# facet = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-core = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-macro-parse = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-macro-types = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-macros = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-macros-impl = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-postcard = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-reflect = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-solver = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-toml = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-value = { git = "https://github.com/facet-rs/facet", branch = "main" } -# facet-yaml = { git = "https://github.com/facet-rs/facet", branch = "main" } -# pikru = { git = "https://github.com/bearcove/pikru", branch = "main" }