@pnpm/installing.deps-restorer 1101.1.2 → 1101.1.4

package/lib/index.js

@@ -6,7 +6,7 @@ import { createAllowBuildFunction, isBuildExplicitlyDisallowed } from '@pnpm/bui
 import { LAYOUT_VERSION, WANTED_LOCKFILE, } from '@pnpm/constants';
 import { packageManifestLogger, progressLogger, stageLogger, statsLogger, summaryLogger, } from '@pnpm/core-loggers';
 import { lockfileToDepGraph, } from '@pnpm/deps.graph-builder';
-import { calcDepState } from '@pnpm/deps.graph-hasher';
+import { calcDepState, findRuntimeNodeVersion } from '@pnpm/deps.graph-hasher';
 import * as dp from '@pnpm/deps.path';
 import { PnpmError } from '@pnpm/error';
 import { makeNodeRequireOption, runLifecycleHooksConcurrently, } from '@pnpm/exec.lifecycle';
@@ -625,6 +625,14 @@ async function linkAllPkgs(storeController, depNodes, opts) {
         needsBuildMarkerSrc = path.join(opts.storeDir, '.pnpm-needs-build-marker');
         await fs.writeFile(needsBuildMarkerSrc, '');
     }
+    // Resolved `engines.runtime` Node version (when present) anchors
+    // the side-effects-cache key prefix to the script-runner Node, not
+    // pnpm's own `process.version`. The restorer's `depGraph` is keyed
+    // by install directory, so scanning `Object.keys(opts.depGraph)`
+    // would never see a `node@runtime:<version>` entry — pull the
+    // depPath off each node instead. Computed once outside the
+    // per-node loop.
+    const nodeVersion = findRuntimeNodeVersion(depNodes.map((node) => node.depPath));
     await Promise.all(depNodes.map(async (depNode) => {
         if (!depNode.fetching)
             return;
@@ -645,6 +653,7 @@ async function linkAllPkgs(storeController, depNodes, opts) {
                     includeDepGraphHash: !opts.ignoreScripts && depNode.requiresBuild, // true when is built
                     patchFileHash: depNode.patch?.hash,
                     supportedArchitectures: opts.supportedArchitectures,
+                    nodeVersion,
                 });
             }
         }

package/lib/linkHoistedModules.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { linkBins } from '@pnpm/bins.linker';
 import { progressLogger, removalLogger, statsLogger, } from '@pnpm/core-loggers';
-import { calcDepState } from '@pnpm/deps.graph-hasher';
+import { calcDepState, findRuntimeNodeVersion } from '@pnpm/deps.graph-hasher';
 import { logger } from '@pnpm/logger';
 import { rimraf } from '@zkochan/rimraf';
 import pLimit from 'p-limit';
