Merge branch 'main' into improve-migreate-perf

Author: fengmk2

.github/workflows/e2e-test.yml

@@ -294,6 +294,11 @@ jobs:
             command: |
               vp fmt
               vp run validate
+          - name: vite-plus-vitest-global-type-minimal-repro
+            node-version: 24
+            command: |
+              vp test
+              vp check --fix
         exclude:
           # frm-stack uses Docker (testcontainers) which doesn't work the same way on Windows
           - os: windows-latest

.github/workflows/release.yml

@@ -277,8 +277,8 @@ jobs:
             INSTALL_BASH="curl -fsSL https://vite.plus | bash"
             INSTALL_PS1="irm https://vite.plus/ps1 | iex"
           else
-            INSTALL_BASH="curl -fsSL https://vite.plus | VITE_PLUS_VERSION=${{ env.VERSION }} bash"
-            INSTALL_PS1="\\\$env:VITE_PLUS_VERSION=\\\"${{ env.VERSION }}\\\"; irm https://vite.plus/ps1 | iex"
+            INSTALL_BASH="curl -fsSL https://vite.plus | VP_VERSION=${{ env.VERSION }} bash"
+            INSTALL_PS1="\\\$env:VP_VERSION=\\\"${{ env.VERSION }}\\\"; irm https://vite.plus/ps1 | iex"
           fi
           cat > ./RELEASE_BODY.md <<EOF
           ## vite-plus v${{ env.VERSION }}

.github/workflows/test-standalone-install.yml

@@ -19,7 +19,7 @@ defaults:
     shell: bash
 
 env:
-  VITE_PLUS_VERSION: alpha
+  VP_VERSION: alpha
 
 jobs:
   test-install-sh:
@@ -166,7 +166,7 @@ jobs:
         run: |
           docker run --rm --platform linux/arm64 \
             -v "${{ github.workspace }}:/workspace" \
-            -e VITE_PLUS_VERSION=alpha \
+            -e VP_VERSION=alpha \
             ubuntu:20.04 bash -c "
               ls -al ~/
               apt-get update && apt-get install -y curl ca-certificates
@@ -225,7 +225,7 @@ jobs:
         run: |
           docker run --rm \
             -v "${{ github.workspace }}:/workspace" \
-            -e VITE_PLUS_VERSION=alpha \
+            -e VP_VERSION=alpha \
             -e CI=true \
             alpine:3.21 sh -c "
               # libstdc++: required by unofficial-builds Node.js musl binary
@@ -283,7 +283,7 @@ jobs:
         run: |
           docker run --rm --platform linux/arm64 \
             -v "${{ github.workspace }}:/workspace" \
-            -e VITE_PLUS_VERSION=alpha \
+            -e VP_VERSION=alpha \
             -e CI=true \
             alpine:3.21 sh -c "
               # libstdc++ is needed by unofficial-builds Node.js musl binary

Cargo.lock

