@pnpm/workspace.workspace-manifest-writer 1100.0.21 → 1100.1.1

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @pnpm/workspace.manifest-writer
 
+## 1100.1.1
+
+### Patch Changes
+
+- `pnpm approve-builds` now removes `onlyBuiltDependencies`, `onlyBuiltDependenciesFile`, `neverBuiltDependencies`, and `ignoredBuiltDependencies` from `pnpm-workspace.yaml` when it writes `allowBuilds`. Those settings were replaced by `allowBuilds` in pnpm 11 and silently ignored since, so a workspace migrated from pnpm 10 kept them around looking active.
+
+- `pnpm remove` now prunes undecided entries (`"set this to true or false"`) from `allowBuilds` in `pnpm-workspace.yaml` when `sharedWorkspaceLockfile: true` and the corresponding packages are removed [pnpm/pnpm#13892](https://github.com/pnpm/pnpm/issues/13892).
+
+- Updated dependencies:
+  - @pnpm/building.policy@1100.0.20
+  - @pnpm/config.parse-overrides@1100.1.4
+  - @pnpm/config.version-policy@1100.2.1
+  - @pnpm/constants@1102.0.0
+  - @pnpm/lockfile.types@1100.0.20
+  - @pnpm/types@1102.0.0
+  - @pnpm/workspace.workspace-manifest-reader@1100.1.7
+
+## 1100.1.0
+
+### Minor Changes
+
+- Added a new setting `minimumReleaseAgeExcludePrune`. When enabled, `pnpm add`, `pnpm update`, and `pnpm remove` prune the entries of `minimumReleaseAgeExclude` in `pnpm-workspace.yaml` that the freshly written lockfile no longer resolves: versions that are gone are dropped (an entry is removed once none of its versions remain), and entries for packages that are no longer in the lockfile are removed too. Name patterns (`@scope/*`) are always kept. The cleanup is skipped when the install's lockfile does not cover the whole workspace (`sharedWorkspaceLockfile: false`), since entries another project still needs would look stale.
+
+  Renamed `cleanupUnusedCatalogs` to `catalogPrune`, so that catalog pruning and release-age exclude pruning use one vocabulary. `cleanupUnusedCatalogs` continues to work; when both are set, `catalogPrune` wins.
+
+### Patch Changes
+
+- `pnpm config delete <key>` no longer fails with `ENOENT` when the config file it would edit does not exist. Clearing a setting that was never set is a no-op [#13651](https://github.com/pnpm/pnpm/issues/13651).
+
+- Updated dependencies:
+  - @pnpm/config.parse-overrides@1100.1.3
+  - @pnpm/config.version-policy@1100.2.0
+  - @pnpm/workspace.workspace-manifest-reader@1100.1.6
+
 ## 1100.0.21
 
 ### Patch Changes

package/lib/index.d.ts

@@ -9,9 +9,18 @@ export declare function updateWorkspaceManifest(dir: string, opts: {
     updatedCatalogs?: Catalogs;
     updatedOverrides?: Record<string, string>;
     addedMinimumReleaseAgeExcludes?: string[];
+    deletedLegacyKeys?: string[];
     fileName?: FileName;
-    cleanupUnusedCatalogs?: boolean;
+    catalogPrune?: boolean;
     allProjects?: Project[];
+    /**
+     * Package name → the versions the freshly resolved lockfile records.
+     * Supplied when a freshly resolved shared lockfile is available.
+     * `minimumReleaseAgeExcludePrune` gates only minimum-release-age cleanup;
+     * `allowBuilds` cleanup runs whenever this map is present.
+     */
+    resolvedPackageVersions?: ReadonlyMap<string, ReadonlySet<string>>;
+    minimumReleaseAgeExcludePrune?: boolean;
 }): Promise<void>;
 export interface NewCatalogs {
     [catalogName: string]: {

package/lib/index.js

@@ -1,8 +1,9 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import util from 'node:util';
+import { packageNameFromAllowBuildKey, UNDECIDED_ALLOW_BUILD } from '@pnpm/building.policy';
 import { parsePkgAndParentSelector } from '@pnpm/config.parse-overrides';
-import { mergePackageVersionSpecs } from '@pnpm/config.version-policy';
+import { mergePackageVersionSpecs, parseVersionPolicyRule } from '@pnpm/config.version-policy';
 import { WORKSPACE_MANIFEST_FILENAME } from '@pnpm/constants';
 import { lexCompare } from '@pnpm/text.ordinal-comparator';
 import { validateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader';
@@ -41,19 +42,31 @@ export async function updateWorkspaceManifest(dir, opts) {
     manifest ??= {};
     const originalKeyOrder = captureKeyOrder(manifest);
     let shouldBeUpdated = opts.updatedCatalogs != null && addCatalogs(manifest, opts.updatedCatalogs);
-    if (opts.cleanupUnusedCatalogs) {
+    if (opts.catalogPrune) {
         shouldBeUpdated = removePackagesFromWorkspaceCatalog(manifest, opts.allProjects ?? []) || shouldBeUpdated;
     }
     const updatedFields = { ...opts.updatedFields };
     for (const [key, value] of Object.entries(updatedFields)) {
-        if (!equals(manifest[key], value)) {
+        if (value == null) {
+            // Clearing a field the manifest never had changes nothing. Counting it as
+            // an update would take the empty-manifest branch below and try to remove a
+            // file that may not exist.
+            if (!Object.hasOwn(manifest, key))
+                continue;
+            shouldBeUpdated = true;
+            delete manifest[key];
+            continue;
+        }
+        if (equals(manifest[key], value))
+            continue;
+        shouldBeUpdated = true;
+        manifest[key] = value;
+    }
+    const untypedManifest = manifest;
+    for (const key of opts.deletedLegacyKeys ?? []) {
+        if (Object.hasOwn(untypedManifest, key)) {
+            delete untypedManifest[key];
             shouldBeUpdated = true;
-            if (value == null) {
-                delete manifest[key];
-            }
-            else {
-                manifest[key] = value;
-            }
         }
     }
     if (opts.updatedOverrides) {
@@ -65,6 +78,14 @@ export async function updateWorkspaceManifest(dir, opts) {
             }
         }
     }
+    if (opts.resolvedPackageVersions != null) {
+        if (opts.minimumReleaseAgeExcludePrune) {
+            shouldBeUpdated = pruneMinimumReleaseAgeExcludes(manifest, opts.resolvedPackageVersions) || shouldBeUpdated;
+        }
+        shouldBeUpdated = pruneAllowBuilds(manifest, opts.resolvedPackageVersions) || shouldBeUpdated;
+    }
+    // Merged after the cleanup pass so entries approved during this install
+    // are never pruned by it in the same write.
     if (opts.addedMinimumReleaseAgeExcludes?.length) {
         const existing = manifest.minimumReleaseAgeExclude ?? [];
         const merged = mergePackageVersionSpecs([...existing, ...opts.addedMinimumReleaseAgeExcludes]);
@@ -196,6 +217,65 @@ function addPackageReference(packageReferences, pkgName, version) {
     }
     packageReferences[pkgName].add(version);
 }
+// The `minimumReleaseAgeExcludePrune` pass. An entry is dropped when the
+// freshly resolved lockfile no longer contains what it names: exact versions
+// that were not resolved are dropped (the entry goes away once none remain),
+// and a bare-name entry goes away when the package is absent entirely. Glob
+// patterns always stay — they are forward-looking and can't be proven stale.
+// Entries that fail to parse stay untouched so cleanup never breaks an
+// install.
+function pruneMinimumReleaseAgeExcludes(manifest, resolvedPackageVersions) {
+    const excludes = manifest.minimumReleaseAgeExclude;
+    if (excludes == null || excludes.length === 0) {
+        return false;
+    }
+    const survivingSpecs = [];
+    let changed = false;
+    for (const entry of excludes) {
+        let packageName;
+        let exactVersions;
+        try {
+            const rule = parseVersionPolicyRule(entry);
+            packageName = rule.packageName;
+            exactVersions = rule.exactVersions;
+        }
+        catch {
+            survivingSpecs.push(entry);
+            continue;
+        }
+        if (exactVersions.length === 0) {
+            if (packageName.includes('*') || resolvedPackageVersions.has(packageName)) {
+                survivingSpecs.push(entry);
+            }
+            else {
+                changed = true;
+            }
+            continue;
+        }
+        const resolved = resolvedPackageVersions.get(packageName);
+        const survivingVersions = exactVersions.filter((version) => resolved?.has(version));
+        if (survivingVersions.length === exactVersions.length) {
+            survivingSpecs.push(entry);
+        }
+        else if (survivingVersions.length > 0) {
+            survivingSpecs.push(...mergePackageVersionSpecs([`${packageName}@${survivingVersions.join(' || ')}`]));
+            changed = true;
+        }
+        else {
+            changed = true;
+        }
+    }
+    if (!changed) {
+        return false;
+    }
+    if (survivingSpecs.length === 0) {
+        delete manifest.minimumReleaseAgeExclude;
+    }
+    else {
+        manifest.minimumReleaseAgeExclude = survivingSpecs;
+    }
+    return true;
+}
 // Captures only the key order at each nested level of a plain-object value,
 // without duplicating the values themselves. Used as a lightweight snapshot of
 // the original manifest layout so `reorderRecursive` can decide where to place
@@ -315,4 +395,27 @@ function propagateBlankLinesToNewPairs(document, originalTopLevelKeys) {
         }
     }
 }
+// Drops undecided placeholder entries whose package is provably absent from
+// the resolved lockfile. Explicit decisions, keys with no provable package
+// name, and entries for still-resolved packages always stay.
+function pruneAllowBuilds(manifest, resolvedPackageVersions) {
+    const allowBuilds = manifest.allowBuilds;
+    if (allowBuilds == null) {
+        return false;
+    }
+    let changed = false;
+    for (const [key, value] of Object.entries(allowBuilds)) {
+        if (value !== UNDECIDED_ALLOW_BUILD)
+            continue;
+        const packageName = packageNameFromAllowBuildKey(key);
+        if (packageName == null || resolvedPackageVersions.has(packageName))
+            continue;
+        delete allowBuilds[key];
+        changed = true;
+    }
+    if (changed && Object.keys(allowBuilds).length === 0) {
+        delete manifest.allowBuilds;
+    }
+    return changed;
+}
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/workspace.workspace-manifest-writer",
-  "version": "1100.0.21",
+  "version": "1100.1.1",
   "description": "Updates the workspace manifest file",
   "keywords": [
     "pnpm",
@@ -27,14 +27,15 @@
     "!*.map"
   ],
   "dependencies": {
+    "@pnpm/building.policy": "1100.0.20",
     "@pnpm/catalogs.types": "1100.0.1",
-    "@pnpm/config.parse-overrides": "1100.1.2",
-    "@pnpm/config.version-policy": "1100.1.12",
-    "@pnpm/constants": "1101.0.0",
-    "@pnpm/lockfile.types": "1100.0.19",
+    "@pnpm/config.parse-overrides": "1100.1.4",
+    "@pnpm/config.version-policy": "1100.2.1",
+    "@pnpm/constants": "1102.0.0",
+    "@pnpm/lockfile.types": "1100.0.20",
     "@pnpm/text.ordinal-comparator": "1100.0.0",
-    "@pnpm/types": "1101.9.0",
-    "@pnpm/workspace.workspace-manifest-reader": "1100.1.5",
+    "@pnpm/types": "1102.0.0",
+    "@pnpm/workspace.workspace-manifest-reader": "1100.1.7",
     "@pnpm/yaml.document-sync": "1100.0.1",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "write-file-atomic": "^7.0.1",
@@ -42,10 +43,10 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/prepare": "1100.0.25",
+    "@pnpm/prepare": "1100.0.27",
     "@pnpm/prepare-temp-dir": "1100.0.1",
-    "@pnpm/workspace.projects-reader": "1101.0.22",
-    "@pnpm/workspace.workspace-manifest-writer": "1100.0.21",
+    "@pnpm/workspace.projects-reader": "1101.0.24",
+    "@pnpm/workspace.workspace-manifest-writer": "1100.1.1",
     "@types/ramda": "0.32.0",
     "@types/write-file-atomic": "^4.0.3",
     "read-yaml-file": "^3.0.0",