Switch to workspace dependencies

This commit is contained in:
Laurenz 2023-11-08 12:56:35 +01:00
parent 7f1c38548a
commit 4794bd35fa
9 changed files with 278 additions and 172 deletions

View File

@ -12,6 +12,111 @@ homepage = "https://typst.app"
repository = "https://github.com/typst/typst" repository = "https://github.com/typst/typst"
readme = "README.md" readme = "README.md"
license = "Apache-2.0" license = "Apache-2.0"
categories = ["compilers"]
keywords = ["typst"]
[workspace.dependencies]
typst = { path = "crates/typst" }
typst-library = { path = "crates/typst-library" }
typst-macros = { path = "crates/typst-macros" }
typst-syntax = { path = "crates/typst-syntax" }
az = "1.2"
base64 = "0.21.2"
bitflags = { version = "2", features = ["serde"] }
bytemuck = "1"
chinese-number = { version = "0.7.2", default-features = false, features = ["number-to-chinese"] }
chrono = { version = "0.4.24", default-features = false, features = ["clock", "std"] }
ciborium = "0.2.1"
clap = { version = "4.4", features = ["derive", "env"] }
clap_complete = "4.2.1"
clap_mangen = "0.2.10"
codespan-reporting = "0.11"
comemo = "0.3"
csv = "1"
dirs = "5"
ecow = { version = "0.2", features = ["serde"] }
env_proxy = "0.4"
filetime = "0.2"
flate2 = "1"
fontdb = { version = "0.15", default-features = false }
hayagriva = "0.4"
heck = "0.4"
hypher = "0.1.4"
iai = { git = "https://github.com/typst/iai" }
icu_properties = { version = "1.3", features = ["serde"] }
icu_provider = { version = "1.3", features = ["sync"] }
icu_provider_adapters = "1.3"
icu_provider_blob = "1.3"
icu_segmenter = { version = "1.3", features = ["serde"] }
if_chain = "1"
image = { version = "0.24", default-features = false, features = ["png", "jpeg", "gif"] }
include_dir = "0.7"
indexmap = { version = "2", features = ["serde"] }
inferno = "0.11.15"
kurbo = "0.9"
lasso = { version = "0.7.2", features = ["ahasher", "multi-threaded"] }
lipsum = "0.9"
log = "0.4"
miniz_oxide = "0.7"
notify = "6"
once_cell = "1"
open = "5"
oxipng = { git = "https://github.com/typst/oxipng", rev = "b8ec65b", default-features = false, features = ["filetime", "parallel", "zopfli"] }
palette = { version = "0.7.3", default-features = false, features = ["approx", "libm"] }
pathdiff = "0.2"
pdf-writer = "0.9.2"
pixglyph = "0.2"
proc-macro2 = "1"
pulldown-cmark = "0.9"
quote = "1"
rayon = "1.7.0"
regex = "1"
resvg = { version = "0.36.0", default-features = false, features = ["raster-images"] }
roxmltree = "0.18"
rustls = "0.21"
rustls-pemfile = "1"
rustybuzz = "0.10"
same-file = "1"
self-replace = { git = "https://github.com/typst/self-replace" } # https://github.com/mitsuhiko/self-replace/pull/16
semver = "1"
serde = { version = "1.0.184", features = ["derive"] }
serde_json = "1"
serde_yaml = "0.9"
siphasher = "0.3"
smallvec = { version = "1.11.1", features = ["union", "const_generics", "const_new"] }
subsetter = "0.1.1"
svg2pdf = "0.9"
syn = { version = "2", features = ["full", "extra-traits"] }
syntect = { version = "5", default-features = false, features = ["parsing", "regex-fancy", "plist-load", "yaml-load"] }
tar = "0.4"
tempfile = "3.7.0"
time = { version = "0.3.20", features = ["formatting", "macros", "parsing"] }
tiny-skia = "0.11"
toml = { version = "0.8", default-features = false, features = ["parse"] }
tracing = "0.1.37"
tracing-error = "0.2"
tracing-flame = "0.2.0"
tracing-subscriber = "0.3.17"
ttf-parser = "0.19.2"
typed-arena = "2"
unicode_names2 = "0.6.0"
unicode-bidi = "0.3.13"
unicode-ident = "1.0"
unicode-math-class = "0.1"
unicode-properties = "0.1"
unicode-script = "0.5"
unicode-segmentation = "1"
unscanny = "0.1"
ureq = "2"
usvg = { version = "0.36", default-features = false, features = ["text"] }
walkdir = "2"
wasmi = "0.31.0"
xmlparser = "0.13.5"
xmlwriter = "0.1.0"
xmp-writer = "0.2"
xz2 = "0.1"
yaml-front-matter = "0.1"
zip = "0.6"
[profile.dev.package."*"] [profile.dev.package."*"]
opt-level = 2 opt-level = 2