@@ -751,7 +751,7 @@ pub enum EnvSubcommands {
     /// Enable system-first mode - shims prefer system Node.js, fallback to managed
     Off,
 
-    /// Create or update shims in VITE_PLUS_HOME/bin
+    /// Create or update shims in VP_HOME/bin
     Setup {
         /// Force refresh shims even if they exist
         #[arg(long)]

crates/vite_global_cli/src/cli.rs

@@ -10,7 +10,7 @@
 use serde::{Deserialize, Serialize};
 use vite_path::AbsolutePathBuf;
 
-use super::config::get_vite_plus_home;
+use super::config::get_vp_home;
 use crate::error::Error;
 
 /// Source that installed a binary.
@@ -54,7 +54,7 @@ impl BinConfig {
 
     /// Get the bins directory path (~/.vite-plus/bins/).
     pub fn bins_dir() -> Result<AbsolutePathBuf, Error> {
-        Ok(get_vite_plus_home()?.join("bins"))
+        Ok(get_vp_home()?.join("bins"))
     }
 
     /// Get the path to a binary's config file.

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

@@ -1,7 +1,7 @@
 //! Configuration and version resolution for the env command.
 //!
 //! This module provides:
-//! - VITE_PLUS_HOME path resolution
+//! - VP_HOME path resolution
 //! - Version resolution with priority order
 //! - Config file management
 
@@ -27,7 +27,7 @@ pub enum ShimMode {
     SystemFirst,
 }
 
-/// User configuration stored in VITE_PLUS_HOME/config.json
+/// User configuration stored in VP_HOME/config.json
 #[derive(Serialize, Deserialize, Default, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct Config {
@@ -60,26 +60,26 @@ pub struct VersionResolution {
     pub is_range: bool,
 }
 
-/// Get the VITE_PLUS_HOME directory path.
+/// Get the VP_HOME directory path.
 ///
-/// Uses `VITE_PLUS_HOME` environment variable if set, otherwise defaults to `~/.vite-plus`.
-pub fn get_vite_plus_home() -> Result<AbsolutePathBuf, Error> {
-    Ok(vite_shared::get_vite_plus_home()?)
+/// Uses `VP_HOME` environment variable if set, otherwise defaults to `~/.vite-plus`.
+pub fn get_vp_home() -> Result<AbsolutePathBuf, Error> {
+    Ok(vite_shared::get_vp_home()?)
 }
 
 /// Get the bin directory path (~/.vite-plus/bin/).
 pub fn get_bin_dir() -> Result<AbsolutePathBuf, Error> {
-    Ok(get_vite_plus_home()?.join("bin"))
+    Ok(get_vp_home()?.join("bin"))
 }
 
 /// Get the packages directory path (~/.vite-plus/packages/).
 pub fn get_packages_dir() -> Result<AbsolutePathBuf, Error> {
-    Ok(get_vite_plus_home()?.join("packages"))
+    Ok(get_vp_home()?.join("packages"))
 }
 
 /// Get the tmp directory path for staging (~/.vite-plus/tmp/).
 pub fn get_tmp_dir() -> Result<AbsolutePathBuf, Error> {
-    Ok(get_vite_plus_home()?.join("tmp"))
+    Ok(get_vp_home()?.join("tmp"))
 }
 
 /// Get the node_modules directory path for a package.
@@ -116,7 +116,7 @@ pub fn get_node_modules_dir(prefix: &AbsolutePath, package_name: &str) -> Absolu
 
 /// Get the config file path.
 pub fn get_config_path() -> Result<AbsolutePathBuf, Error> {
-    Ok(get_vite_plus_home()?.join(CONFIG_FILE))
+    Ok(get_vp_home()?.join(CONFIG_FILE))
 }
 
 /// Load configuration from disk.
@@ -135,7 +135,7 @@ pub async fn load_config() -> Result<Config, Error> {
 /// Save configuration to disk.
 pub async fn save_config(config: &Config) -> Result<(), Error> {
     let config_path = get_config_path()?;
-    let vite_plus_home = get_vite_plus_home()?;
+    let vite_plus_home = get_vp_home()?;
 
     // Ensure directory exists
     tokio::fs::create_dir_all(&vite_plus_home).await?;
@@ -147,14 +147,14 @@ pub async fn save_config(config: &Config) -> Result<(), Error> {
 
 /// Environment variable for per-shell session Node.js version override.
 /// Set by `vp env use` command.
-pub const VERSION_ENV_VAR: &str = vite_shared::env_vars::VITE_PLUS_NODE_VERSION;
+pub const VERSION_ENV_VAR: &str = vite_shared::env_vars::VP_NODE_VERSION;
 
 /// Session version file name, written by `vp env use` so shims work without the shell eval wrapper.
 pub const SESSION_VERSION_FILE: &str = ".session-node-version";
 
 /// Get the path to the session version file (~/.vite-plus/.session-node-version).
 pub fn get_session_version_path() -> Result<AbsolutePathBuf, Error> {
-    Ok(get_vite_plus_home()?.join(SESSION_VERSION_FILE))
+    Ok(get_vp_home()?.join(SESSION_VERSION_FILE))
 }
 
 /// Read the session version file. Returns `None` if the file is missing or empty.
@@ -197,7 +197,7 @@ pub async fn delete_session_version() -> Result<(), Error> {
 /// Resolve Node.js version for a directory.
 ///
 /// Resolution order:
-/// 0. `VITE_PLUS_NODE_VERSION` env var (session override from `vp env use`)
+/// 0. `VP_NODE_VERSION` env var (session override from `vp env use`)
 /// 1. `.session-node-version` file (session override written by `vp env use` for shell-wrapper-less environments)
 /// 2. `.node-version` file in current or parent directories
 /// 3. `package.json#engines.node` in current or parent directories
@@ -824,7 +824,7 @@ mod tests {
 
         let resolution = resolve_version(&temp_path).await.unwrap();
 
-        // VITE_PLUS_NODE_VERSION should take priority over .node-version
+        // VP_NODE_VERSION should take priority over .node-version
         assert_eq!(resolution.version, "22.0.0");
         assert_eq!(resolution.source, VERSION_ENV_VAR);
         assert!(resolution.source_path.is_none());

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

@@ -47,10 +47,8 @@ pub async fn execute(cwd: AbsolutePathBuf, json: bool) -> Result<ExitStatus, Err
     let resolution = resolve_version(&cwd).await?;
 
     // Get the home directory for this version
-    let home_dir = vite_shared::get_vite_plus_home()?
-        .join("js_runtime")
-        .join("node")
-        .join(&resolution.version);
+    let home_dir =
+        vite_shared::get_vp_home()?.join("js_runtime").join("node").join(&resolution.version);
 
     #[cfg(windows)]
     let (node_path, npm_path, npx_path) =