Skip to content

Commit e8beddb

Browse files
fengmk2fengmk2
authored
Merge branch 'main' into 06-25-fix_install_retry_truncated_downloads_in_httpclient_get_bytes
2 parents 6eb6a31 + f7d2849 commit e8beddb

9 files changed

Lines changed: 98 additions & 6 deletions

File tree

‎crates/vite_global_cli/src/shim/dispatch.rs‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,23 @@ async fn resolve_matching_package_manager_tool(
714714
Ok(Some(package_manager_bin_path(&install_dir, bin_name)))
715715
}
716716

717+
async fn prepend_js_child_process_path_env(
718+
cwd: &AbsolutePath,
719+
node_bin_dir: &AbsolutePath,
720+
) -> Result<(), Error> {
721+
let _ = prepend_to_path_env(node_bin_dir, PrependOptions::default());
722+
723+
let Some(npm_path) = resolve_matching_package_manager_tool(cwd, "npm").await? else {
724+
return Ok(());
725+
};
726+
if let Some(pm_bin_dir) = npm_path.parent()
727+
&& pm_bin_dir != node_bin_dir
728+
{
729+
let _ = prepend_to_path_env(pm_bin_dir, PrependOptions::default());
730+
}
731+
Ok(())
732+
}
733+
717734
/// Main shim dispatch entry point.
718735
///
719736
/// Called when the binary is invoked as node, npm, npx, corepack, or a
@@ -861,7 +878,10 @@ pub async fn dispatch(tool: &str, args: &[String]) -> i32 {
861878
// version was selected from `packageManager`, put that PM bin dir first so
862879
// nested invocations see the same PM version while recursion prevention is set.
863880
let node_bin_dir = node_path.parent().expect("Node has no parent directory");
864-
let _ = prepend_to_path_env(node_bin_dir, PrependOptions::default());
881+
if let Err(e) = prepend_js_child_process_path_env(&cwd, node_bin_dir).await {
882+
eprintln!("vp: Failed to resolve package manager for child process PATH: {e}");
883+
return 1;
884+
}
865885
if let Some(pm_bin_dir) = tool_path.parent()
866886
&& pm_bin_dir != node_bin_dir
867887
{
@@ -960,10 +980,15 @@ async fn dispatch_package_binary(tool: &str, args: &[String]) -> i32 {
960980
match ensure_installed(&node_version).await {
961981
Ok(node_path) => {
962982
if let Some(node_bin_dir) = node_path.parent() {
963-
let _ = prepend_to_path_env(
964-
node_bin_dir,
965-
PrependOptions::default(),
966-
);
983+
if let Err(e) =
984+
prepend_js_child_process_path_env(&cwd, node_bin_dir).await
985+
{
986+
eprintln!(
987+
"vp: Failed to resolve package manager for child \
988+
process PATH: {e}"
989+
);
990+
return 1;
991+
}
967992
}
968993
}
969994
Err(e) => {
@@ -1066,7 +1091,13 @@ pub(crate) async fn package_binary_invocation(
10661091
// Prepare environment for recursive invocations
10671092
let node_bin_dir =
10681093
node_path.parent().ok_or_else(|| "Node has no parent directory".to_string())?;
1069-
let _ = prepend_to_path_env(node_bin_dir, PrependOptions::default());
1094+
if let Ok(cwd) = current_dir() {
1095+
prepend_js_child_process_path_env(&cwd, node_bin_dir).await.map_err(|e| {
1096+
format!("Failed to resolve package manager for child process PATH: {e}")
1097+
})?;
1098+
} else {
1099+
let _ = prepend_to_path_env(node_bin_dir, PrependOptions::default());
1100+
}
10701101

10711102
// JS binaries (determined at install time and stored in metadata) run
10721103
// through node; native executables run directly.

‎packages/cli/snap-tests-global/env-node-child-process-npm/node/package.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "@env-node-child-process-npm/node",
3+
"version": "1.0.0",
4+
"private": true,
5+
"type": "module",
6+
"devEngines": {
7+
"runtime": {
8+
"name": "node",
9+
"version": "20.18.0",
10+
"onFail": "download"
11+
}
12+
}
13+
}

‎packages/cli/snap-tests-global/env-node-child-process-npm/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"type": "module"
3+
}

‎packages/cli/snap-tests-global/env-node-child-process-npm/print-path.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { execFileSync } from 'node:child_process';
2+
3+
const npmPath = execFileSync('which', ['npm'], { encoding: 'utf8' }).trim();
4+
const normalizedNpmPath = npmPath.split('/').join('/');
5+
6+
console.log(normalizedNpmPath);

‎packages/cli/snap-tests-global/env-node-child-process-npm/print-version.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { execFileSync } from 'node:child_process';
2+
3+
const versionOutput = execFileSync('npm', ['--version'], { encoding: 'utf8' }).trim();
4+
const version = versionOutput.split(/\r?\n/).at(-1);
5+
6+
console.log(version);

‎packages/cli/snap-tests-global/env-node-child-process-npm/snap.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
> cd node && test "$(npm --version)" = "$(node ../print-version.js)" && node ../print-path.js
2+
<vite-plus-home>/js_runtime/node/<semver>/bin/npm
3+
4+
> cd specific && test "$(npm --version)" = "$(node ../print-version.js)" && test "$(node ../print-version.js)" = "$(node ./print-package-json-pm-version.js)" && node ../print-path.js
5+
<vite-plus-home>/package_manager/npm/<semver>/npm/bin/npm

‎packages/cli/snap-tests-global/env-node-child-process-npm/specific/package.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "@env-node-child-process-npm/specific",
3+
"version": "1.0.0",
4+
"private": true,
5+
"type": "module",
6+
"devEngines": {
7+
"packageManager": {
8+
"name": "npm",
9+
"version": "11.17.0",
10+
"onFail": "download"
11+
},
12+
"runtime": {
13+
"name": "node",
14+
"version": "20.18.0",
15+
"onFail": "download"
16+
}
17+
}
18+
}

‎packages/cli/snap-tests-global/env-node-child-process-npm/specific/print-package-json-pm-version.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import packageJson from './package.json' assert { type: 'json' };
2+
3+
console.log(packageJson.devEngines.packageManager.version);

‎packages/cli/snap-tests-global/env-node-child-process-npm/steps.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"ignoredPlatforms": ["win32"],
3+
"commands": [
4+
"cd node && test \"$(npm --version)\" = \"$(node ../print-version.js)\" && node ../print-path.js",
5+
"cd specific && test \"$(npm --version)\" = \"$(node ../print-version.js)\" && test \"$(node ../print-version.js)\" = \"$(node ./print-package-json-pm-version.js)\" && node ../print-path.js"
6+
]
7+
}

0 commit comments

Comments
 (0)