@pnpm/exec.lifecycle 1100.1.14 → 1100.1.15

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @pnpm/lifecycle
 
+## 1100.1.15
+
+### Patch Changes
+
+- Workspace install, rebuild, pack, publish, stage, and lifecycle work now starts as soon as its dependencies finish instead of waiting for an unrelated topological group.
+
+- Fixed recursive `run` cleanup on Windows when a lifecycle script fails while another script's process tree is still running.
+
+- Updated dependencies:
+  - @pnpm/bins.linker@1100.0.29
+  - @pnpm/core-loggers@1100.3.4
+  - @pnpm/fetching.directory-fetcher@1100.0.31
+  - @pnpm/pkg-manifest.reader@1100.0.18
+  - @pnpm/store.cafs-types@1100.1.0
+  - @pnpm/store.controller-types@1101.2.0
+  - @pnpm/types@1102.1.0
+
 ## 1100.1.14
 
 ### Patch Changes

package/lib/runLifecycleHook.js

@@ -7,6 +7,7 @@ import { lifecycle } from '@pnpm/npm-lifecycle';
 import chalk from 'chalk';
 import isWindows from 'is-windows';
 import { join as shellQuote } from 'shlex';
+import { trackChildProcess } from './trackChildProcess.js';
 function noop() { } // eslint-disable-line:no-empty
 export async function runLifecycleHook(stage, manifest, opts) {
     const optional = opts.optional === true;
@@ -108,6 +109,7 @@ Please unset the scriptShell option, or configure it to a .exe instead.
                 globalWarn(msg.join(' '));
             },
         },
+        onSpawn: trackChildProcess,
         runConcurrently: true,
         scriptsPrependNodePath: opts.scriptsPrependNodePath,
         scriptShell: opts.scriptShell,

package/lib/runLifecycleHooksConcurrently.d.ts

@@ -15,4 +15,10 @@ export interface Importer {
     stages?: string[];
     targetDirs?: string[];
 }
-export declare function runLifecycleHooksConcurrently(stages: string[], importers: Importer[], childConcurrency: number, opts: RunLifecycleHooksConcurrentlyOptions): Promise<void>;
+export declare function runLifecycleHooksConcurrently(params: {
+    childConcurrency: number;
+    importers: Importer[];
+    opts: RunLifecycleHooksConcurrentlyOptions;
+    projectDependencies?: Map<ProjectRootDir, ProjectRootDir[]>;
+    stages: string[];
+}): Promise<void>;

package/lib/runLifecycleHooksConcurrently.js

@@ -2,66 +2,93 @@ import path from 'node:path';
 import { linkBins } from '@pnpm/bins.linker';
 import { fetchFromDir } from '@pnpm/fetching.directory-fetcher';
 import { logger } from '@pnpm/logger';
-import { runGroups } from 'run-groups';
+import { scheduleGraph } from '@pnpm/workspace.task-scheduler';
 import { runLifecycleHook } from './runLifecycleHook.js';