View File

@ -20,48 +20,47 @@ bench = false
doc = false doc = false
[dependencies] [dependencies]
typst = { path = "../typst" } typst = { workspace = true }
typst-library = { path = "../typst-library" } typst-library = { workspace = true }
chrono = { version = "0.4.24", default-features = false, features = ["clock", "std"] } chrono = { workspace = true }
clap = { version = "4.4", features = ["derive", "env"] } clap = { workspace = true }
codespan-reporting = "0.11" codespan-reporting = { workspace = true }
comemo = "0.3" comemo = { workspace = true }
ecow = "0.2" dirs = { workspace = true }
dirs = "5" ecow = { workspace = true }
flate2 = "1" env_proxy = { workspace = true }
filetime = "0.2" filetime = { workspace = true }
fontdb = "0.15.0" flate2 = { workspace = true }
inferno = "0.11.15" fontdb = { workspace = true, features = ["memmap", "fontconfig"] }
notify = "6" inferno = { workspace = true }
once_cell = "1" notify = { workspace = true }
open = "5" once_cell = { workspace = true }
pathdiff = "0.2" open = { workspace = true }
same-file = "1" pathdiff = { workspace = true }
# https://github.com/mitsuhiko/self-replace/pull/16 rustls = { workspace = true }
self-replace = { git = "https://github.com/typst/self-replace", optional = true } rustls-pemfile = { workspace = true }
semver = "1" same-file = { workspace = true }
serde = "1.0.184" self-replace = { workspace = true, optional = true }
serde_json = "1" semver = { workspace = true }
serde_yaml = "0.9" serde = { workspace = true }
siphasher = "0.3" serde_json = { workspace = true }
tar = "0.4" serde_yaml = { workspace = true }
tempfile = "3.7.0" siphasher = { workspace = true }
tracing = "0.1.37" tar = { workspace = true }
tracing-error = "0.2" tempfile = { workspace = true }
tracing-flame = "0.2.0" tracing = { workspace = true }
tracing-subscriber = "0.3.17" tracing-error = { workspace = true }
ureq = "2" tracing-flame = { workspace = true }
rustls = "0.21" tracing-subscriber = { workspace = true }
rustls-pemfile = "1" ureq = { workspace = true }
env_proxy = "0.4" xz2 = { workspace = true, optional = true }
xz2 = { version = "0.1", optional = true } zip = { workspace = true, optional = true }
zip = { version = "0.6", optional = true }
[build-dependencies] [build-dependencies]
clap = { version = "4.4", features = ["derive", "string"] } clap = { workspace = true, features = ["string"] }
clap_complete = "4.2.1" clap_complete = { workspace = true }
clap_mangen = "0.2.10" clap_mangen = { workspace = true }
semver = "1" semver = { workspace = true }
[features] [features]
default = ["embed-fonts"] default = ["embed-fonts"]

View File

