Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[workspace]
members = ["crates/*", "cells/*", "xtask"]
members = ["crates/*", "cells/*", "xtask", "libs/marq"]
default-members = ["crates/*", "cells/*"]
exclude = [
"libs/aasvg",
"libs/fontcull/fontcull",
"libs/hotmeal/hotmeal",
"libs/hotmeal/hotmeal-server",
"libs/hotmeal/hotmeal-wasm",
"libs/marq",
"libs/pikru",
"libs/svag",
]
Expand Down Expand Up @@ -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"
Expand Down
55 changes: 0 additions & 55 deletions libs/marq/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Loading