-export async function runLifecycleHooksConcurrently(stages, importers, childConcurrency, opts) {
-    const importersByBuildIndex = new Map();
-    for (const importer of importers) {
-        if (!importersByBuildIndex.has(importer.buildIndex)) {
-            importersByBuildIndex.set(importer.buildIndex, [importer]);
-        }
-        else {
-            importersByBuildIndex.get(importer.buildIndex).push(importer);
-        }
-    }
-    const sortedBuildIndexes = Array.from(importersByBuildIndex.keys()).sort((a, b) => a - b);
-    const groups = sortedBuildIndexes.map((buildIndex) => {
-        const importers = importersByBuildIndex.get(buildIndex);
-        return importers.map(({ manifest, modulesDir, rootDir, stages: importerStages, targetDirs }) => async () => {
-            // We are linking the bin files, in case they were created by lifecycle scripts of other workspace packages.
-            await linkBins(modulesDir, path.join(modulesDir, '.bin'), {
-                extraNodePaths: opts.extraNodePaths,
-                allowExoticManifests: true,
-                preferSymlinkedExecutables: opts.preferSymlinkedExecutables,
-                projectManifest: manifest,
-                warn: (message) => {
-                    logger.warn({ message, prefix: rootDir });
-                },
-            });
-            const runLifecycleHookOpts = {
-                ...opts,
-                depPath: rootDir,
-                pkgRoot: rootDir,
-                rootModulesDir: modulesDir,
-            };
-            let isBuilt = false;
-            for (const stage of (importerStages ?? stages)) {
-                if (await runLifecycleHook(stage, manifest, runLifecycleHookOpts)) { // eslint-disable-line no-await-in-loop
-                    isBuilt = true;
+export async function runLifecycleHooksConcurrently(params) {
+    const { childConcurrency, importers, opts, projectDependencies, stages } = params;
+    const importersByRootDir = new Map(importers.map((importer) => [importer.rootDir, importer]));
+    const dependencies = projectDependencies == null
+        ? dependenciesFromBuildIndexes(importers)
+        : new Map(importers.map(({ rootDir }) => [
+            rootDir,
+            (projectDependencies.get(rootDir) ?? []).filter((dependency) => importersByRootDir.has(dependency)),
+        ]));
+    let firstError;
+    await scheduleGraph(dependencies, {
+        bail: true,
+        concurrency: childConcurrency,
+        runNode: async (rootDir) => {
+            const { manifest, modulesDir, stages: importerStages, targetDirs } = importersByRootDir.get(rootDir);
+            try {
+                // We are linking the bin files, in case they were created by lifecycle scripts of other workspace packages.
+                await linkBins(modulesDir, path.join(modulesDir, '.bin'), {
+                    extraNodePaths: opts.extraNodePaths,
+                    allowExoticManifests: true,
+                    preferSymlinkedExecutables: opts.preferSymlinkedExecutables,
+                    projectManifest: manifest,
+                    warn: (message) => {
+                        logger.warn({ message, prefix: rootDir });
+                    },
+                });
+                const runLifecycleHookOpts = {
+                    ...opts,
+                    depPath: rootDir,
+                    pkgRoot: rootDir,
+                    rootModulesDir: modulesDir,
+                };
+                let isBuilt = false;
+                for (const stage of (importerStages ?? stages)) {
+                    if (await runLifecycleHook(stage, manifest, runLifecycleHookOpts)) { // eslint-disable-line no-await-in-loop
+                        isBuilt = true;
+                    }
                 }
+                if (targetDirs == null || targetDirs.length === 0 || !isBuilt)
+                    return 'passed';
+                // 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) => opts.storeController.importPackage(targetDir, {
+                    filesResponse: {
+                        resolvedFrom: 'local-dir',
+                        ...filesResponse,
+                    },
+                    force: false,
+                    keepModulesDir: true,
+                })));
+                return 'passed';
+            }
+            catch (error) {
+                firstError ??= error;
+                return 'aborted';
             }
-            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) => opts.storeController.importPackage(targetDir, {
-                filesResponse: {
-                    resolvedFrom: 'local-dir',
-                    ...filesResponse,
-                },
-                force: false,
-                keepModulesDir: true,
-            })));
-        });
+        },
+        onNodeSkipped: () => { },
     });
-    await runGroups(childConcurrency, groups);
+    if (firstError != null)
+        throw firstError;
+}
+function dependenciesFromBuildIndexes(importers) {
+    const groups = new Map();
+    for (const { buildIndex, rootDir } of importers) {
+        const group = groups.get(buildIndex) ?? [];
+        group.push(rootDir);
+        groups.set(buildIndex, group);
+    }
+    const dependencies = new Map();
+    let previous = [];
+    for (const buildIndex of [...groups.keys()].sort((left, right) => left - right)) {
+        const group = groups.get(buildIndex);
+        for (const rootDir of group)
+            dependencies.set(rootDir, previous);
+        previous = group;
+    }
+    return dependencies;
 }
 //# sourceMappingURL=runLifecycleHooksConcurrently.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exec.lifecycle",
-  "version": "1100.1.14",
+  "version": "1100.1.15",
   "description": "Package lifecycle hook runner",
   "keywords": [
     "pnpm",
@@ -29,19 +29,19 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/bins.linker": "1100.0.28",
-    "@pnpm/core-loggers": "1100.3.3",
+    "@pnpm/bins.linker": "1100.0.29",
+    "@pnpm/core-loggers": "1100.3.4",
     "@pnpm/error": "1100.1.3",
-    "@pnpm/fetching.directory-fetcher": "1100.0.30",
-    "@pnpm/npm-lifecycle": "^1100.0.0",
-    "@pnpm/pkg-manifest.reader": "1100.0.17",
-    "@pnpm/store.cafs-types": "1100.0.2",
-    "@pnpm/store.controller-types": "1101.1.2",
-    "@pnpm/types": "1102.0.0",
+    "@pnpm/fetching.directory-fetcher": "1100.0.31",
+    "@pnpm/npm-lifecycle": "^1100.1.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.18",
+    "@pnpm/store.cafs-types": "1100.1.0",
+    "@pnpm/store.controller-types": "1101.2.0",
+    "@pnpm/types": "1102.1.0",
+    "@pnpm/workspace.task-scheduler": "1100.0.0",
     "chalk": "^6.0.0",
     "is-windows": "^1.0.2",
     "path-exists": "^5.0.0",
-    "run-groups": "^5.0.0",
     "shlex": "^3.0.0"
   },
   "peerDependencies": {
@@ -49,9 +49,9 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/exec.lifecycle": "1100.1.14",
+    "@pnpm/exec.lifecycle": "1100.1.15",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.27",
+    "@pnpm/prepare": "1100.0.28",
     "@pnpm/test-fixtures": "1100.0.1",
     "@pnpm/test-ipc-server": "1100.0.0",
     "@types/is-windows": "^1.0.2",