Merge branch 'main' into issue-1057-top-level-rebuild

Author: fengmk2

crates/vite_global_cli/src/help.rs

@@ -761,6 +761,10 @@ fn delegated_help_doc(command: &str) -> Option<HelpDoc> {
                         row("--fix", "Auto-fix format and lint issues"),
                         row("--no-fmt", "Skip format check"),
                         row("--no-lint", "Skip lint check"),
+                        row(
+                            "--no-error-on-unmatched-pattern",
+                            "Do not exit with error when pattern is unmatched",
+                        ),
                         row("-h, --help", "Print help"),
                     ],
                 ),

crates/vite_install/src/package_manager.rs

@@ -386,14 +386,27 @@ pub async fn download_package_manager(
         version_or_latest.into()
     };
 
+    // Reject anything that is not strict semver `major.minor.patch[-prerelease][+build]`.
+    // This prevents path traversal via the version being interpolated into
+    // `$VP_HOME/package_manager/{name}/{version}` below, since `AbsolutePath::join`
+    // does not normalize `..` components. Also guards against registry-controlled
+    // "latest" lookups returning a malicious value.
+    let parsed_version = Version::parse(&version).map_err(|_| {
+        Error::InvalidArgument(
+            format!(
+                "invalid {package_manager_type} version {version:?}: expected semver 'major.minor.patch'"
+            )
+            .into(),
+        )
+    })?;
+
     let mut package_name: Str = package_manager_type.to_string().into();
     // handle yarn >= 2.0.0 to use `@yarnpkg/cli-dist` as package name
     // @see https://github.com/nodejs/corepack/blob/main/config.json#L135
