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
60 changes: 39 additions & 21 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ cow-utils = "0.1.3"
cp_r = "0.5.2"
crossterm = { version = "0.29.0", features = ["event-stream"] }
csv-async = { version = "1.3.1", features = ["tokio"] }
ctor = "0.13"
ctor = "1.0"
ctrlc = "3.5.2"
derive_more = "2.0.1"
diff-struct = "0.5.3"
Expand Down Expand Up @@ -120,7 +120,7 @@ serde_norway = "0.9.42"
sha2 = "0.11.0"
shared_memory = "0.12.4"
shell-escape = "0.1.5"
similar = "2.7.0"
similar = "3.0.0"
smallvec = { version = "2.0.0-alpha.12", features = ["std"] }
snapshot_test = { path = "crates/snapshot_test" }
stackalloc = "1.2.1"
Expand All @@ -133,11 +133,11 @@ test-log = { version = "0.2.18", features = ["trace"] }
thiserror = "2"
tokio = "1.48.0"
tokio-util = "0.7.17"
toml = "0.9.5"
toml = "1.0.0"
tracing = "0.1.43"
tracing-error = "0.2.1"
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "serde"] }
ts-rs = { version = "11.1.0" }
ts-rs = { version = "12.0.0" }
tui-term = "0.3.1"
twox-hash = "2.1.1"
uuid = "1.18.1"
Expand Down
10 changes: 5 additions & 5 deletions crates/vite_path/src/relative.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,23 +310,23 @@ mod ts_impl {
type OptionInnerType = Self;
type WithoutGenerics = Self;

fn name() -> String {
fn name(_cfg: &ts_rs::Config) -> String {
"string".to_owned()
}

fn inline() -> String {
fn inline(_cfg: &ts_rs::Config) -> String {
"string".to_owned()
}

fn inline_flattened() -> String {
fn inline_flattened(_cfg: &ts_rs::Config) -> String {
panic!("RelativePathBuf cannot be flattened")
}

fn decl() -> String {
fn decl(_cfg: &ts_rs::Config) -> String {
panic!("RelativePathBuf is a primitive type")
}

fn decl_concrete() -> String {
fn decl_concrete(_cfg: &ts_rs::Config) -> String {
panic!("RelativePathBuf is a primitive type")
}
}
Expand Down
10 changes: 5 additions & 5 deletions crates/vite_str/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,23 +187,23 @@ mod ts_impl {
type OptionInnerType = Self;
type WithoutGenerics = Self;

fn name() -> String {
fn name(_cfg: &ts_rs::Config) -> String {
"string".to_owned()
}

fn inline() -> String {
fn inline(_cfg: &ts_rs::Config) -> String {
"string".to_owned()
}

fn inline_flattened() -> String {
fn inline_flattened(_cfg: &ts_rs::Config) -> String {
panic!("Str cannot be flattened")
}

fn decl() -> String {
fn decl(_cfg: &ts_rs::Config) -> String {
panic!("Str is a primitive type")
}

fn decl_concrete() -> String {
fn decl_concrete(_cfg: &ts_rs::Config) -> String {
panic!("Str is a primitive type")
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/vite_task_graph/run-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ cache?: UserGlobalCacheConfig,
/**
* Task definitions
*/
tasks?: { [key in string]?: Task },
tasks?: { [key in string]: Task },
/**
* Whether to automatically run `preX`/`postX` package.json scripts as
* lifecycle hooks when script `X` is executed.
Expand Down
4 changes: 2 additions & 2 deletions crates/vite_task_graph/src/config/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ impl UserRunConfig {
// Only collect declarations from types that are exportable
// (i.e., have an output path - built-in types like HashMap don't)
if T::output_path().is_some() {
self.decls.push(T::decl());
self.decls.push(T::decl(&ts_rs::Config::default()));
}
// Recursively visit dependencies of T
T::visit_dependencies(self);
Expand Down Expand Up @@ -323,7 +323,7 @@ impl UserRunConfig {

// Export the main type
types.push_str("\n\nexport ");
types.push_str(&Self::decl());
types.push_str(&Self::decl(&ts_rs::Config::default()));

types
}
Expand Down
Loading