@pnpm/engine.pm.commands 1101.1.5 → 1101.1.6

package/lib/self-updater/selfUpdate.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import { linkBins } from '@pnpm/bins.linker';
 import { isExecutedByCorepack, packageManager } from '@pnpm/cli.meta';
@@ -179,11 +180,35 @@ export async function handler(opts, params) {
     });
     // Link bins to pnpmHomeDir/bin so the updated pnpm is the active global binary
     await linkBins(path.join(baseDir, 'node_modules'), path.join(opts.pnpmHomeDir, 'bin'), { warn: globalWarn });
+    // pnpm v10 setup linked bins directly into pnpmHomeDir and added that
+    // directory to PATH (instead of pnpmHomeDir/bin as v11 does). When a v10
+    // user upgrades to v11 the legacy shims at pnpmHomeDir keep pointing into
+    // the old `.tools/<version>` install — so PATH still resolves `pnpm` to the
+    // pre-update version. Detect that case and refresh the legacy shims so the
+    // upgrade actually takes effect, then warn the user to run `pnpm setup`
+    // for a clean migration to the v11 layout. See pnpm/pnpm#11464.
+    if (hasLegacyHomeDirShim(opts.pnpmHomeDir)) {
+        await linkBins(path.join(baseDir, 'node_modules'), opts.pnpmHomeDir, { warn: globalWarn });
+        globalWarn('Detected a pnpm v10 installation layout at PNPM_HOME. The pnpm shims ' +
+            'at PNPM_HOME have been refreshed so the new version is active, but ' +
+            'pnpm v11 expects bins in PNPM_HOME/bin. Run "pnpm setup" to migrate ' +
+            'your PATH to the v11 layout.');
+    }
     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 `Successfully updated pnpm to v${resolution.manifest.version}`;
 }
+// A fresh v11 setup never writes a `pnpm` shim at pnpmHomeDir itself — only
+// under pnpmHomeDir/bin. The presence of a `pnpm` (or `pnpm.cmd`) file
+// directly at pnpmHomeDir is therefore a reliable v10-layout marker.
+function hasLegacyHomeDirShim(pnpmHomeDir) {
+    for (const name of ['pnpm', 'pnpm.cmd']) {
+        if (fs.existsSync(path.join(pnpmHomeDir, name)))
+            return true;
+    }
+    return false;
+}
 /**
  * Returns the updated version constraint for devEngines.packageManager.
  * - Exact versions and simple ranges (^, ~) are updated to the new version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/engine.pm.commands",
-  "version": "1101.1.5",
+  "version": "1101.1.6",
   "description": "pnpm commands for self-updating and setting up pnpm",
   "keywords": [
     "pnpm",
@@ -32,26 +32,26 @@
     "render-help": "^2.0.0",
     "semver": "^7.7.2",
     "symlink-dir": "^10.0.1",
-    "@pnpm/building.policy": "1100.0.2",
-    "@pnpm/bins.linker": "1100.0.3",
-    "@pnpm/cli.meta": "1100.0.2",
-    "@pnpm/cli.utils": "1101.0.2",
-    "@pnpm/deps.graph-hasher": "1100.1.2",
+    "@pnpm/building.policy": "1100.0.3",
+    "@pnpm/config.reader": "1101.2.0",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/global.commands": "1100.0.10",
+    "@pnpm/deps.graph-hasher": "1100.1.2",
+    "@pnpm/bins.linker": "1100.0.3",
     "@pnpm/global.packages": "1100.0.2",
-    "@pnpm/config.reader": "1101.1.4",
-    "@pnpm/installing.client": "1100.0.8",
-    "@pnpm/installing.deps-restorer": "1101.0.4",
+    "@pnpm/installing.deps-restorer": "1101.0.5",
+    "@pnpm/installing.client": "1100.0.9",
+    "@pnpm/global.commands": "1100.0.11",
+    "@pnpm/installing.env-installer": "1101.0.4",
     "@pnpm/lockfile.fs": "1100.0.4",
-    "@pnpm/installing.env-installer": "1101.0.3",
     "@pnpm/lockfile.types": "1100.0.3",
-    "@pnpm/resolving.npm-resolver": "1101.0.1",
-    "@pnpm/store.connection-manager": "1100.0.9",
+    "@pnpm/cli.utils": "1101.0.2",
     "@pnpm/store.controller": "1101.0.2",
+    "@pnpm/resolving.npm-resolver": "1101.0.1",
+    "@pnpm/store.connection-manager": "1100.0.10",
+    "@pnpm/cli.meta": "1100.0.2",
+    "@pnpm/types": "1101.0.0",
     "@pnpm/workspace.project-manifest-reader": "1100.0.3",
-    "@pnpm/shell.path": "1100.0.1",
-    "@pnpm/types": "1101.0.0"
+    "@pnpm/shell.path": "1100.0.1"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
@@ -61,10 +61,10 @@
     "@types/cross-spawn": "^6.0.6",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "@pnpm/engine.pm.commands": "1101.1.5",
-    "@pnpm/constants": "1100.0.0",
     "@pnpm/error": "1100.0.0",
+    "@pnpm/constants": "1100.0.0",
     "@pnpm/logger": "1100.0.0",
+    "@pnpm/engine.pm.commands": "1101.1.6",
     "@pnpm/prepare": "1100.0.4",
     "@pnpm/testing.mock-agent": "1100.0.2"
   },