-    if matches!(package_manager_type, PackageManagerType::Yarn) {
-        let version_req = VersionReq::parse(">=2.0.0")?;
-        if version_req.matches(&Version::parse(&version)?) {
-            package_name = "@yarnpkg/cli-dist".into();
-        }
+    if matches!(package_manager_type, PackageManagerType::Yarn)
+        && VersionReq::parse(">=2.0.0")?.matches(&parsed_version)
+    {
+        package_name = "@yarnpkg/cli-dist".into();
     }
 
     let home_dir = vite_shared::get_vp_home()?;
@@ -1840,6 +1853,24 @@ mod tests {
         assert!(result.get_bin_prefix().ends_with("pnpm/bin"));
     }
 
+    #[tokio::test]
+    async fn test_download_package_manager_rejects_path_traversal_version() {
+        // Versions containing path separators or traversal components must be
+        // rejected before any filesystem operations: `AbsolutePath::join` does
+        // not normalize `..`, so a bad version would escape the home dir.
+        for bad in ["../../../escape", "..", "1.0.0/../../escape", "/foo/bar", "1.0.0\0", ""] {
+            let result = download_package_manager(PackageManagerType::Pnpm, bad, None).await;
+            match result {
+                Err(Error::InvalidArgument(_)) => {}
+                other => panic!("expected InvalidArgument for {bad:?}, got {other:?}"),
+            }
+        }
+
+        // Bun takes a separate code path but shares the same pre-validation.
+        let result = download_package_manager(PackageManagerType::Bun, "../../escape", None).await;
+        assert!(matches!(result, Err(Error::InvalidArgument(_))));
+    }
+
     #[tokio::test]
     async fn test_download_package_manager() {
         let result = download_package_manager(PackageManagerType::Yarn, "4.9.2", None).await;

packages/cli/binding/src/check/mod.rs

@@ -22,6 +22,7 @@ pub(crate) async fn execute_check(
     fix: bool,
     no_fmt: bool,
     no_lint: bool,
+    no_error_on_unmatched_pattern: bool,
     paths: Vec<String>,
     envs: &Arc<FxHashMap<Arc<OsStr>, Arc<OsStr>>>,
     cwd: &AbsolutePathBuf,
@@ -37,14 +38,20 @@ pub(crate) async fn execute_check(
 
     let mut status = ExitStatus::SUCCESS;
     let has_paths = !paths.is_empty();
+    // In --fix mode with file paths (the lint-staged use case), implicitly suppress
+    // "no matching files" errors. This is also available as an explicit flag for
+    // non-fix use cases.
+    let suppress_unmatched = no_error_on_unmatched_pattern || (fix && has_paths);
     let mut fmt_fix_started: Option<Instant> = None;
     let mut deferred_lint_pass: Option<(String, String)> = None;
     let resolved_vite_config = resolver.resolve_universal_vite_config().await?;
 
     if !no_fmt {
         let mut args = if fix { vec![] } else { vec!["--check".to_string()] };
-        if has_paths {
+        if suppress_unmatched {
             args.push("--no-error-on-unmatched-pattern".to_string());
+        }
+        if has_paths {
             args.extend(paths.iter().cloned());
         }
         let fmt_start = Instant::now();
@@ -87,11 +94,17 @@ pub(crate) async fn execute_check(
                     ));
                 }
                 None => {
-                    print_error_block(
-                        "Formatting could not start",
-                        &combined_output,
-                        "Formatting failed before analysis started",
-                    );
+                    // oxfmt handles --no-error-on-unmatched-pattern natively and
+                    // exits 0 when no files match, so we only need to guard
+                    // against the edge case where output is unparsable but the
+                    // process still succeeded.
+                    if !(suppress_unmatched && status == ExitStatus::SUCCESS) {
+                        print_error_block(
+                            "Formatting could not start",
+                            &combined_output,
+                            "Formatting failed before analysis started",
+                        );
+                    }
                 }
             }
         }
@@ -127,6 +140,9 @@ pub(crate) async fn execute_check(
         // parser think linting never started. Force the default reporter here so the
         // captured output is stable across local and CI environments.
         args.push("--format=default".to_string());
+        if suppress_unmatched {
+            args.push("--no-error-on-unmatched-pattern".to_string());
+        }
         if has_paths {
             args.extend(paths.iter().cloned());
         }
@@ -177,11 +193,17 @@ pub(crate) async fn execute_check(
                 ));
             }
             None => {
-                output::error("Linting could not start");
-                if !combined_output.trim().is_empty() {
-                    print_stdout_block(&combined_output);
+                // oxlint handles --no-error-on-unmatched-pattern natively and
+                // exits 0 when no files match, so we only need to guard
+                // against the edge case where output is unparsable but the
+                // process still succeeded.
+                if !(suppress_unmatched && status == ExitStatus::SUCCESS) {
+                    output::error("Linting could not start");
+                    if !combined_output.trim().is_empty() {
+                        print_stdout_block(&combined_output);
+                    }
+                    print_summary_line("Linting failed before analysis started");
                 }
-                print_summary_line("Linting failed before analysis started");
             }
         }
         if status != ExitStatus::SUCCESS {
@@ -193,8 +215,10 @@ pub(crate) async fn execute_check(
     // (e.g. the curly rule adding braces to if-statements)
     if fix && !no_fmt && !no_lint {
         let mut args = Vec::new();
-        if has_paths {
+        if suppress_unmatched {
             args.push("--no-error-on-unmatched-pattern".to_string());
+        }
+        if has_paths {
             args.extend(paths.into_iter());
         }
         let captured = resolve_and_capture_output(

packages/cli/binding/src/cli/mod.rs

@@ -63,9 +63,23 @@ async fn execute_direct_subcommand(
     let cwd_arc: Arc<AbsolutePath> = cwd.clone().into();
 
     let status = match subcommand {
-        SynthesizableSubcommand::Check { fix, no_fmt, no_lint, paths } => {
+        SynthesizableSubcommand::Check {
+            fix,
+            no_fmt,
+            no_lint,
+            no_error_on_unmatched_pattern,
+            paths,
+        } => {
             return crate::check::execute_check(
-                &resolver, fix, no_fmt, no_lint, paths, &envs, cwd, &cwd_arc,
+                &resolver,
+                fix,
+                no_fmt,
+                no_lint,
+                no_error_on_unmatched_pattern,
+                paths,
+                &envs,
+                cwd,
+                &cwd_arc,
             )
             .await;
         }

packages/cli/binding/src/cli/types.rs

@@ -93,6 +93,9 @@ pub enum SynthesizableSubcommand {
         /// Skip lint check
         #[arg(long = "no-lint")]
         no_lint: bool,
+        /// Do not exit with error when pattern is unmatched
+        #[arg(long = "no-error-on-unmatched-pattern")]
+        no_error_on_unmatched_pattern: bool,
         /// File paths to check (passed through to fmt and lint)
         #[arg(trailing_var_arg = true)]
         paths: Vec<String>,

packages/cli/snap-tests-global/command-check-help/snap.txt

@@ -6,10 +6,11 @@ Usage: vp check [OPTIONS] [PATHS]...
 Run format, lint, and type checks.
 
 Options:
-  --fix       Auto-fix format and lint issues
-  --no-fmt    Skip format check
-  --no-lint   Skip lint check
-  -h, --help  Print help
+  --fix                            Auto-fix format and lint issues
+  --no-fmt                         Skip format check
+  --no-lint                        Skip lint check
+  --no-error-on-unmatched-pattern  Do not exit with error when pattern is unmatched
+  -h, --help                       Print help
 
 Examples:
   vp check
@@ -27,10 +28,11 @@ Usage: vp check [OPTIONS] [PATHS]...
 Run format, lint, and type checks.
 
 Options:
-  --fix       Auto-fix format and lint issues
-  --no-fmt    Skip format check
-  --no-lint   Skip lint check
-  -h, --help  Print help
+  --fix                            Auto-fix format and lint issues
+  --no-fmt                         Skip format check
+  --no-lint                        Skip lint check
+  --no-error-on-unmatched-pattern  Do not exit with error when pattern is unmatched
+  -h, --help                       Print help
 
 Examples:
   vp check
@@ -48,10 +50,11 @@ Usage: vp check [OPTIONS] [PATHS]...
 Run format, lint, and type checks.
 
 Options:
-  --fix       Auto-fix format and lint issues
-  --no-fmt    Skip format check
-  --no-lint   Skip lint check
-  -h, --help  Print help
+  --fix                            Auto-fix format and lint issues
+  --no-fmt                         Skip format check
+  --no-lint                        Skip lint check
+  --no-error-on-unmatched-pattern  Do not exit with error when pattern is unmatched
+  -h, --help                       Print help
 
 Examples:
   vp check

packages/cli/snap-tests/check-fix-lint-error-not-swallowed/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "check-fix-lint-error-not-swallowed",
+  "version": "0.0.0",
+  "private": true
+}

packages/cli/snap-tests/check-fix-lint-error-not-swallowed/snap.txt

@@ -0,0 +1,12 @@
+[1]> vp check --fix src/index.js # real lint error with --fix and paths (suppress_unmatched active), error must not be swallowed
+error: Lint issues found
+× eslint(no-eval): eval can be harmful.
+   ╭─[src/index.js:2:3]
+ 1 │ function hello() {
+ 2 │   eval("code");
+   ·   ────
+ 3 │   return "hello";
+   ╰────
+  help: Avoid eval(). For JSON parsing use JSON.parse(); for dynamic property access use bracket notation (obj[key]); for other cases refactor to avoid evaluating strings as code.
+
+Found 1 error and 0 warnings in 1 file (<variable>ms, <variable> threads)

packages/cli/snap-tests/check-fix-lint-error-not-swallowed/src/index.js

@@ -0,0 +1,6 @@
+function hello() {
+  eval("code");
+  return "hello";
+}
+
+export { hello };

packages/cli/snap-tests/check-fix-lint-error-not-swallowed/steps.json

@@ -0,0 +1,5 @@
+{
+  "commands": [
+    "vp check --fix src/index.js # real lint error with --fix and paths (suppress_unmatched active), error must not be swallowed"
+  ]
+}