Merge branch 'main' into deps/upstream-update

Author: fengmk2

crates/vite_global_cli/src/help.rs

@@ -65,7 +65,7 @@ fn documentation_url_for_command_path(command_path: &[&str]) -> Option<&'static
         ["config"] | ["staged"] => Some("https://viteplus.dev/guide/commit-hooks"),
         [
             "install" | "add" | "remove" | "update" | "dedupe" | "outdated" | "list" | "ls" | "why"
-            | "info" | "view" | "show" | "link" | "unlink" | "pm",
+            | "info" | "view" | "show" | "link" | "unlink" | "rebuild" | "pm",
             ..,
         ] => Some("https://viteplus.dev/guide/install"),
         ["dev"] => Some("https://viteplus.dev/guide/dev"),
@@ -477,6 +477,7 @@ pub fn top_level_help_doc() -> HelpDoc {
                     row("info, view, show", "View package information from the registry"),
                     row("link, ln", "Link packages for local development"),
                     row("unlink", "Unlink packages"),
+                    row("rebuild", "Rebuild native modules"),
                     row("pm", "Forward a command to the package manager"),
                 ],
             ),

crates/vite_global_cli/src/main.rs

@@ -36,43 +36,60 @@ use crate::cli::{
 
 /// Normalize CLI arguments:
 /// - `vp list ...` / `vp ls ...` → `vp pm list ...`
+/// - `vp rebuild ...` → `vp pm rebuild ...`
 /// - `vp help [command]` → `vp [command] --help`
 /// - `vp node [args...]` → `vp env exec node [args...]`
 fn normalize_args(args: Vec<String>) -> Vec<String> {
-    match args.get(1).map(String::as_str) {
-        // `vp list ...` → `vp pm list ...`
-        // `vp ls ...` → `vp pm list ...`
-        Some("list" | "ls") => {
-            let mut normalized = Vec::with_capacity(args.len() + 1);
-            normalized.push(args[0].clone());
-            normalized.push("pm".to_string());
-            normalized.push("list".to_string());
-            normalized.extend(args[2..].iter().cloned());
-            normalized
-        }
-        // `vp help` alone -> show main help
-        Some("help") if args.len() == 2 => vec![args[0].clone(), "--help".to_string()],
-        // `vp help [command] [args...]` -> `vp [command] --help [args...]`
-        Some("help") if args.len() > 2 => {
-            let mut normalized = Vec::with_capacity(args.len());
-            normalized.push(args[0].clone());
-            normalized.push(args[2].clone());
-            normalized.push("--help".to_string());
-            normalized.extend(args[3..].iter().cloned());
-            normalized
-        }
-        // `vp node [args...]` → `vp env exec node [args...]`
-        Some("node") => {
-            let mut normalized = Vec::with_capacity(args.len() + 2);
-            normalized.push(args[0].clone());
-            normalized.push("env".to_string());
-            normalized.push("exec".to_string());
-            normalized.push("node".to_string());
-            normalized.extend(args[2..].iter().cloned());
-            normalized
-        }
-        // No transformation needed
-        _ => args,
+    let mut normalized = args;
+    loop {
+        let next = match normalized.get(1).map(String::as_str) {
+            // `vp list ...` → `vp pm list ...`
+            // `vp ls ...` → `vp pm list ...`
+            Some("list" | "ls") => {
+                let mut next = Vec::with_capacity(normalized.len() + 1);
+                next.push(normalized[0].clone());
+                next.push("pm".to_string());
+                next.push("list".to_string());
+                next.extend(normalized[2..].iter().cloned());
+                next
+            }
+            // `vp rebuild ...` → `vp pm rebuild ...`
+            Some("rebuild") => {
+                let mut next = Vec::with_capacity(normalized.len() + 1);
+                next.push(normalized[0].clone());
+                next.push("pm".to_string());
+                next.push("rebuild".to_string());
+                next.extend(normalized[2..].iter().cloned());
+                next
+            }
+            // `vp help` alone -> show main help
+            Some("help") if normalized.len() == 2 => {
+                vec![normalized[0].clone(), "--help".to_string()]
+            }
+            // `vp help [command] [args...]` -> `vp [command] --help [args...]`
+            Some("help") if normalized.len() > 2 => {
+                let mut next = Vec::with_capacity(normalized.len());
+                next.push(normalized[0].clone());
+                next.push(normalized[2].clone());
+                next.push("--help".to_string());
+                next.extend(normalized[3..].iter().cloned());
+                next
+            }
+            // `vp node [args...]` → `vp env exec node [args...]`
+            Some("node") => {
+                let mut next = Vec::with_capacity(normalized.len() + 2);
+                next.push(normalized[0].clone());
+                next.push("env".to_string());
+                next.push("exec".to_string());
+                next.push("node".to_string());
+                next.extend(normalized[2..].iter().cloned());
+                next
+            }
+            // No transformation needed
+            _ => return normalized,
+        };
+
+        normalized = next;
     }
 }
 
@@ -434,6 +451,34 @@ mod tests {
         assert_eq!(normalized, s(&["vp", "env", "exec", "node"]));
     }
 
+    #[test]
+    fn normalize_args_rewrites_bare_vp_rebuild() {
+        let input = s(&["vp", "rebuild"]);
+        let normalized = normalize_args(input);
+        assert_eq!(normalized, s(&["vp", "pm", "rebuild"]));
+    }
+
+    #[test]
+    fn normalize_args_rewrites_vp_rebuild_with_args() {
+        let input = s(&["vp", "rebuild", "--", "--update-binary"]);
+        let normalized = normalize_args(input);
+        assert_eq!(normalized, s(&["vp", "pm", "rebuild", "--", "--update-binary"]));
+    }
+
+    #[test]
+    fn normalize_args_rewrites_vp_help_rebuild() {
+        let input = s(&["vp", "help", "rebuild"]);
+        let normalized = normalize_args(input);
+        assert_eq!(normalized, s(&["vp", "pm", "rebuild", "--help"]));
+    }
+
+    #[test]
+    fn normalize_args_rewrites_vp_help_node() {
+        let input = s(&["vp", "help", "node"]);
+        let normalized = normalize_args(input);
+        assert_eq!(normalized, s(&["vp", "env", "exec", "node", "--help"]));
+    }
+
     #[test]
     fn unknown_argument_detected_without_pass_as_value_hint() {
         let error = try_parse_args_from(["vp".to_string(), "--cache".to_string()])

crates/vite_shared/src/tracing.rs

@@ -1,6 +1,6 @@
 //! Tracing initialization for vite-plus
 
-use std::sync::OnceLock;
+use std::{str::FromStr, sync::OnceLock};
 
 use tracing_subscriber::{
     filter::{LevelFilter, Targets},
@@ -14,25 +14,28 @@ use crate::env_vars;
 /// Uses `OnceLock` to ensure tracing is only initialized once,
 /// even if called multiple times.
 ///
+/// Only sets the global default subscriber when `VITE_LOG` is set.
+/// When unset, the global default slot is left free so that other
+/// subscribers (e.g., rolldown devtools) can claim it without panicking.
+///
 /// # Environment Variables
 /// - `VITE_LOG`: Controls log filtering (e.g., "debug", "vite_task=trace")
 pub fn init_tracing() {
     static TRACING: OnceLock<()> = OnceLock::new();
     TRACING.get_or_init(|| {
+        let Ok(env_var) = std::env::var(env_vars::VITE_LOG) else {
+            return;
+        };
+
         tracing_subscriber::registry()
             .with(
-                std::env::var(env_vars::VITE_LOG)
-                    .map_or_else(
-                        |_| Targets::new(),
-                        |env_var| {
-                            use std::str::FromStr;
-                            Targets::from_str(&env_var).unwrap_or_default()
-                        },
-                    )
+                Targets::from_str(&env_var)
+                    .unwrap_or_default()
                     // disable brush-parser tracing
                     .with_targets([("tokenize", LevelFilter::OFF), ("parse", LevelFilter::OFF)]),
             )
             .with(tracing_subscriber::fmt::layer())
-            .init();
+            .try_init()
+            .ok();
     });
 }

docs/guide/install.md

@@ -60,6 +60,7 @@ Vite+ provides all the familiar package management commands:
 - `vp list` shows installed packages
 - `vp why <pkg>` explains why a package is present
 - `vp info <pkg>` shows registry metadata for a package
+- `vp rebuild` rebuilds native modules (e.g. after switching Node.js versions)
 - `vp link` and `vp unlink` manage local package links
 - `vp dlx <pkg>` runs a package binary without adding it to the project
 - `vp pm <command>` forwards a raw package-manager-specific command when you need behavior outside the normalized `vp` command set
@@ -115,6 +116,20 @@ Use these when you need to understand the current state of dependencies.
 - `vp why react` explains why `react` is installed
 - `vp info react` shows registry metadata such as versions and dist-tags
 
+#### Rebuild
+
+Use `vp rebuild` when native modules need to be recompiled, for example after switching Node.js versions or when a C/C++ addon fails to load.
+
+- `vp rebuild` rebuilds all native modules
+- `vp rebuild -- <args>` passes extra arguments to the underlying package manager
+
+```bash
+vp rebuild
+vp rebuild -- --update-binary
+```
+
+`vp rebuild` is a shorthand for `vp pm rebuild`.
+
 #### Advanced
 
 Use these when you need lower-level package-manager behavior.

packages/cli/snap-tests-global/cli-helper-message/snap.txt

@@ -41,6 +41,7 @@ Manage Dependencies:
   info, view, show           View package information from the registry
   link, ln                   Link packages for local development
   unlink                     Unlink packages
+  rebuild                    Rebuild native modules
   pm                         Forward a command to the package manager
 
 Maintain:

packages/prompts/src/__tests__/__snapshots__/render.spec.ts.snap

@@ -52,6 +52,7 @@ exports[`prompt renderers > renders multiselect with cursor marker plus checkbox
       Second line
   › ◼ Beta
     ◻ Gamma
+  Press  space  to select,  enter  to submit
 
 "
 `;

packages/prompts/src/multi-select.ts

@@ -120,6 +120,15 @@ export const multiselect = <Value>(opts: MultiSelectOptions<Value>) => {
     );
   };
   const required = opts.required ?? true;
+  const hint =
+    '  ' +
+    color.reset(
+      color.dim(
+        `Press ${color.gray(color.bgWhite(color.inverse(' space ')))} to select, ${color.gray(
+          color.bgWhite(color.inverse(' enter ')),
+        )} to submit`,
+      ),
+    );
 
   return new MultiSelectPrompt({
     options: opts.options,
@@ -131,13 +140,7 @@ export const multiselect = <Value>(opts: MultiSelectOptions<Value>) => {
     cursorAt: opts.cursorAt,
     validate(selected: Value[] | undefined) {
       if (required && (selected === undefined || selected.length === 0)) {
-        return `Please select at least one option.\n${color.reset(
-          color.dim(
-            `Press ${color.gray(color.bgWhite(color.inverse(' space ')))} to select, ${color.gray(
-              color.bgWhite(color.inverse(' enter ')),
-            )} to submit`,
-          ),
-        )}`;
+        return `Please select at least one option.\n${hint}`;
       }
       return undefined;
     },
@@ -221,7 +224,7 @@ export const multiselect = <Value>(opts: MultiSelectOptions<Value>) => {
             columnPadding: prefix.length,
             rowPadding: titleLineCount + footerLineCount,
             style: styleOption,
-          }).join(`\n${prefix}`)}\n${footer}\n`;
+          }).join(`\n${prefix}`)}\n${hint}\n${footer}\n`;
         }
         default: {
           const prefix = hasGuide ? `${color.blue(S_BAR)} ` : nestedPrefix;
@@ -236,7 +239,7 @@ export const multiselect = <Value>(opts: MultiSelectOptions<Value>) => {
             columnPadding: prefix.length,
             rowPadding: titleLineCount + footerLineCount,
             style: styleOption,
-          }).join(`\n${prefix}`)}\n${hasGuide ? color.blue(S_BAR_END) : ''}\n`;
+          }).join(`\n${prefix}`)}\n${hint}\n${hasGuide ? color.blue(S_BAR_END) : ''}\n`;
         }
       }
     },