mirror of
https://github.com/Myriad-Dreamin/tinymist.git
synced 2025-11-24 05:06:41 +00:00
build: bump world crates to 0.13.24-rc1 (#2047)
This commit is contained in:
parent
cfe6d95261
commit
b7845cb785
15 changed files with 43 additions and 47 deletions
30
Cargo.lock
generated
30
Cargo.lock
generated
|
|
@ -3027,8 +3027,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reflexo"
|
name = "reflexo"
|
||||||
version = "0.6.1-rc2"
|
version = "0.6.1-rc2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=3eeb078e2a21caf8256585e4f533df1810c33a09#3eeb078e2a21caf8256585e4f533df1810c33a09"
|
||||||
checksum = "49bb801abf7897f79246c3ad6f24a209946068cfcd7b5023a87b4e193c379036"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"bitvec",
|
"bitvec",
|
||||||
|
|
@ -3054,8 +3053,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reflexo-typst"
|
name = "reflexo-typst"
|
||||||
version = "0.6.1-rc2"
|
version = "0.6.1-rc2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=3eeb078e2a21caf8256585e4f533df1810c33a09#3eeb078e2a21caf8256585e4f533df1810c33a09"
|
||||||
checksum = "52aec9144a211331de8a5c3049f6208a011ec237aea942a44d5fad348c85dcbc"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"codespan-reporting",
|
"codespan-reporting",
|
||||||
"comemo",
|
"comemo",
|
||||||
|
|
@ -3087,8 +3085,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reflexo-typst2vec"
|
name = "reflexo-typst2vec"
|
||||||
version = "0.6.1-rc2"
|
version = "0.6.1-rc2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=3eeb078e2a21caf8256585e4f533df1810c33a09#3eeb078e2a21caf8256585e4f533df1810c33a09"
|
||||||
checksum = "8cf52ed5c3ebb05573ee1b866726f42307de567eeb9bd26575f44e2bae52addc"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitvec",
|
"bitvec",
|
||||||
"comemo",
|
"comemo",
|
||||||
|
|
@ -3114,8 +3111,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reflexo-vec2svg"
|
name = "reflexo-vec2svg"
|
||||||
version = "0.6.1-rc2"
|
version = "0.6.1-rc2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=3eeb078e2a21caf8256585e4f533df1810c33a09#3eeb078e2a21caf8256585e4f533df1810c33a09"
|
||||||
checksum = "ee562f404dbb724c33361281eb5fca8f30fa7a50184c8d4fcfa9e336eda79c3c"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"comemo",
|
"comemo",
|
||||||
|
|
@ -4360,7 +4356,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-derive"
|
name = "tinymist-derive"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.104",
|
"syn 2.0.104",
|
||||||
|
|
@ -4368,7 +4364,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-l10n"
|
name = "tinymist-l10n"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
|
|
@ -4396,7 +4392,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-package"
|
name = "tinymist-package"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"comemo",
|
"comemo",
|
||||||
|
|
@ -4447,7 +4443,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-project"
|
name = "tinymist-project"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
|
|
@ -4542,7 +4538,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-std"
|
name = "tinymist-std"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
|
|
@ -4579,7 +4575,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-task"
|
name = "tinymist-task"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
|
|
@ -4625,7 +4621,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-vfs"
|
name = "tinymist-vfs"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"comemo",
|
"comemo",
|
||||||
"ecow",
|
"ecow",
|
||||||
|
|
@ -4643,7 +4639,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tinymist-world"
|
name = "tinymist-world"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
|
@ -5232,7 +5228,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typst-shim"
|
name = "typst-shim"
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"comemo",
|
"comemo",
|
||||||
|
|
|
||||||
24
Cargo.toml
24
Cargo.toml
|
|
@ -189,15 +189,15 @@ insta-cmd = "0.6.0"
|
||||||
# Our Own Crates
|
# Our Own Crates
|
||||||
tinymist-assets = { version = "=0.13.24-rc1" }
|
tinymist-assets = { version = "=0.13.24-rc1" }
|
||||||
|
|
||||||
tinymist-derive = { path = "./crates/tinymist-derive/", version = "0.13.16" }
|
tinymist-derive = { path = "./crates/tinymist-derive/", version = "0.13.24-rc1" }
|
||||||
tinymist-l10n = { path = "./crates/tinymist-l10n/", version = "0.13.16" }
|
tinymist-l10n = { path = "./crates/tinymist-l10n/", version = "0.13.24-rc1" }
|
||||||
tinymist-package = { path = "./crates/tinymist-package/", version = "0.13.16" }
|
tinymist-package = { path = "./crates/tinymist-package/", version = "0.13.24-rc1" }
|
||||||
tinymist-std = { path = "./crates/tinymist-std/", version = "0.13.16", default-features = false }
|
tinymist-std = { path = "./crates/tinymist-std/", version = "0.13.24-rc1", default-features = false }
|
||||||
tinymist-vfs = { path = "./crates/tinymist-vfs/", version = "0.13.16", default-features = false }
|
tinymist-vfs = { path = "./crates/tinymist-vfs/", version = "0.13.24-rc1", default-features = false }
|
||||||
tinymist-world = { path = "./crates/tinymist-world/", version = "0.13.16", default-features = false }
|
tinymist-world = { path = "./crates/tinymist-world/", version = "0.13.24-rc1", default-features = false }
|
||||||
tinymist-project = { path = "./crates/tinymist-project/", version = "0.13.16" }
|
tinymist-project = { path = "./crates/tinymist-project/", version = "0.13.24-rc1" }
|
||||||
tinymist-task = { path = "./crates/tinymist-task/", version = "0.13.16" }
|
tinymist-task = { path = "./crates/tinymist-task/", version = "0.13.24-rc1" }
|
||||||
typst-shim = { path = "./crates/typst-shim", version = "0.13.16" }
|
typst-shim = { path = "./crates/typst-shim", version = "0.13.24-rc1" }
|
||||||
|
|
||||||
tinymist-tests = { path = "./crates/tinymist-tests/" }
|
tinymist-tests = { path = "./crates/tinymist-tests/" }
|
||||||
|
|
||||||
|
|
@ -299,9 +299,9 @@ typst-eval = { git = "https://github.com/Myriad-Dreamin/typst.git", tag = "tinym
|
||||||
# These patches use a different version of `reflexo`.
|
# These patches use a different version of `reflexo`.
|
||||||
#
|
#
|
||||||
# A regular build MUST use `tag` or `rev` to specify the version of the patched crate to ensure stability.
|
# A regular build MUST use `tag` or `rev` to specify the version of the patched crate to ensure stability.
|
||||||
# reflexo = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "721308ad79ee5c529a65da17239a58dca7b5453c" }
|
reflexo = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "3eeb078e2a21caf8256585e4f533df1810c33a09" }
|
||||||
# reflexo-typst = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "721308ad79ee5c529a65da17239a58dca7b5453c" }
|
reflexo-typst = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "3eeb078e2a21caf8256585e4f533df1810c33a09" }
|
||||||
# reflexo-vec2svg = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "721308ad79ee5c529a65da17239a58dca7b5453c" }
|
reflexo-vec2svg = { git = "https://github.com/Myriad-Dreamin/typst.ts/", rev = "3eeb078e2a21caf8256585e4f533df1810c33a09" }
|
||||||
|
|
||||||
# These patches use local `reflexo` for development.
|
# These patches use local `reflexo` for development.
|
||||||
# reflexo = { path = "../typst.ts/crates/reflexo/" }
|
# reflexo = { path = "../typst.ts/crates/reflexo/" }
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ description = "Provides derive for tinymist."
|
||||||
categories = ["compilers"]
|
categories = ["compilers"]
|
||||||
keywords = ["typst"]
|
keywords = ["typst"]
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ description = "Localization support for tinymist and typst."
|
||||||
categories = ["compilers", "command-line-utilities"]
|
categories = ["compilers", "command-line-utilities"]
|
||||||
keywords = ["language", "typst"]
|
keywords = ["language", "typst"]
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ description = "Tinymist package support for Typst."
|
||||||
categories = ["compilers"]
|
categories = ["compilers"]
|
||||||
keywords = ["api", "language", "typst"]
|
keywords = ["api", "language", "typst"]
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ description = "Project model of typst for tinymist."
|
||||||
categories = ["compilers"]
|
categories = ["compilers"]
|
||||||
keywords = ["language", "typst"]
|
keywords = ["language", "typst"]
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
@ -43,7 +43,7 @@ no-content-hint = ["tinymist-task/no-content-hint"]
|
||||||
lsp = ["toml"]
|
lsp = ["toml"]
|
||||||
# "system",
|
# "system",
|
||||||
|
|
||||||
system = ["tinymist-std/system", "tinymist-world/system"]
|
system = ["tinymist-std/system", "tinymist-world/system", "toml"]
|
||||||
web = ["tinymist-std/web", "tinymist-world/web"]
|
web = ["tinymist-std/web", "tinymist-world/web"]
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
|
|
|
||||||
|
|
@ -785,10 +785,10 @@ impl<F: CompilerFeat, Ext: 'static> ProjectInsState<F, Ext> {
|
||||||
/// Compile the document once if there is any reason and the entry is
|
/// Compile the document once if there is any reason and the entry is
|
||||||
/// active. (this is used for experimenting typst.node compilations)
|
/// active. (this is used for experimenting typst.node compilations)
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn may_compile2(
|
pub fn may_compile2<'a>(
|
||||||
&mut self,
|
&mut self,
|
||||||
compute: impl FnOnce(&Arc<WorldComputeGraph<F>>),
|
compute: impl FnOnce(&Arc<WorldComputeGraph<F>>) + 'a,
|
||||||
) -> Option<impl FnOnce() -> Arc<WorldComputeGraph<F>>> {
|
) -> Option<impl FnOnce() -> Arc<WorldComputeGraph<F>> + 'a> {
|
||||||
if !self.reason.any() || self.verse.entry_state().is_inactive() {
|
if !self.reason.any() || self.verse.entry_state().is_inactive() {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,9 @@
|
||||||
mod args;
|
mod args;
|
||||||
mod compiler;
|
mod compiler;
|
||||||
mod entry;
|
mod entry;
|
||||||
|
mod lock;
|
||||||
mod model;
|
mod model;
|
||||||
|
|
||||||
#[cfg(feature = "lsp")]
|
|
||||||
mod lock;
|
|
||||||
#[cfg(feature = "lsp")]
|
#[cfg(feature = "lsp")]
|
||||||
mod lsp;
|
mod lsp;
|
||||||
#[cfg(feature = "system")]
|
#[cfg(feature = "system")]
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ use typst::World;
|
||||||
use typst::diag::EcoString;
|
use typst::diag::EcoString;
|
||||||
|
|
||||||
use crate::model::{ApplyProjectTask, Id, ProjectInput, ProjectRoute, ResourcePath};
|
use crate::model::{ApplyProjectTask, Id, ProjectInput, ProjectRoute, ResourcePath};
|
||||||
use crate::{LOCK_FILENAME, LOCK_VERSION, LockFile, LockFileCompat, LspWorld, ProjectPathMaterial};
|
use crate::{LOCK_FILENAME, LOCK_VERSION, LockFile, LockFileCompat, ProjectPathMaterial};
|
||||||
|
|
||||||
impl LockFile {
|
impl LockFile {
|
||||||
/// Gets the input by the id.
|
/// Gets the input by the id.
|
||||||
|
|
@ -261,7 +261,8 @@ pub struct LockFileUpdate {
|
||||||
|
|
||||||
impl LockFileUpdate {
|
impl LockFileUpdate {
|
||||||
/// Compiles the lock file.
|
/// Compiles the lock file.
|
||||||
pub fn compiled(&mut self, world: &LspWorld, ctx: CtxPath) -> Option<Id> {
|
#[cfg(feature = "lsp")]
|
||||||
|
pub fn compiled(&mut self, world: &crate::LspWorld, ctx: CtxPath) -> Option<Id> {
|
||||||
let id = Id::from_world(world, ctx)?;
|
let id = Id::from_world(world, ctx)?;
|
||||||
|
|
||||||
let root = ResourcePath::from_user_sys(Path::new("."), ctx);
|
let root = ResourcePath::from_user_sys(Path::new("."), ctx);
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
name = "tinymist-std"
|
name = "tinymist-std"
|
||||||
description = "Additional functions wrapping Rust's standard library."
|
description = "Additional functions wrapping Rust's standard library."
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ description = "Task model of typst for tinymist."
|
||||||
categories = ["compilers"]
|
categories = ["compilers"]
|
||||||
keywords = ["language", "typst"]
|
keywords = ["language", "typst"]
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
name = "tinymist-vfs"
|
name = "tinymist-vfs"
|
||||||
description = "Vfs for tinymist."
|
description = "Vfs for tinymist."
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ description = "Typst's World implementation for tinymist."
|
||||||
categories = ["compilers"]
|
categories = ["compilers"]
|
||||||
keywords = ["language", "typst"]
|
keywords = ["language", "typst"]
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
authors.workspace = true
|
authors.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -427,7 +427,7 @@ impl BrowserFontSearcher {
|
||||||
for font_data in typst_assets::fonts() {
|
for font_data in typst_assets::fonts() {
|
||||||
let buffer = Bytes::new(font_data);
|
let buffer = Bytes::new(font_data);
|
||||||
|
|
||||||
self.fonts.extend(
|
self.base.fonts.extend(
|
||||||
Font::iter(buffer)
|
Font::iter(buffer)
|
||||||
.map(|font| (font.info().clone(), FontSlot::new_loaded(Some(font)))),
|
.map(|font| (font.info().clone(), FontSlot::new_loaded(Some(font)))),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ name = "typst-shim"
|
||||||
description = "A compatibility layer for Typst release and mainline versions."
|
description = "A compatibility layer for Typst release and mainline versions."
|
||||||
authors = ["The Typst Project Developers"]
|
authors = ["The Typst Project Developers"]
|
||||||
# group: world
|
# group: world
|
||||||
version = "0.13.16"
|
version = "0.13.24-rc1"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
homepage.workspace = true
|
homepage.workspace = true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue