Skip to content

Commit c93ecca

Browse files
authored
Merge branch 'main' into feat/migrate-volta-to-node-version
2 parents 1383a8e + ced26cd commit c93ecca

26 files changed

Lines changed: 514 additions & 59 deletions

File tree

Cargo.lock

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ dunce = "1.0.5"
8585
fast-glob = "1.0.0"
8686
flate2 = { version = "=1.1.9", features = ["zlib-rs"] }
8787
form_urlencoded = "1.2.1"
88-
fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1ef4e2f6bd783472ffdaa1cae874d142e2f56322" }
88+
fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "eb746ad3f35bd994ddb39be001eaf58986f48388" }
8989
futures = "0.3.31"
9090
futures-util = "0.3.31"
9191
glob = "0.3.2"
@@ -186,15 +186,15 @@ vfs = "0.13.0"
186186
vite_command = { path = "crates/vite_command" }
187187
vite_error = { path = "crates/vite_error" }
188188
vite_js_runtime = { path = "crates/vite_js_runtime" }
189-
vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1ef4e2f6bd783472ffdaa1cae874d142e2f56322" }
189+
vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "eb746ad3f35bd994ddb39be001eaf58986f48388" }
190190
vite_install = { path = "crates/vite_install" }
191191
vite_migration = { path = "crates/vite_migration" }
192192
vite_shared = { path = "crates/vite_shared" }
193193
vite_static_config = { path = "crates/vite_static_config" }
194-
vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1ef4e2f6bd783472ffdaa1cae874d142e2f56322" }
195-
vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1ef4e2f6bd783472ffdaa1cae874d142e2f56322" }
196-
vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1ef4e2f6bd783472ffdaa1cae874d142e2f56322" }
197-
vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "1ef4e2f6bd783472ffdaa1cae874d142e2f56322" }
194+
vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "eb746ad3f35bd994ddb39be001eaf58986f48388" }
195+
vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "eb746ad3f35bd994ddb39be001eaf58986f48388" }
196+
vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "eb746ad3f35bd994ddb39be001eaf58986f48388" }
197+
vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "eb746ad3f35bd994ddb39be001eaf58986f48388" }
198198
walkdir = "2.5.0"
199199
wax = "0.6.0"
200200
which = "8.0.0"

crates/vite_global_cli/src/commands/env/config.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ async fn resolve_version_string(version: &str, provider: &NodeProvider) -> Resul
362362

363363
// Check for "latest" alias - resolves to absolute latest version (including non-LTS)
364364
if NodeProvider::is_latest_alias(version) {
365-
let resolved = provider.resolve_version("*").await?;
365+
let resolved = provider.resolve_absolute_latest_version().await?;
366366
return Ok(resolved.to_string());
367367
}
368368

@@ -391,8 +391,7 @@ pub async fn resolve_version_alias(
391391
Ok(resolved.to_string())
392392
}
393393
"latest" => {
394-
// Resolve * to get the absolute latest version
395-
let resolved = provider.resolve_version("*").await?;
394+
let resolved = provider.resolve_absolute_latest_version().await?;
396395
Ok(resolved.to_string())
397396
}
398397
_ => resolve_version_string(version, provider).await,

crates/vite_global_cli/src/commands/env/default.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ async fn set_default(version: &str) -> Result<ExitStatus, Error> {
6868
}
6969
"latest" => {
7070
// Resolve to show current value, but store "latest" as alias
71-
let current_latest = provider.resolve_version("*").await?;
71+
let current_latest = provider.resolve_absolute_latest_version().await?;
7272
(format!("latest (currently {})", current_latest), "latest".to_string())
7373
}
7474
_ => {
@@ -102,7 +102,7 @@ async fn resolve_alias(
102102
) -> Result<String, Error> {
103103
match alias {
104104
"lts" => Ok(provider.resolve_latest_version().await?.to_string()),
105-
"latest" => Ok(provider.resolve_version("*").await?.to_string()),
105+
"latest" => Ok(provider.resolve_absolute_latest_version().await?.to_string()),
106106
_ => Ok(alias.to_string()),
107107
}
108108
}

crates/vite_global_cli/src/commands/env/exec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ async fn resolve_version(version: &str, provider: &NodeProvider) -> Result<Strin
159159
Ok(resolved.to_string())
160160
}
161161
"latest" => {
162-
let resolved = provider.resolve_version("*").await?;
162+
let resolved = provider.resolve_absolute_latest_version().await?;
163163
Ok(resolved.to_string())
164164
}
165165
_ => {

crates/vite_global_cli/src/commands/env/pin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ async fn resolve_version_for_pin(
181181
Ok((resolved.to_string(), true))
182182
}
183183
"latest" => {
184-
let resolved = provider.resolve_version("*").await?;
184+
let resolved = provider.resolve_absolute_latest_version().await?;
185185
Ok((resolved.to_string(), true))
186186
}
187187
_ => {

0 commit comments

Comments
 (0)