@ -11,18 +11,18 @@ doctest = false
bench = false bench = false
[dependencies] [dependencies]
typst = { path = "../typst" } typst = { workspace = true }
typst-library = { path = "../typst-library" } typst-library = { workspace = true }
comemo = "0.3" comemo = { workspace = true }
ecow = { version = "0.2", features = ["serde"] } ecow = { workspace = true }
heck = "0.4" heck = { workspace = true }
include_dir = "0.7" include_dir = { workspace = true }
once_cell = "1" once_cell = { workspace = true }
pulldown-cmark = "0.9" pulldown-cmark = { workspace = true }
serde = { version = "1.0.184", features = ["derive"] } serde = { workspace = true }
serde_yaml = "0.9" serde_yaml = { workspace = true }
syntect = { version = "5", default-features = false, features = ["parsing", "html", "regex-fancy"] } syntect = { workspace = true, features = ["html"] }
typed-arena = "2" typed-arena = { workspace = true }
unicode_names2 = "0.6.0" unicode_names2 = { workspace = true }
unscanny = "0.1" unscanny = { workspace = true }
yaml-front-matter = "0.1" yaml-front-matter = { workspace = true }

View File

@ -1,8 +1,6 @@
[package] [package]
name = "typst-ide" name = "typst-ide"
description = "IDE functionality for Typst." description = "IDE functionality for Typst."
categories = ["compilers", "science"]
keywords = ["typst"]
version.workspace = true version.workspace = true
rust-version.workspace = true rust-version.workspace = true
authors.workspace = true authors.workspace = true
@ -10,6 +8,8 @@ edition.workspace = true
homepage.workspace = true homepage.workspace = true
repository.workspace = true repository.workspace = true
license.workspace = true license.workspace = true
categories.workspace = true
keywords.workspace = true
[lib] [lib]
test = false test = false
@ -17,10 +17,10 @@ doctest = false
bench = false bench = false
[dependencies] [dependencies]
typst = { path = "../typst" } typst = { workspace = true }
comemo = "0.3" comemo = { workspace = true }
ecow = { version = "0.2", features = ["serde"] } ecow = { workspace = true }
if_chain = "1" if_chain = { workspace = true }
log = "0.4" log = { workspace = true }
serde = { version = "1.0.184", features = ["derive"] } serde = { workspace = true }
unscanny = "0.1" unscanny = { workspace = true }

View File

@ -1,8 +1,6 @@
[package] [package]
name = "typst-library" name = "typst-library"
description = "The standard library for Typst." description = "The standard library for Typst."
categories = ["compilers", "science"]
keywords = ["typst"]
version.workspace = true version.workspace = true
rust-version.workspace = true rust-version.workspace = true
authors.workspace = true authors.workspace = true
@ -10,6 +8,8 @@ edition.workspace = true
homepage.workspace = true homepage.workspace = true
repository.workspace = true repository.workspace = true
license.workspace = true license.workspace = true
categories.workspace = true
keywords.workspace = true
[lib] [lib]
test = false test = false
@ -17,37 +17,37 @@ doctest = false
bench = false bench = false
[dependencies] [dependencies]
typst = { path = "../typst" } typst = { workspace = true }
az = "1.2" az = { workspace = true }
chinese-number = { version = "0.7.2", default-features = false, features = ["number-to-chinese"] } chinese-number = { workspace = true }
comemo = "0.3" ciborium = { workspace = true }
csv = "1" comemo = { workspace = true }
ecow = { version = "0.2", features = ["serde"] } csv = { workspace = true }
hayagriva = "0.4" ecow = { workspace = true }
hypher = "0.1.4" hayagriva = { workspace = true }
icu_properties = { version = "1.3", features = ["serde"] } hypher = { workspace = true }
icu_provider = { version = "1.3", features = ["sync"] } icu_properties = { workspace = true }
icu_provider_adapters = "1.3" icu_provider = { workspace = true }
icu_provider_blob = "1.3" icu_provider_adapters = { workspace = true }
icu_segmenter = { version = "1.3", features = ["serde"] } icu_provider_blob = { workspace = true }
indexmap = "2" icu_segmenter = { workspace = true }
kurbo = "0.9" indexmap = { workspace = true }
lipsum = "0.9" kurbo = { workspace = true }
log = "0.4" lipsum = { workspace = true }
once_cell = "1" log = { workspace = true }
ciborium = "0.2.1" once_cell = { workspace = true }
roxmltree = "0.18" roxmltree = { workspace = true }
rustybuzz = "0.10" rustybuzz = { workspace = true }
serde_json = "1" serde_json = { workspace = true }
serde_yaml = "0.9" serde_yaml = { workspace = true }
smallvec = { version = "1.11.1", features = ["union", "const_generics", "const_new"] } smallvec = { workspace = true }
syntect = { version = "5", default-features = false, features = ["parsing", "regex-fancy", "plist-load", "yaml-load"] } syntect = { workspace = true }
time = { version = "0.3.20", features = ["formatting"] } time = { workspace = true }
toml = { version = "0.8" } toml = { workspace = true, features = ["display"] }
tracing = "0.1.37" tracing = { workspace = true }
ttf-parser = "0.19.2" ttf-parser = { workspace = true }
typed-arena = "2" typed-arena = { workspace = true }
unicode-bidi = "0.3.13" unicode-bidi = { workspace = true }
unicode-math-class = "0.1" unicode-math-class = { workspace = true }
unicode-script = "0.5" unicode-script = { workspace = true }
unicode-segmentation = "1" unicode-segmentation = { workspace = true }

