Merge branch 'main' into copilot/fix-e2e-test-scheduled-run

Author: fengmk2

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();
     });
 }

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`;
         }
       }
     },