fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-29 20:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize cargo dependencies and upgrade most of them (#1815)

Browse Source 
* Reorganize cargo dependencies and upgrade most

* cargo update

* Attempt 2

* Polishing changes

* Comment out specta typescript flag-dependent code

* Fix test
This commit is contained in:
Keavon Chambers
2024-07-09 04:08:28 -07:00
committed by GitHub
parent 97616e8019
commit f7ada701e5
30 changed files with 1042 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/Cargo.toml
+22 -16
View File
@@ -2,7 +2,7 @@
name = "graphite-editor"
publish = false
version = "0.0.0"
rust-version = "1.66.0"
rust-version = "1.70.0"
authors = ["Graphite Authors <contact@graphite.rs>"]
edition = "2021"
readme = "../README.md"
@@ -12,6 +12,7 @@ license = "Apache-2.0"
[features]
default = ["wasm"]
wasm = ["wasm-bindgen", "graphene-std/wasm", "wasm-bindgen-futures"]
gpu = [
"interpreted-executor/gpu",
"graphene-std/gpu",
@@ -23,34 +24,31 @@ quantization = [
"graphene-std/quantization",
"interpreted-executor/quantization",
]
wasm = ["wasm-bindgen", "graphene-std/wasm", "wasm-bindgen-futures"]
[dependencies]
js-sys = "0.3.67"
# Local dependencies
graphite-proc-macros = { path = "../proc-macros" }
graph-craft = { path = "../node-graph/graph-craft" }
interpreted-executor = { path = "../node-graph/interpreted-executor" }
graphene-core = { path = "../node-graph/gcore" }
graphene-std = { path = "../node-graph/gstd", features = ["serde"] }
# Workspace dependencies
js-sys = { workspace = true }
log = { workspace = true }
bitflags = { workspace = true }
thiserror = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
graphite-proc-macros = { path = "../proc-macros" }
bezier-rs = { workspace = true }
glam = { workspace = true, features = ["serde", "debug-glam-assert"] }
derivative = { workspace = true }
specta.workspace = true
image = { workspace = true, features = ["bmp", "png"] }
graph-craft = { path = "../node-graph/graph-craft" }
wgpu-executor = { path = "../node-graph/wgpu-executor", optional = true }
gpu-executor = { path = "../node-graph/gpu-executor", optional = true }
interpreted-executor = { path = "../node-graph/interpreted-executor" }
dyn-any = { workspace = true }
graphene-core = { path = "../node-graph/gcore" }
graphene-std = { path = "../node-graph/gstd", features = ["serde"] }
num_enum = "0.6.1"
num_enum = { workspace = true }
usvg = { workspace = true }
wasm-bindgen = { workspace = true, optional = true }
wasm-bindgen-futures = { workspace = true, optional = true }
# Remove when `core::cell::LazyCell` is stabilized (<https://doc.rust-lang.org/core/cell/struct.LazyCell.html>)
once_cell = "1.13.0"
once_cell = { workspace = true }
web-sys = { workspace = true, features = [
"Document",
"DomRect",
@@ -60,9 +58,17 @@ web-sys = { workspace = true, features = [
"TextMetrics",
] }
# Optional local dependencies
wgpu-executor = { path = "../node-graph/wgpu-executor", optional = true }
gpu-executor = { path = "../node-graph/gpu-executor", optional = true }
# Optional workspace dependencies
wasm-bindgen = { workspace = true, optional = true }
wasm-bindgen-futures = { workspace = true, optional = true }
[dev-dependencies]
env_logger = "0.10"
# Workspace dependencies
env_logger = { workspace = true }
futures = { workspace = true }
tokio = { workspace = true, features = ["rt", "macros"] }
editor/src/generate_ts_types.rs
+19 -17
View File
@@ -4,29 +4,31 @@
#[ignore]
#[test]
fn generate_ts_types() {
use crate::messages::prelude::FrontendMessage;
use specta::ts::{export_named_datatype, BigIntExportBehavior, ExportConfig};
use specta::{NamedType, TypeMap};
use std::fs::File;
use std::io::Write;
// TODO: Un-comment this out when we figure out how to reenable the "typescript` Specta feature flag
let config = ExportConfig::new().bigint(BigIntExportBehavior::Number);
// use crate::messages::prelude::FrontendMessage;
// use specta::ts::{export_named_datatype, BigIntExportBehavior, ExportConfig};
// use specta::{NamedType, TypeMap};
// use std::fs::File;
// use std::io::Write;
let mut type_map = TypeMap::default();
// let config = ExportConfig::new().bigint(BigIntExportBehavior::Number);
let datatype = FrontendMessage::definition_named_data_type(&mut type_map);
// let mut type_map = TypeMap::default();
let mut export = String::new();
// let datatype = FrontendMessage::definition_named_data_type(&mut type_map);
export += &export_named_datatype(&config, &datatype, &type_map).unwrap();
// let mut export = String::new();
type_map
.iter()
.map(|(_, v)| v)
.flat_map(|v| export_named_datatype(&config, v, &type_map))
.for_each(|e| export += &format!("\n\n{e}"));
// export += &export_named_datatype(&config, &datatype, &type_map).unwrap();
let mut file = File::create("../types.ts").unwrap();
// type_map
// .iter()
// .map(|(_, v)| v)
// .flat_map(|v| export_named_datatype(&config, v, &type_map))
// .for_each(|e| export += &format!("\n\n{e}"));
write!(file, "{export}").ok();
// let mut file = File::create("../types.ts").unwrap();
// write!(file, "{export}").ok();
}