fix: correctly detect the active Node js version during headless inst…

…allation (#7801) close #5266 --------- Co-authored-by: Zoltan Kochan <z@kochan.io>
pnpm · Mar 17, 2024 · 4eac871 · 4eac871
1 parent 3c50981
commit 4eac871
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/.changeset/nasty-goats-care.md b/.changeset/nasty-goats-care.md
@@ -0,0 +1,6 @@
+---
+"@pnpm/core": patch
+"pnpm": patch
+---
+
+Correctly detect the active Node.js version during headless installation [#7801](https://github.com/pnpm/pnpm/pull/7801).
diff --git a/config/package-is-installable/src/index.ts b/config/package-is-installable/src/index.ts
@@ -90,4 +90,4 @@ export function checkPackage (
         pnpm: options.pnpmVersion,
       })
   )
-}
+}
diff --git a/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts b/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts
@@ -26,7 +26,7 @@ export function filterLockfileByEngine (
 
 export interface FilterLockfileOptions {
   currentEngine: {
-    nodeVersion: string
+    nodeVersion?: string
     pnpmVersion: string
   }
   engineStrict: boolean
@@ -92,7 +92,7 @@ function pickPkgsWithAllDeps (
   importerIdSet: Set<string>,
   opts: {
     currentEngine: {
-      nodeVersion: string
+      nodeVersion?: string
       pnpmVersion: string
     }
     engineStrict: boolean
@@ -119,7 +119,7 @@ function pkgAllDeps (
   parentIsInstallable: boolean,
   opts: {
     currentEngine: {
-      nodeVersion: string
+      nodeVersion?: string
       pnpmVersion: string
     }
     engineStrict: boolean

diff --git a/pkg-manager/core/src/install/extendInstallOptions.ts b/pkg-manager/core/src/install/extendInstallOptions.ts
@@ -68,7 +68,7 @@ export interface StrictInstallOptions {
   onlyBuiltDependenciesFile?: string
   nodeExecPath?: string
   nodeLinker: 'isolated' | 'hoisted' | 'pnp'
-  nodeVersion: string
+  nodeVersion?: string
   packageExtensions: Record<string, PackageExtension>
   packageManager: {
     name: string
@@ -186,7 +186,7 @@ const defaults = (opts: InstallOptions) => {
     },
     lockfileDir: opts.lockfileDir ?? opts.dir ?? process.cwd(),
     lockfileOnly: false,
-    nodeVersion: process.version,
+    nodeVersion: opts.nodeVersion,
     nodeLinker: 'isolated',
     overrides: {},
     ownLifecycleHooksStdio: 'inherit',

diff --git a/pkg-manager/headless/src/index.ts b/pkg-manager/headless/src/index.ts
@@ -102,7 +102,7 @@ export interface HeadlessOptions {
   childConcurrency?: number
   currentLockfile?: Lockfile
   currentEngine: {
-    nodeVersion: string
+    nodeVersion?: string
     pnpmVersion: string
   }
   dedupeDirectDeps?: boolean

diff --git a/pkg-manager/resolve-dependencies/src/resolveDependencies.ts b/pkg-manager/resolve-dependencies/src/resolveDependencies.ts
@@ -155,7 +155,7 @@ export interface ResolutionContext {
   preferWorkspacePackages?: boolean
   readPackageHook?: ReadPackageHook
   engineStrict: boolean
-  nodeVersion: string
+  nodeVersion?: string
   pnpmVersion: string
   registries: Registries
   resolutionMode?: 'highest' | 'time-based' | 'lowest-direct'

diff --git a/pkg-manager/resolve-dependencies/src/resolveDependencyTree.ts b/pkg-manager/resolve-dependencies/src/resolveDependencyTree.ts
@@ -84,7 +84,7 @@ export interface ResolveDependenciesOptions {
   hooks: {
     readPackage?: ReadPackageHook
   }
-  nodeVersion: string
+  nodeVersion?: string
   registries: Registries
   patchedDependencies?: Record<string, PatchFile>
   pnpmVersion: string