@pnpm/building.after-install 1000.0.0-0 → 1100.0.1

package/lib/extendBuildOptions.d.ts

@@ -1,7 +1,7 @@
-import { type Config } from '@pnpm/config';
+import type { Config, ConfigContext } from '@pnpm/config.reader';
 import type { LogBase } from '@pnpm/logger';
-import type { StoreController } from '@pnpm/store-controller-types';
-import type { Registries } from '@pnpm/types';
+import type { StoreController } from '@pnpm/store.controller-types';
+import type { Registries, RegistryConfig } from '@pnpm/types';
 export type StrictBuildOptions = {
     autoInstallPeers: boolean;
     cacheDir: string;
@@ -29,7 +29,7 @@ export type StrictBuildOptions = {
     production: boolean;
     development: boolean;
     optional: boolean;
-    rawConfig: object;
+    configByUri: Record<string, RegistryConfig>;
     userConfig: Record<string, string>;
     userAgent: string;
     packageManager: {
@@ -40,12 +40,11 @@ export type StrictBuildOptions = {
     pending: boolean;
     shamefullyHoist: boolean;
     deployAllFiles: boolean;
-    neverBuiltDependencies?: string[];
     allowBuilds?: Record<string, boolean | string>;
     virtualStoreDirMaxLength: number;
     peersSuffixMaxLength: number;
     strictStorePkgContentCheck: boolean;
     fetchFullMetadata?: boolean;
-} & Pick<Config, 'sslConfigs' | 'allowBuilds'>;
-export type BuildOptions = Partial<StrictBuildOptions> & Pick<StrictBuildOptions, 'storeDir' | 'storeController'> & Pick<Config, 'rootProjectManifest' | 'rootProjectManifestDir'>;
+} & Pick<Config, 'allowBuilds'>;
+export type BuildOptions = Partial<StrictBuildOptions> & Pick<StrictBuildOptions, 'storeDir' | 'storeController'> & Pick<ConfigContext, 'rootProjectManifest' | 'rootProjectManifestDir'>;
 export declare function extendBuildOptions(opts: BuildOptions): Promise<StrictBuildOptions>;

package/lib/extendBuildOptions.js

@@ -1,6 +1,5 @@
-import path from 'path';
-import { getOptionsFromRootManifest } from '@pnpm/config';
-import { normalizeRegistries, DEFAULT_REGISTRIES } from '@pnpm/normalize-registries';
+import path from 'node:path';
+import { DEFAULT_REGISTRIES, normalizeRegistries } from '@pnpm/config.normalize-registries';
 import { loadJsonFile } from 'load-json-file';
 const defaults = async (opts) => {
     const packageManager = opts.packageManager ??
@@ -18,7 +17,7 @@ const defaults = async (opts) => {
         packageManager,
         pending: false,
         production: true,
-        rawConfig: {},
+        configByUri: {},
         registries: DEFAULT_REGISTRIES,
         scriptsPrependNodePath: false,
         shamefullyHoist: false,
@@ -46,7 +45,6 @@ export async function extendBuildOptions(opts) {
         ...defaultOpts,
         ...opts,
         storeDir: defaultOpts.storeDir,
-        ...(opts.rootProjectManifest ? getOptionsFromRootManifest(opts.rootProjectManifestDir, opts.rootProjectManifest) : {}),
     };
     extendedOpts.registries = normalizeRegistries(extendedOpts.registries);
     return extendedOpts;

package/lib/index.js

@@ -1,25 +1,25 @@
-import assert from 'assert';
-import path from 'path';
-import util from 'util';
+import assert from 'node:assert';
+import path from 'node:path';
+import util from 'node:util';
+import { linkBins } from '@pnpm/bins.linker';
 import { pkgRequiresBuild } from '@pnpm/building.pkg-requires-build';
 import { createAllowBuildFunction } from '@pnpm/building.policy';
-import { calcDepState, lockfileToDepGraph } from '@pnpm/calc-dep-state';
 import { LAYOUT_VERSION, WANTED_LOCKFILE, } from '@pnpm/constants';
 import { skippedOptionalDependencyLogger } from '@pnpm/core-loggers';
-import * as dp from '@pnpm/dependency-path';
+import { calcDepState, lockfileToDepGraph } from '@pnpm/deps.graph-hasher';
 import { graphSequencer } from '@pnpm/deps.graph-sequencer';
+import * as dp from '@pnpm/deps.path';
 import { PnpmError } from '@pnpm/error';
-import { getContext } from '@pnpm/get-context';
-import { runLifecycleHooksConcurrently, runPostinstallHooks, } from '@pnpm/lifecycle';
-import { linkBins } from '@pnpm/link-bins';
+import { runLifecycleHooksConcurrently, runPostinstallHooks, } from '@pnpm/exec.lifecycle';
+import { getContext } from '@pnpm/installing.context';
+import { writeModulesManifest } from '@pnpm/installing.modules-yaml';
 import { nameVerFromPkgSnapshot, packageIsIndependent, } from '@pnpm/lockfile.utils';
 import { lockfileWalker } from '@pnpm/lockfile.walker';
 import { logger, streamParser } from '@pnpm/logger';
-import { writeModulesManifest } from '@pnpm/modules-yaml';
 import npa from '@pnpm/npm-package-arg';
-import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json';
+import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
+import { createStoreController } from '@pnpm/store.connection-manager';
 import { StoreIndex, storeIndexKey } from '@pnpm/store.index';
-import { createStoreController } from '@pnpm/store-connection-manager';
 import { hardLinkDir } from '@pnpm/worker';
 import pLimit from 'p-limit';
 import { runGroups } from 'run-groups';
@@ -41,7 +41,7 @@ function findPackages(packages, searched, opts) {
         return matches(searched, pkgInfo);
     });
 }
-// TODO: move this logic to separate package as this is also used in dependencies-hierarchy
+// TODO: move this logic to separate package as this is also used in tree-builder
 function matches(searched, manifest) {
     return searched.some((searchedPkg) => {
         if (typeof searchedPkg === 'string') {
@@ -91,16 +91,17 @@ export async function buildSelectedPkgs(projects, pkgSpecs, maybeOpts) {
         hoistedDependencies: ctx.hoistedDependencies,
         hoistPattern: ctx.hoistPattern,
         included: ctx.include,
-        ignoredBuilds: ignoredPkgs,
+        ignoredBuilds: mergeIgnoredBuilds(ctx.modulesFile?.ignoredBuilds, ignoredPkgs, pkgs),
         layoutVersion: LAYOUT_VERSION,
         packageManager: `${opts.packageManager.name}@${opts.packageManager.version}`,
         pendingBuilds: ctx.pendingBuilds,
         publicHoistPattern: ctx.publicHoistPattern,
         registries: ctx.registries,
         skipped: Array.from(ctx.skipped),
-        storeDir: ctx.storeDir,
-        virtualStoreDir: ctx.virtualStoreDir,
-        virtualStoreDirMaxLength: ctx.virtualStoreDirMaxLength,
+        storeDir: ctx.modulesFile?.storeDir ?? ctx.storeDir,
+        virtualStoreDir: ctx.modulesFile?.virtualStoreDir ?? ctx.virtualStoreDir,
+        virtualStoreDirMaxLength: ctx.modulesFile?.virtualStoreDirMaxLength ?? ctx.virtualStoreDirMaxLength,
+        allowBuilds: opts.allowBuilds,
     });
     return {
         ignoredBuilds: ignoredPkgs,
@@ -131,12 +132,12 @@ export async function buildProjects(projects, maybeOpts) {
         extraNodePaths: ctx.extraNodePaths,
         extraEnv: opts.extraEnv,
         preferSymlinkedExecutables: opts.preferSymlinkedExecutables,
-        rawConfig: opts.rawConfig,
         scriptsPrependNodePath: opts.scriptsPrependNodePath,
         scriptShell: opts.scriptShell,
         shellEmulator: opts.shellEmulator,
         storeController: store.ctrl,
         unsafePerm: opts.unsafePerm || false,
+        userAgent: opts.userAgent,
     };
     await runLifecycleHooksConcurrently(['preinstall', 'install', 'postinstall', 'prepublish', 'prepare'], Object.values(ctx.projects), opts.childConcurrency || 5, scriptsOpts);
     for (const { id, manifest } of Object.values(ctx.projects)) {
@@ -276,11 +277,11 @@ async function _rebuild(ctx, opts) {
                 extraEnv: opts.extraEnv,
                 optional: pkgSnapshot.optional === true,
                 pkgRoot,
-                rawConfig: opts.rawConfig,
                 rootModulesDir: ctx.rootModulesDir,
                 scriptsPrependNodePath: opts.scriptsPrependNodePath,
                 shellEmulator: opts.shellEmulator,
                 unsafePerm: opts.unsafePerm || false,
+                userAgent: opts.userAgent,
             });
             if (hasSideEffects && (opts.sideEffectsCacheWrite ?? true) && resolution.integrity) {
                 builtDepPaths.add(depPath);
@@ -366,4 +367,25 @@ function binDirsInAllParentDirs(pkgRoot, lockfileDir) {
     binDirs.push(path.join(lockfileDir, 'node_modules/.bin'));
     return binDirs;
 }
+/**
+ * Merge new ignoredBuilds from a selective rebuild with existing ones.
+ * Keeps existing entries for packages that weren't part of this rebuild.
+ */
+function mergeIgnoredBuilds(existing, newIgnored, rebuiltPkgs) {
+    if (!existing?.size && !newIgnored.size)
+        return undefined;
+    const rebuiltSet = new Set(rebuiltPkgs);
+    const merged = new Set();
+    if (existing) {
+        for (const depPath of existing) {
+            if (!rebuiltSet.has(depPath)) {
+                merged.add(depPath);
+            }
+        }
+    }
+    for (const depPath of newIgnored) {
+        merged.add(depPath);
+    }
+    return merged.size ? merged : undefined;
+}
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/building.after-install",
-  "version": "1000.0.0-0",
+  "version": "1100.0.1",
   "description": "Rebuild packages that are already installed by running their lifecycle scripts",
   "keywords": [
     "pnpm",
@@ -28,39 +28,39 @@
     "@pnpm/npm-package-arg": "^2.0.0",
     "load-json-file": "^7.0.1",
     "p-limit": "^7.1.0",
-    "run-groups": "^4.0.0",
+    "run-groups": "^5.0.0",
     "semver": "^7.7.2",
-    "@pnpm/building.pkg-requires-build": "1000.0.0-0",
-    "@pnpm/building.policy": "1000.0.0-0",
-    "@pnpm/calc-dep-state": "1002.0.8",
-    "@pnpm/config": "1004.4.2",
-    "@pnpm/core-loggers": "1001.0.4",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/get-context": "1001.1.8",
-    "@pnpm/lifecycle": "1001.0.25",
-    "@pnpm/link-bins": "1000.2.6",
-    "@pnpm/deps.graph-sequencer": "1000.0.0",
-    "@pnpm/dependency-path": "1001.1.3",
-    "@pnpm/lockfile.types": "1002.0.2",
-    "@pnpm/lockfile.utils": "1003.0.3",
-    "@pnpm/modules-yaml": "1000.3.6",
-    "@pnpm/normalize-registries": "1000.1.4",
-    "@pnpm/store-connection-manager": "1002.2.4",
-    "@pnpm/read-package-json": "1000.1.2",
-    "@pnpm/store.cafs": "1000.0.19",
-    "@pnpm/lockfile.walker": "1001.0.16",
-    "@pnpm/store.index": "1000.0.0-0",
-    "@pnpm/store-controller-types": "1004.1.0",
-    "@pnpm/types": "1000.9.0"
+    "@pnpm/building.policy": "1100.0.1",
+    "@pnpm/config.normalize-registries": "1100.0.1",
+    "@pnpm/bins.linker": "1100.0.1",
+    "@pnpm/building.pkg-requires-build": "1100.0.1",
+    "@pnpm/config.reader": "1100.0.1",
+    "@pnpm/deps.graph-sequencer": "1100.0.0",
+    "@pnpm/deps.path": "1100.0.1",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/core-loggers": "1100.0.1",
+    "@pnpm/exec.lifecycle": "1100.0.1",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/deps.graph-hasher": "1100.0.1",
+    "@pnpm/installing.context": "1100.0.1",
+    "@pnpm/installing.modules-yaml": "1100.0.1",
+    "@pnpm/lockfile.utils": "1100.0.1",
+    "@pnpm/lockfile.walker": "1100.0.1",
+    "@pnpm/pkg-manifest.reader": "1100.0.1",
+    "@pnpm/store.connection-manager": "1100.0.1",
+    "@pnpm/lockfile.types": "1100.0.1",
+    "@pnpm/store.index": "1100.0.0",
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/store.controller-types": "1100.0.1",
+    "@pnpm/store.cafs": "1100.0.1"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1000.3.0"
+    "@pnpm/worker": "^1100.0.1"
   },
   "devDependencies": {
     "@types/semver": "7.7.1",
-    "@pnpm/building.after-install": "1000.0.0-0"
+    "@pnpm/building.after-install": "1100.0.1"
   },
   "engines": {
     "node": ">=22.13"
@@ -70,7 +70,7 @@
   },
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
-    "compile": "tsgo --build && pnpm run lint --fix",
-    "test": "pnpm run compile"
+    "compile": "tsgo --build && pn lint --fix",
+    "test": "pn compile"
   }
 }