View File

@ -8,6 +8,8 @@ edition.workspace = true
homepage.workspace = true homepage.workspace = true
repository.workspace = true repository.workspace = true
license.workspace = true license.workspace = true
categories.workspace = true
keywords.workspace = true
[lib] [lib]
proc-macro = true proc-macro = true
@ -16,7 +18,7 @@ doctest = false
bench = false bench = false
[dependencies] [dependencies]
heck = "0.4" heck = { workspace = true }
proc-macro2 = "1" proc-macro2 = { workspace = true }
quote = "1" quote = { workspace = true }
syn = { version = "2", features = ["full", "extra-traits"] } syn = { workspace = true }

View File

@ -1,8 +1,6 @@
[package] [package]
name = "typst-syntax" name = "typst-syntax"
description = "Parser and syntax tree for Typst." description = "Parser and syntax tree for Typst."
categories = ["compilers", "science"]
keywords = ["typst"]
version.workspace = true version.workspace = true
rust-version.workspace = true rust-version.workspace = true
authors.workspace = true authors.workspace = true
@ -10,18 +8,20 @@ edition.workspace = true
homepage.workspace = true homepage.workspace = true
repository.workspace = true repository.workspace = true
license.workspace = true license.workspace = true
categories.workspace = true
keywords.workspace = true
[lib] [lib]
doctest = false doctest = false
bench = false bench = false
[dependencies] [dependencies]
comemo = "0.3" comemo = { workspace = true }
ecow = { version = "0.2", features = ["serde"] } ecow = { workspace = true }
once_cell = "1" once_cell = { workspace = true }
serde = { version = "1.0.184", features = ["derive"] } serde = { workspace = true }
tracing = "0.1.37" tracing = { workspace = true }
unicode-ident = "1.0" unicode-ident = { workspace = true }
unicode-math-class = "0.1" unicode-math-class = { workspace = true }
unicode-segmentation = "1" unicode-segmentation = { workspace = true }
unscanny = "0.1" unscanny = { workspace = true }

View File