@@ -17,6 +17,13 @@ export async function linkHoistedModules(storeController, graph, prevGraph, hier
     // We should avoid removing unnecessary directories while simultaneously adding new ones.
     // Doing so can sometimes lead to a race condition when linking commands to `node_modules/.bin`.
     await Promise.all(dirsToRemove.map((dir) => tryRemoveDir(dir)));
+    // Resolve the project's pinned runtime Node version once, before
+    // the recursive walk. The graph is keyed by install directory in
+    // this module, so scanning `Object.keys(graph)` would miss every
+    // `node@runtime:<version>` entry — pull the depPath off each
+    // node instead. Threading it down via `opts` also avoids a
+    // re-scan at every recursion level.
+    const nodeVersion = findRuntimeNodeVersion(Object.values(graph).map((node) => node.depPath));
     await Promise.all(Object.entries(hierarchy)
         .map(([parentDir, depsHierarchy]) => {
         function warn(message) {
@@ -27,6 +34,7 @@ export async function linkHoistedModules(storeController, graph, prevGraph, hier
         }
         return linkAllPkgsInOrder(storeController, graph, depsHierarchy, parentDir, {
             ...opts,
+            nodeVersion,
             warn,
         });
     }));
@@ -67,6 +75,7 @@ async function linkAllPkgsInOrder(storeController, graph, hierarchy, parentDir,
                         includeDepGraphHash: !opts.ignoreScripts && depNode.requiresBuild, // true when is built
                         patchFileHash: depNode.patch?.hash,
                         supportedArchitectures: opts.supportedArchitectures,
+                        nodeVersion: opts.nodeVersion,
                     });
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-restorer",
-  "version": "1101.1.2",
+  "version": "1101.1.4",
   "description": "Fast installation using only pnpm-lock.yaml",
   "keywords": [
     "pnpm",
@@ -35,37 +35,37 @@
     "path-exists": "^5.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "realpath-missing": "^2.0.0",
-    "@pnpm/building.during-install": "1101.0.10",
-    "@pnpm/config.package-is-installable": "1100.0.4",
-    "@pnpm/bins.linker": "1100.0.6",
+    "@pnpm/bins.linker": "1100.0.8",
+    "@pnpm/building.during-install": "1101.0.12",
+    "@pnpm/config.package-is-installable": "1100.0.6",
+    "@pnpm/building.policy": "1100.0.6",
+    "@pnpm/core-loggers": "1100.1.1",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/deps.graph-builder": "1100.0.9",
-    "@pnpm/building.policy": "1100.0.4",
-    "@pnpm/deps.path": "1100.0.3",
-    "@pnpm/exec.lifecycle": "1100.0.10",
-    "@pnpm/deps.graph-hasher": "1100.1.5",
+    "@pnpm/deps.graph-builder": "1100.0.11",
+    "@pnpm/deps.graph-hasher": "1100.2.1",
+    "@pnpm/deps.path": "1100.0.4",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/fs.symlink-dependency": "1100.0.3",
-    "@pnpm/installing.linking.hoist": "1100.0.6",
-    "@pnpm/installing.linking.direct-dep-linker": "1100.0.3",
-    "@pnpm/installing.linking.modules-cleaner": "1100.1.1",
-    "@pnpm/installing.linking.real-hoist": "1100.0.7",
-    "@pnpm/lockfile.filtering": "1100.1.0",
-    "@pnpm/lockfile.fs": "1100.0.8",
-    "@pnpm/lockfile.utils": "1100.0.7",
-    "@pnpm/pkg-manifest.reader": "1100.0.3",
-    "@pnpm/patching.config": "1100.0.3",
-    "@pnpm/core-loggers": "1100.0.2",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.5",
-    "@pnpm/installing.modules-yaml": "1100.0.4",
-    "@pnpm/lockfile.to-pnp": "1100.0.8",
-    "@pnpm/types": "1101.1.0",
-    "@pnpm/store.controller-types": "1100.0.7",
-    "@pnpm/installing.package-requester": "1101.0.6"
+    "@pnpm/exec.lifecycle": "1100.0.12",
+    "@pnpm/fs.symlink-dependency": "1100.0.5",
+    "@pnpm/installing.linking.direct-dep-linker": "1100.0.5",
+    "@pnpm/installing.linking.real-hoist": "1100.0.9",
+    "@pnpm/installing.modules-yaml": "1100.0.5",
+    "@pnpm/installing.linking.hoist": "1100.0.8",
+    "@pnpm/installing.linking.modules-cleaner": "1100.1.3",
+    "@pnpm/installing.package-requester": "1101.0.8",
+    "@pnpm/lockfile.filtering": "1100.1.2",
+    "@pnpm/lockfile.to-pnp": "1100.0.10",
+    "@pnpm/lockfile.utils": "1100.0.9",
+    "@pnpm/pkg-manifest.reader": "1100.0.4",
+    "@pnpm/patching.config": "1100.0.4",
+    "@pnpm/lockfile.fs": "1100.1.1",
+    "@pnpm/types": "1101.1.1",
+    "@pnpm/store.controller-types": "1100.1.1",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.7"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1100.1.5"
+    "@pnpm/worker": "^1100.1.7"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
@@ -77,18 +77,18 @@
     "load-json-file": "^7.0.1",
     "tempy": "3.0.0",
     "write-json-file": "^7.0.0",
-    "@pnpm/installing.deps-restorer": "1101.1.2",
+    "@pnpm/assert-project": "1100.0.10",
     "@pnpm/crypto.object-hasher": "1100.0.0",
-    "@pnpm/installing.read-projects-context": "1100.0.9",
+    "@pnpm/installing.deps-restorer": "1101.1.4",
+    "@pnpm/installing.read-projects-context": "1100.0.11",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/store.cafs": "1100.1.4",
-    "@pnpm/prepare": "1100.0.8",
+    "@pnpm/prepare": "1100.0.10",
+    "@pnpm/store.cafs": "1100.1.6",
     "@pnpm/store.index": "1100.1.0",
-    "@pnpm/test-ipc-server": "1100.0.0",
     "@pnpm/store.path": "1100.0.1",
-    "@pnpm/testing.temp-store": "1100.0.16",
-    "@pnpm/assert-project": "1100.0.8",
-    "@pnpm/test-fixtures": "1100.0.0"
+    "@pnpm/test-ipc-server": "1100.0.0",
+    "@pnpm/test-fixtures": "1100.0.0",
+    "@pnpm/testing.temp-store": "1100.1.1"
   },
   "engines": {
     "node": ">=22.13"