Merge branch 'main' into fix/env-pin-existing-nvmrc-2675

Author: fengmk2

Cargo.lock

@@ -208,7 +208,7 @@ itertools = "0.15.0"
 itoa = "1.0.15"
 json-escape-simd = "3"
 json-strip-comments = "3"
-jsonschema = { version = "0.46.5", default-features = false }
+jsonschema = { version = "0.55.0", default-features = false }
 junction = "1.4.1"
 libtest-mimic = "0.8.2"
 memchr = "2.7.4"
@@ -270,7 +270,7 @@ sha1 = "0.10.6"
 sha2 = "0.10.9"
 shell-escape = "0.1.5"
 simdutf8 = "0.1.5"
-smallvec = { version = "1.15.1", features = ["union"] }
+smallvec = { version = "1.16.0", features = ["union"] }
 snapshot_test = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "d05b1dcdbaabaa69643ee0b89cebe3cd390957e9" }
 string_cache = "0.9.0"
 sugar_path = { version = "3", features = ["cached_current_dir"] }
@@ -319,7 +319,7 @@ xxhash-rust = "0.8.15"
 zip = { version = "7.2", default-features = false, features = ["deflate-flate2-zlib-rs"] }
 
 # oxc crates with the same version
-oxc = { version = "0.148.0", features = [
+oxc = { version = "0.149.0", features = [
   "ast_visit",
   "transformer",
   "minifier",
@@ -331,17 +331,17 @@ oxc = { version = "0.148.0", features = [
   "regular_expression",
   "cfg",
 ] }
-oxc_allocator = { version = "0.148.0", features = ["pool"] }
-oxc_ast = "0.148.0"
-oxc_ecmascript = "0.148.0"
-oxc_parser = "0.148.0"
-oxc_span = "0.148.0"
-oxc_napi = "0.148.0"
-oxc_str = "0.148.0"
-oxc_minify_napi = "0.148.0"
-oxc_parser_napi = "0.148.0"
-oxc_transform_napi = "0.148.0"
-oxc_traverse = "0.148.0"
+oxc_allocator = { version = "0.149.0", features = ["pool"] }
+oxc_ast = "0.149.0"
+oxc_ecmascript = "0.149.0"
+oxc_parser = "0.149.0"
+oxc_span = "0.149.0"
+oxc_napi = "0.149.0"
+oxc_str = "0.149.0"
+oxc_minify_napi = "0.149.0"
+oxc_parser_napi = "0.149.0"
+oxc_transform_napi = "0.149.0"
+oxc_traverse = "0.149.0"
 
 # oxc crates in their own repos
 oxc_index = { version = "5", features = ["rayon", "serde"] }

Cargo.toml

@@ -3,8 +3,10 @@ name = "command_dlx_bun"
 vp = "global"
 local-registry = true
 skip-platforms = ["windows"]
+# bun x caches lockfiles under TMPDIR, separately from BUN_INSTALL_CACHE_DIR.
+# Isolate them so tarball URLs cannot refer to a previous test registry.
 steps = [
   { argv = ["vp", "dlx", "--help"], comment = "should show help message", continue-on-failure = true },
-  { argv = ["vp", "dlx", "-s", "cowsay", "hello"], comment = "should run cowsay with bun x", continue-on-failure = true },
-  { argv = ["vp", "dlx", "-s", "cowsay@1.6.0", "hello"], comment = "should run specific version", continue-on-failure = true },
+  { argv = ["vp", "dlx", "-s", "cowsay", "hello"], envs = [["TMPDIR", "${workspace}"]], comment = "should run cowsay with bun x", continue-on-failure = true },
+  { argv = ["vp", "dlx", "-s", "cowsay@1.6.0", "hello"], envs = [["TMPDIR", "${workspace}"]], comment = "should run specific version", continue-on-failure = true },
 ]

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_dlx_bun/snapshots.toml

@@ -23,7 +23,7 @@ Options:
 Documentation: https://viteplus.dev/guide/vpx
 ```
 
-## `vp dlx -s cowsay hello`
+## `TMPDIR=${workspace} vp dlx -s cowsay hello`
 
 should run cowsay with bun x
 
@@ -38,7 +38,7 @@ should run cowsay with bun x
                 ||     ||
 ```
 
-## `vp dlx -s cowsay@1.6.0 hello`
+## `TMPDIR=${workspace} vp dlx -s cowsay@1.6.0 hello`
 
 should run specific version
 

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/command_dlx_bun/snapshots/command_dlx_bun.md

@@ -0,0 +1,23 @@
+const assert = require('node:assert/strict');
+const { spawnSync } = require('node:child_process');
+const { chmodSync, copyFileSync, mkdirSync } = require('node:fs');
+const path = require('node:path');
+
+const runtimeDir = path.resolve('custom-runtime');
+mkdirSync(runtimeDir);
+const runtime = path.join(runtimeDir, process.platform === 'win32' ? 'custom node.exe' : 'custom node');
+copyFileSync(process.execPath, runtime);
+chmodSync(runtime, 0o755);
+const vp = path.join(path.dirname(require.resolve('vite-plus/package.json')), 'bin', 'vp');
+const env = { ...process.env };
+for (const key of Object.keys(env)) {
+  if (key.toUpperCase() === 'PATH') delete env[key];
+}
+env.PATH = runtimeDir;
+
+for (const tool of ['lint', 'fmt']) {
+  const child = spawnSync(runtime, [vp, tool, '--version'], { env, encoding: 'utf8', timeout: 30000 });
+  assert.equal(child.status, 0, child.stderr || child.error?.message);
+  assert.match(child.stdout, /\d+\.\d+\.\d+/);
+  console.log(`${tool} reused the current runtime without node on PATH`);
+}

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/current_node_runtime/assert-runtime.cjs

@@ -0,0 +1,4 @@
+{
+  "name": "current-node-runtime",
+  "private": true
+}

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/current_node_runtime/package.json

@@ -0,0 +1,6 @@
+[[case]]
+name = "builtin_tools_without_node_on_path"
+vp = "local"
+steps = [
+  { argv = ["node", "assert-runtime.cjs"], comment = "Built-in tools reuse the current runtime even when its filename is not node and PATH has no node executable." },
+]

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/current_node_runtime/snapshots.toml

@@ -0,0 +1,10 @@
+# builtin_tools_without_node_on_path
+
+## `node assert-runtime.cjs`
+
+Built-in tools reuse the current runtime even when its filename is not node and PATH has no node executable.
+
+```
+lint reused the current runtime without node on PATH
+fmt reused the current runtime without node on PATH
+```

crates/vp_cli_snapshots/tests/cli_snapshots/fixtures/current_node_runtime/snapshots/builtin_tools_without_node_on_path.md

@@ -148,7 +148,7 @@ fn parse_js_ts_config(source: &str, extension: &str) -> FieldMap {
     let parser = Parser::new(&allocator, source, source_type);
     let result = parser.parse();
 
-    if result.panicked || !result.diagnostics.is_empty() {
+    if result.fatal_error || !result.diagnostics.is_empty() {
         return FieldMap::unanalyzable();
     }
 
@@ -1320,6 +1320,19 @@ mod tests {
 
     // ── Not analyzable cases ─────────────────────────────────────────────
 
+    #[test]
+    fn syntax_errors_require_runtime_evaluation() {
+        for source in [
+            "export default { run: { cache: true }",
+            "export default { run: { cache: true } }; const missing;",
+        ] {
+            let result = parse(source);
+            assert_non_static(&result, "run");
+            assert_non_static(&result, "defaultPackage");
+            assert_eq!(result.get_declared("run"), None);
+        }
+    }
+
     #[test]
     fn returns_none_for_no_default_export() {
         assert_non_static(&parse_js_ts_config("export const config = { a: 1 };", "ts"), "run");

crates/vp_static_config/src/lib.rs

@@ -1,4 +1,3 @@
-// prettier-ignore
 /* eslint-disable */
 // @ts-nocheck
 /* auto-generated by NAPI-RS */