@ -2,7 +2,7 @@
name = "typst" name = "typst"
description = "A new markup-based typesetting system that is powerful and easy to learn." description = "A new markup-based typesetting system that is powerful and easy to learn."
categories = ["compilers", "science"] categories = ["compilers", "science"]
keywords = ["markup", "typesetting"] keywords = ["markup", "typesetting", "typst"]
version.workspace = true version.workspace = true
rust-version.workspace = true rust-version.workspace = true
authors.workspace = true authors.workspace = true
@ -16,49 +16,49 @@ doctest = false
bench = false bench = false
[dependencies] [dependencies]
typst-macros = { path = "../typst-macros" } typst-macros = { workspace = true }
typst-syntax = { path = "../typst-syntax" } typst-syntax = { workspace = true }
base64 = "0.21.2" base64 = { workspace = true }
bitflags = { version = "2", features = ["serde"] } bitflags = { workspace = true }
bytemuck = "1" bytemuck = { workspace = true }
comemo = "0.3" comemo = { workspace = true }
ecow = { version = "0.2", features = ["serde"] } ecow = { workspace = true}
flate2 = "1" flate2 = { workspace = true }
fontdb = { version = "0.15", default-features = false } fontdb = { workspace = true }
image = { version = "0.24", default-features = false, features = ["png", "jpeg", "gif"] } image = { workspace = true }
indexmap = { version = "2", features = ["serde"] } indexmap = { workspace = true }
kurbo = "0.9" kurbo = { workspace = true }
lasso = { version = "0.7.2", features = ["ahasher", "multi-threaded"] } lasso = { workspace = true }
log = "0.4" log = { workspace = true }
miniz_oxide = "0.7" miniz_oxide = { workspace = true }
once_cell = "1" once_cell = { workspace = true }
pdf-writer = "0.9.2" palette = { workspace = true }
pixglyph = "0.2" pdf-writer = { workspace = true }
palette = { version = "0.7.3", default-features = false, features = ["approx", "libm"] } pixglyph = { workspace = true }
regex = "1" regex = { workspace = true }
resvg = { version = "0.36.0", default-features = false, features = ["raster-images"] } resvg = { workspace = true }
roxmltree = "0.18" roxmltree = { workspace = true }
rustybuzz = "0.10" rustybuzz = { workspace = true }
serde = { version = "1.0.184", features = ["derive"] } serde = { workspace = true }
siphasher = "0.3" siphasher = { workspace = true }
subsetter = "0.1.1" smallvec = { workspace = true }
svg2pdf = "0.9" subsetter = { workspace = true }
tiny-skia = "0.11" svg2pdf = { workspace = true }
toml = { version = "0.8", default-features = false, features = ["parse"] } time = { workspace = true }
tracing = "0.1.37" tiny-skia = { workspace = true }
ttf-parser = "0.19.2" toml = { workspace = true }
unicode-properties = "0.1" tracing = { workspace = true }
unicode-ident = "1.0" ttf-parser = { workspace = true }
unicode-math-class = "0.1" unicode-ident = { workspace = true }
unicode-segmentation = "1" unicode-math-class = { workspace = true }
unscanny = "0.1" unicode-properties = { workspace = true }
usvg = { version = "0.36", default-features = false, features = ["text"] } unicode-segmentation = { workspace = true }
xmlwriter = "0.1.0" unscanny = { workspace = true }
xmp-writer = "0.2" usvg = { workspace = true }
time = { version = "0.3.20", features = ["std", "formatting", "macros", "parsing"] } wasmi = { workspace = true }
wasmi = "0.31.0" xmlparser = { workspace = true }
xmlparser = "0.13.5" xmlwriter = { workspace = true }
smallvec = { version = "1.11.1", features = ["union", "const_generics", "const_new"] } xmp-writer = { workspace = true }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
stacker = "0.1.15" stacker = "0.1.15"

View File

@ -7,19 +7,19 @@ edition.workspace = true
publish = false publish = false
[dev-dependencies] [dev-dependencies]
typst = { path = "../crates/typst" } typst = { workspace = true }
typst-library = { path = "../crates/typst-library" } typst-library = { workspace = true }
clap = { version = "4.4", features = ["derive"] } clap = { workspace = true }
comemo = "0.3" comemo = { workspace = true }
ecow = { version = "0.2", features = ["serde"] } ecow = { workspace = true }
iai = { git = "https://github.com/typst/iai" } iai = { workspace = true }
once_cell = "1" once_cell = { workspace = true }
oxipng = { git = "https://github.com/typst/oxipng", rev = "b8ec65b", default-features = false, features = ["filetime", "parallel", "zopfli"] } oxipng = { workspace = true }
rayon = "1.7.0" rayon = { workspace = true }
tiny-skia = "0.11" tiny-skia = { workspace = true }
ttf-parser = "0.19.2" ttf-parser = { workspace = true }
unscanny = "0.1" unscanny = { workspace = true }
walkdir = "2" walkdir = { workspace = true }
[[test]] [[test]]
name = "tests" name = "tests"