@pnpm/installing.deps-restorer 1101.0.1 → 1101.0.2

package/lib/index.js

@@ -48,11 +48,15 @@ export async function headlessInstall(opts) {
         throw new Error(`Headless installation requires a ${WANTED_LOCKFILE} file`);
     }
     const depsStateCache = {};
-    const relativeModulesDir = opts.modulesDir ?? 'node_modules';
-    const rootModulesDir = await realpathMissing(path.join(lockfileDir, relativeModulesDir));
+    // `modulesDir` is conventionally a path relative to `lockfileDir`, but
+    // some callers pass it as an absolute path. Resolve via `pathAbsolute`
+    // so both forms work — `path.join` on Windows would otherwise produce a
+    // doubled prefix when the second argument is also absolute.
+    const modulesDir = opts.modulesDir ?? 'node_modules';
+    const rootModulesDir = await realpathMissing(pathAbsolute(modulesDir, lockfileDir));
     const internalPnpmDir = path.join(rootModulesDir, '.pnpm');
     const currentLockfile = opts.currentLockfile ?? await readCurrentLockfile(internalPnpmDir, { ignoreIncompatible: false });
-    const virtualStoreDir = pathAbsolute(opts.virtualStoreDir ?? path.join(relativeModulesDir, '.pnpm'), lockfileDir);
+    const virtualStoreDir = pathAbsolute(opts.virtualStoreDir ?? path.join(modulesDir, '.pnpm'), lockfileDir);
     const hoistedModulesDir = path.join(opts.enableGlobalVirtualStore ? internalPnpmDir : virtualStoreDir, 'node_modules');
     const publicHoistedModulesDir = rootModulesDir;
     const selectedProjects = Object.values(pick(opts.selectedProjectDirs, opts.allProjects));

package/lib/lockfileToHoistedDepGraph.js

@@ -6,6 +6,7 @@ import { nameVerFromPkgSnapshot, packageIdFromSnapshot, pkgSnapshotToResolution,
 import { logger } from '@pnpm/logger';
 import { getPatchInfo } from '@pnpm/patching.config';
 import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
+import { pathAbsolute } from 'path-absolute';
 import { pathExists } from 'path-exists';
 export async function lockfileToHoistedDepGraph(lockfile, currentLockfile, opts) {
     let prevGraph;
@@ -31,7 +32,7 @@ async function _lockfileToHoistedDepGraph(lockfile, opts) {
         autoInstallPeers: opts.autoInstallPeers,
     });
     const graph = {};
-    const modulesDir = path.join(opts.lockfileDir, opts.modulesDir ?? 'node_modules');
+    const modulesDir = pathAbsolute(opts.modulesDir ?? 'node_modules', opts.lockfileDir);
     const fetchDepsOpts = {
         ...opts,
         lockfile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-restorer",
-  "version": "1101.0.1",
+  "version": "1101.0.2",
   "description": "Fast installation using only pnpm-lock.yaml",
   "keywords": [
     "pnpm",
@@ -37,31 +37,31 @@
     "realpath-missing": "^2.0.0",
     "@pnpm/bins.linker": "1100.0.2",
     "@pnpm/building.during-install": "1101.0.1",
-    "@pnpm/core-loggers": "1100.0.1",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/config.package-is-installable": "1100.0.1",
     "@pnpm/building.policy": "1100.0.1",
-    "@pnpm/deps.graph-builder": "1100.0.3",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/config.package-is-installable": "1100.0.2",
+    "@pnpm/core-loggers": "1100.0.1",
+    "@pnpm/deps.graph-builder": "1100.0.4",
     "@pnpm/deps.graph-hasher": "1100.1.1",
     "@pnpm/deps.path": "1100.0.1",
     "@pnpm/error": "1100.0.0",
     "@pnpm/exec.lifecycle": "1100.0.4",
-    "@pnpm/installing.linking.direct-dep-linker": "1100.0.1",
-    "@pnpm/installing.linking.hoist": "1100.0.2",
-    "@pnpm/installing.linking.modules-cleaner": "1100.0.3",
     "@pnpm/fs.symlink-dependency": "1100.0.1",
-    "@pnpm/installing.modules-yaml": "1100.0.1",
-    "@pnpm/installing.package-requester": "1101.0.0",
+    "@pnpm/installing.linking.hoist": "1100.0.2",
+    "@pnpm/installing.linking.direct-dep-linker": "1100.0.1",
     "@pnpm/installing.linking.real-hoist": "1100.0.3",
+    "@pnpm/installing.linking.modules-cleaner": "1100.0.4",
+    "@pnpm/installing.package-requester": "1101.0.1",
+    "@pnpm/lockfile.filtering": "1100.0.4",
     "@pnpm/lockfile.fs": "1100.0.3",
     "@pnpm/lockfile.to-pnp": "1100.0.3",
     "@pnpm/lockfile.utils": "1100.0.3",
-    "@pnpm/pkg-manifest.reader": "1100.0.1",
     "@pnpm/patching.config": "1100.0.1",
-    "@pnpm/lockfile.filtering": "1100.0.3",
+    "@pnpm/pkg-manifest.reader": "1100.0.1",
+    "@pnpm/store.controller-types": "1100.0.3",
+    "@pnpm/installing.modules-yaml": "1100.0.1",
     "@pnpm/types": "1101.0.0",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.2",
-    "@pnpm/store.controller-types": "1100.0.3"
+    "@pnpm/workspace.project-manifest-reader": "1100.0.2"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
@@ -79,16 +79,16 @@
     "write-json-file": "^7.0.0",
     "@pnpm/assert-project": "1100.0.3",
     "@pnpm/crypto.object-hasher": "1100.0.0",
-    "@pnpm/installing.read-projects-context": "1100.0.3",
+    "@pnpm/installing.read-projects-context": "1100.0.4",
+    "@pnpm/installing.deps-restorer": "1101.0.2",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/installing.deps-restorer": "1101.0.1",
-    "@pnpm/prepare": "1100.0.3",
     "@pnpm/store.cafs": "1100.1.0",
+    "@pnpm/prepare": "1100.0.3",
+    "@pnpm/store.path": "1100.0.0",
     "@pnpm/store.index": "1100.0.0",
     "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.temp-store": "1100.0.6",
-    "@pnpm/store.path": "1100.0.0"
+    "@pnpm/testing.temp-store": "1100.0.7",
+    "@pnpm/test-fixtures": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"