@pnpm/exec.lifecycle 1100.0.11 → 1100.0.12

package/lib/runLifecycleHooksConcurrently.js

@@ -1,4 +1,3 @@
-import fs from 'node:fs';
 import path from 'node:path';
 import { linkBins } from '@pnpm/bins.linker';
 import { fetchFromDir } from '@pnpm/fetching.directory-fetcher';
@@ -43,42 +42,26 @@ export async function runLifecycleHooksConcurrently(stages, importers, childConc
             }
             if (targetDirs == null || targetDirs.length === 0 || !isBuilt)
                 return;
+            // Re-import only the freshly-built source — fetchFromDir already
+            // excludes the source's node_modules/. `keepModulesDir: true` makes
+            // importIndexedDir skip the destructive makeEmptyDir fast path
+            // (#11088) and preserve the target's existing node_modules (bin
+            // symlinks + transitive deps from the initial install) via its
+            // staging/move path. Replaces the old scanDir-into-filesMap
+            // workaround (#4299) that the fast path then wiped, causing ENOENT
+            // on .bin/<tool>. Stays on storeController.importPackage so source
+            // files keep their hardlinks (no copy-loop).
             const filesResponse = await fetchFromDir(rootDir, { resolveSymlinks: opts.resolveSymlinksInInjectedDirs });
-            await Promise.all(targetDirs.map(async (targetDir) => {
-                const targetModulesDir = path.join(targetDir, 'node_modules');
-                const newFilesMap = new Map(filesResponse.filesMap);
-                if (fs.existsSync(targetModulesDir)) {
-                    // If the target directory contains a node_modules directory
-                    // (it may happen when the hoisted node linker is used)
-                    // then we need to preserve this node_modules.
-                    // So we scan this node_modules directory and  pass it as part of the new package.
-                    await scanDir('node_modules', targetModulesDir, targetModulesDir, newFilesMap);
-                }
-                return opts.storeController.importPackage(targetDir, {
-                    filesResponse: {
-                        resolvedFrom: 'local-dir',
-                        ...filesResponse,
-                        filesMap: newFilesMap,
-                    },
-                    force: false,
-                });
-            }));
+            await Promise.all(targetDirs.map(async (targetDir) => opts.storeController.importPackage(targetDir, {
+                filesResponse: {
+                    resolvedFrom: 'local-dir',
+                    ...filesResponse,
+                },
+                force: false,
+                keepModulesDir: true,
+            })));
         });
     });
     await runGroups(childConcurrency, groups);
 }
-async function scanDir(prefix, rootDir, currentDir, index) {
-    const files = await fs.promises.readdir(currentDir);
-    await Promise.all(files.map(async (file) => {
-        const fullPath = path.join(currentDir, file);
-        const stat = await fs.promises.stat(fullPath);
-        if (stat.isDirectory()) {
-            return scanDir(prefix, rootDir, fullPath, index);
-        }
-        if (stat.isFile()) {
-            const relativePath = path.relative(rootDir, fullPath);
-            index.set(path.join(prefix, relativePath), fullPath);
-        }
-    }));
-}
 //# sourceMappingURL=runLifecycleHooksConcurrently.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exec.lifecycle",
-  "version": "1100.0.11",
+  "version": "1100.0.12",
   "description": "Package lifecycle hook runner",
   "keywords": [
     "pnpm",
@@ -32,14 +32,14 @@
     "path-exists": "^5.0.0",
     "run-groups": "^5.0.0",
     "shlex": "^3.0.0",
-    "@pnpm/bins.linker": "1100.0.7",
-    "@pnpm/core-loggers": "1100.1.0",
-    "@pnpm/pkg-manifest.reader": "1100.0.3",
-    "@pnpm/store.cafs-types": "1100.0.1",
-    "@pnpm/fetching.directory-fetcher": "1100.0.10",
-    "@pnpm/store.controller-types": "1100.1.0",
+    "@pnpm/bins.linker": "1100.0.8",
+    "@pnpm/core-loggers": "1100.1.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/types": "1101.1.0"
+    "@pnpm/fetching.directory-fetcher": "1100.0.11",
+    "@pnpm/store.cafs-types": "1100.0.1",
+    "@pnpm/pkg-manifest.reader": "1100.0.4",
+    "@pnpm/store.controller-types": "1100.1.1",
+    "@pnpm/types": "1101.1.1"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
@@ -49,9 +49,9 @@
     "@types/is-windows": "^1.0.2",
     "@zkochan/rimraf": "^4.0.0",
     "load-json-file": "^7.0.1",
-    "@pnpm/prepare": "1100.0.9",
-    "@pnpm/exec.lifecycle": "1100.0.11",
     "@pnpm/test-fixtures": "1100.0.0",
+    "@pnpm/prepare": "1100.0.10",
+    "@pnpm/exec.lifecycle": "1100.0.12",
     "@pnpm/logger": "1100.0.0",
     "@pnpm/test-ipc-server": "1100.0.0"
   },