@pnpm/installing.read-projects-context 1100.0.3 → 1100.0.4

package/lib/index.js

@@ -4,10 +4,15 @@ import util from 'node:util';
 import { normalizeRegistries } from '@pnpm/config.normalize-registries';
 import { readModulesManifest } from '@pnpm/installing.modules-yaml';
 import { getLockfileImporterId } from '@pnpm/lockfile.fs';
+import { pathAbsolute } from 'path-absolute';
 import { realpathMissing } from 'realpath-missing';
 export async function readProjectsContext(projects, opts) {
-    const relativeModulesDir = opts.modulesDir ?? 'node_modules';
-    const rootModulesDir = await realpathMissing(path.join(opts.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 modulesDirOpt = opts.modulesDir ?? 'node_modules';
+    const rootModulesDir = await realpathMissing(pathAbsolute(modulesDirOpt, opts.lockfileDir));
     const modules = await readModulesManifest(rootModulesDir);
     return {
         currentHoistPattern: modules?.hoistPattern,
@@ -18,11 +23,11 @@ export async function readProjectsContext(projects, opts) {
         modules,
         pendingBuilds: modules?.pendingBuilds ?? [],
         projects: await Promise.all(projects.map(async (project) => {
-            const modulesDir = await realpathMissing(path.join(project.rootDir, project.modulesDir ?? relativeModulesDir));
+            const modulesDir = await realpathMissing(pathAbsolute(project.modulesDir ?? modulesDirOpt, project.rootDir));
             const importerId = getLockfileImporterId(opts.lockfileDir, project.rootDir);
             return {
                 ...project,
-                binsDir: project.binsDir ?? path.join(project.rootDir, relativeModulesDir, '.bin'),
+                binsDir: project.binsDir ?? path.join(modulesDir, '.bin'),
                 id: importerId,
                 modulesDir,
                 rootDirRealPath: project.rootDirRealPath ?? await realpath(project.rootDir),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.read-projects-context",
-  "version": "1100.0.3",
+  "version": "1100.0.4",
   "description": "Reads the current state of projects from modules manifest",
   "keywords": [
     "pnpm",
@@ -24,18 +24,19 @@
     "!*.map"
   ],
   "dependencies": {
+    "path-absolute": "^2.0.0",
     "realpath-missing": "^2.0.0",
     "@pnpm/config.normalize-registries": "1100.0.1",
     "@pnpm/installing.modules-yaml": "1100.0.1",
-    "@pnpm/lockfile.fs": "1100.0.3",
-    "@pnpm/types": "1101.0.0"
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/lockfile.fs": "1100.0.3"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
   },
   "devDependencies": {
-    "@pnpm/logger": "1100.0.0",
-    "@pnpm/installing.read-projects-context": "1100.0.3"
+    "@pnpm/installing.read-projects-context": "1100.0.4",
+    "@pnpm/logger": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"