@pnpm/engine.pm.commands 1101.0.2 → 1101.1.1

package/lib/self-updater/selfUpdate.js

@@ -2,11 +2,11 @@ import path from 'node:path';
 import { linkBins } from '@pnpm/bins.linker';
 import { isExecutedByCorepack, packageManager } from '@pnpm/cli.meta';
 import { docsUrl } from '@pnpm/cli.utils';
-import { types as allTypes } from '@pnpm/config.reader';
+import { parsePackageManager, types as allTypes } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
 import { createResolver } from '@pnpm/installing.client';
 import { resolvePackageManagerIntegrities } from '@pnpm/installing.env-installer';
-import { globalWarn } from '@pnpm/logger';
+import { globalInfo, globalWarn } from '@pnpm/logger';
 import { whichVersionIsPinned } from '@pnpm/resolving.npm-resolver';
 import { createStoreController } from '@pnpm/store.connection-manager';
 import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader';
@@ -23,6 +23,13 @@ export function cliOptionsTypes() {
     };
 }
 export const commandNames = ['self-update'];
+// Migration guidance printed once when `pnpm self-update` crosses a major
+// boundary. Add an entry here for each future major that ships breaking
+// changes users need to act on.
+const MAJOR_UPGRADE_HINTS = {
+    11: 'pnpm v11 removed or renamed several v10 settings. ' +
+        'See https://pnpm.io/11.x/migration for migration instructions.',
+};
 export const skipPackageManagerCheck = true;
 export function help() {
     return renderHelp({
@@ -41,6 +48,7 @@ export async function handler(opts, params) {
     if (isExecutedByCorepack()) {
         throw new PnpmError('CANT_SELF_UPDATE_IN_COREPACK', 'You should update pnpm with corepack');
     }
+    globalInfo('Checking for updates...');
     const { resolve } = createResolver({ ...opts, configByUri: opts.configByUri });
     const pkgName = 'pnpm';
     const bareSpecifier = params[0] ?? 'latest';
@@ -52,27 +60,68 @@ export async function handler(opts, params) {
     if (!resolution?.manifest) {
         throw new PnpmError('CANNOT_RESOLVE_PNPM', `Cannot find "${bareSpecifier}" version of pnpm`);
     }
+    // Determine the "previous" pnpm version being upgraded FROM. If the
+    // project pins pnpm via `packageManager`/`devEngines.packageManager`,
+    // the pin is the source of truth — the running pnpm binary may already
+    // be at a newer major (e.g. a globally-installed v11 operating on a
+    // project still pinned to v10). Otherwise fall back to the running
+    // binary. Skip the hint entirely on a no-op (target === previous).
+    const targetVersion = resolution.manifest.version;
+    let previousVersion;
+    if (opts.wantedPackageManager?.name === packageManager.name) {
+        if (opts.wantedPackageManager.version !== targetVersion) {
+            previousVersion = opts.wantedPackageManager.version;
+        }
+    }
+    else if (packageManager.version !== targetVersion) {
+        previousVersion = packageManager.version;
+    }
+    const previousMajor = previousVersion != null
+        ? semver.coerce(previousVersion)?.major
+        : undefined;
+    const targetMajor = semver.major(targetVersion);
+    if (previousMajor != null && targetMajor > previousMajor) {
+        const hint = MAJOR_UPGRADE_HINTS[targetMajor];
+        if (hint)
+            globalWarn(hint);
+    }
     if (opts.wantedPackageManager?.name === packageManager.name) {
         if (opts.wantedPackageManager?.version !== resolution.manifest.version) {
             const { manifest, writeProjectManifest } = await readProjectManifest(opts.rootProjectManifestDir);
             if (manifest.devEngines?.packageManager) {
-                if (Array.isArray(manifest.devEngines.packageManager)) {
-                    const pnpmEntry = manifest.devEngines.packageManager.find((e) => e.name === 'pnpm');
-                    if (pnpmEntry) {
-                        const updated = updateVersionConstraint(pnpmEntry.version, resolution.manifest.version);
-                        if (updated !== pnpmEntry.version) {
-                            pnpmEntry.version = updated;
-                            await writeProjectManifest(manifest);
-                        }
+                let manifestChanged = false;
+                // If "packageManager" pins pnpm, treat both fields as the user's
+                // single source of truth for the active pnpm version: rewrite both
+                // to the new exact version (dropping any range operator in
+                // devEngines and any integrity hash on the legacy field). When only
+                // devEngines is set, preserve the user's range style and let the
+                // lockfile pin the exact version.
+                const legacyPm = manifest.packageManager != null
+                    ? parsePackageManager(manifest.packageManager)
+                    : undefined;
+                const legacyPinsPnpm = legacyPm?.name === 'pnpm' && legacyPm.version != null;
+                const devEnginesPm = manifest.devEngines.packageManager;
+                const pnpmEntry = Array.isArray(devEnginesPm)
+                    ? devEnginesPm.find((e) => e.name === 'pnpm')
+                    : devEnginesPm.name === 'pnpm' ? devEnginesPm : undefined;
+                if (pnpmEntry) {
+                    const updated = legacyPinsPnpm
+                        ? resolution.manifest.version
+                        : updateVersionConstraint(pnpmEntry.version, resolution.manifest.version);
+                    if (updated !== pnpmEntry.version) {
+                        pnpmEntry.version = updated;
+                        manifestChanged = true;
                     }
                 }
-                else if (manifest.devEngines.packageManager.name === 'pnpm') {
-                    const updated = updateVersionConstraint(manifest.devEngines.packageManager.version, resolution.manifest.version);
-                    if (updated !== manifest.devEngines.packageManager.version) {
-                        manifest.devEngines.packageManager.version = updated;
-                        await writeProjectManifest(manifest);
+                if (legacyPinsPnpm) {
+                    const newLegacy = `pnpm@${resolution.manifest.version}`;
+                    if (manifest.packageManager !== newLegacy) {
+                        manifest.packageManager = newLegacy;
+                        manifestChanged = true;
                     }
                 }
+                if (manifestChanged)
+                    await writeProjectManifest(manifest);
                 const store = await createStoreController(opts);
                 await resolvePackageManagerIntegrities(resolution.manifest.version, {
                     registries: opts.registries,
@@ -94,6 +143,7 @@ export async function handler(opts, params) {
     if (resolution.manifest.version === packageManager.version) {
         return `The currently active ${packageManager.name} v${packageManager.version} is already "${bareSpecifier}" and doesn't need an update`;
     }
+    globalInfo(`Updating pnpm from v${packageManager.version} to v${resolution.manifest.version}...`);
     const store = await createStoreController(opts);
     // Resolve integrities and write env lockfile to pnpm-lock.yaml
     const envLockfile = await resolvePackageManagerIntegrities(resolution.manifest.version, {
@@ -113,7 +163,7 @@ export async function handler(opts, params) {
     if (alreadyExisted) {
         return `The ${bareSpecifier} version, v${resolution.manifest.version}, is already present on the system. It was activated by linking it from ${baseDir}.`;
     }
-    return undefined;
+    return `Successfully updated pnpm to v${resolution.manifest.version}`;
 }
 /**
  * Returns the updated version constraint for devEngines.packageManager.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/engine.pm.commands",
-  "version": "1101.0.2",
+  "version": "1101.1.1",
   "description": "pnpm commands for self-updating and setting up pnpm",
   "keywords": [
     "pnpm",
@@ -32,25 +32,25 @@
     "render-help": "^2.0.0",
     "semver": "^7.7.2",
     "symlink-dir": "^10.0.1",
-    "@pnpm/cli.meta": "1100.0.1",
     "@pnpm/bins.linker": "1100.0.2",
-    "@pnpm/building.policy": "1100.0.1",
+    "@pnpm/cli.meta": "1100.0.1",
     "@pnpm/cli.utils": "1101.0.0",
     "@pnpm/deps.graph-hasher": "1100.1.1",
-    "@pnpm/global.commands": "1100.0.4",
+    "@pnpm/building.policy": "1100.0.1",
+    "@pnpm/global.commands": "1100.0.6",
+    "@pnpm/config.reader": "1101.1.2",
     "@pnpm/global.packages": "1100.0.1",
-    "@pnpm/config.reader": "1101.1.1",
-    "@pnpm/installing.client": "1100.0.4",
-    "@pnpm/installing.deps-restorer": "1101.0.0",
-    "@pnpm/lockfile.types": "1100.0.2",
-    "@pnpm/shell.path": "1100.0.0",
-    "@pnpm/store.connection-manager": "1100.0.4",
-    "@pnpm/installing.env-installer": "1101.0.0",
-    "@pnpm/resolving.npm-resolver": "1101.0.0",
+    "@pnpm/installing.client": "1100.0.6",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/types": "1101.0.0",
+    "@pnpm/installing.deps-restorer": "1101.0.1",
+    "@pnpm/installing.env-installer": "1101.0.1",
+    "@pnpm/resolving.npm-resolver": "1101.0.0",
+    "@pnpm/shell.path": "1100.0.0",
+    "@pnpm/lockfile.types": "1100.0.2",
     "@pnpm/store.controller": "1101.0.0",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.2"
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.2",
+    "@pnpm/store.connection-manager": "1100.0.6"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
@@ -61,11 +61,11 @@
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
     "@pnpm/constants": "1100.0.0",
+    "@pnpm/engine.pm.commands": "1101.1.1",
+    "@pnpm/logger": "1100.0.0",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/engine.pm.commands": "1101.0.2",
-    "@pnpm/testing.mock-agent": "1100.0.1",
     "@pnpm/prepare": "1100.0.3",
-    "@pnpm/logger": "1100.0.0"
+    "@pnpm/testing.mock-agent": "1100.0.1"
   },
   "engines": {
     "node": ">=22.13"