@pnpm/engine.pm.commands 1101.0.1 → 1101.1.0

package/lib/index.d.ts

@@ -1,4 +1,4 @@
 export { selfUpdate } from './self-updater/index.js';
-export { exePlatformPkgDirName, installPnpm, installPnpmToStore, linkExePlatformBinary } from './self-updater/installPnpm.js';
+export { exePlatformPkgDirName, exePlatformPkgDirNameNext, installPnpm, installPnpmToStore, linkExePlatformBinary } from './self-updater/installPnpm.js';
 export { setup } from './setup/index.js';
 export { withCmd } from './with/index.js';

package/lib/index.js

@@ -1,5 +1,5 @@
 export { selfUpdate } from './self-updater/index.js';
-export { exePlatformPkgDirName, installPnpm, installPnpmToStore, linkExePlatformBinary } from './self-updater/installPnpm.js';
+export { exePlatformPkgDirName, exePlatformPkgDirNameNext, installPnpm, installPnpmToStore, linkExePlatformBinary } from './self-updater/installPnpm.js';
 export { setup } from './setup/index.js';
 export { withCmd } from './with/index.js';
 //# sourceMappingURL=index.js.map

package/lib/self-updater/installPnpm.d.ts

@@ -41,9 +41,18 @@ export declare function installPnpmToStore(pnpmVersion: string, opts: {
 }>;
 /**
  * Computes the scope-local directory name of the `@pnpm/exe` platform
- * package for a given host: `exe.<platform>-<arch>[-musl]`. Pure so that the
- * musl branch is unit-testable without mocking detect-libc or patching
- * process.platform.
+ * package for a given host. Returns the legacy name currently published on npm
+ * (`macos-<arch>`, `win-<arch>`, `linux-<arch>`, `linuxstatic-<arch>`); callers
+ * should also consider the future `exe.<platform>-<arch>[-musl]` scheme, since
+ * a later release will switch to it. Pure so that the musl branch is
+ * unit-testable without mocking detect-libc or patching process.platform.
  */
 export declare function exePlatformPkgDirName(platform: NodeJS.Platform, arch: string, libcFamily: string | null): string;
+/**
+ * Future scope-local directory name of the `@pnpm/exe` platform package, under
+ * the `exe.<platform>-<arch>[-musl]` scheme that matches the workspace
+ * directory layout. `linkExePlatformBinary` checks this as a fallback so a
+ * future rename of the published packages works without touching this logic.
+ */
+export declare function exePlatformPkgDirNameNext(platform: NodeJS.Platform, arch: string, libcFamily: string | null): string;
 export declare function linkExePlatformBinary(installDir: string): void;

package/lib/self-updater/installPnpm.js

@@ -230,23 +230,43 @@ async function installFromResolution(installDir, opts, params) {
 }
 /**
  * Computes the scope-local directory name of the `@pnpm/exe` platform
- * package for a given host: `exe.<platform>-<arch>[-musl]`. Pure so that the
- * musl branch is unit-testable without mocking detect-libc or patching
- * process.platform.
+ * package for a given host. Returns the legacy name currently published on npm
+ * (`macos-<arch>`, `win-<arch>`, `linux-<arch>`, `linuxstatic-<arch>`); callers
+ * should also consider the future `exe.<platform>-<arch>[-musl]` scheme, since
+ * a later release will switch to it. Pure so that the musl branch is
+ * unit-testable without mocking detect-libc or patching process.platform.
  */
 export function exePlatformPkgDirName(platform, arch, libcFamily) {
+    const normalizedArch = platform === 'win32' && arch === 'ia32' ? 'x86' : arch;
+    return `${legacyOsSegment(platform, libcFamily)}-${normalizedArch}`;
+}
+function legacyOsSegment(platform, libcFamily) {
+    switch (platform) {
+        case 'darwin': return 'macos';
+        case 'win32': return 'win';
+        case 'linux': return libcFamily === 'musl' ? 'linuxstatic' : 'linux';
+        default: return platform;
+    }
+}
+/**
+ * Future scope-local directory name of the `@pnpm/exe` platform package, under
+ * the `exe.<platform>-<arch>[-musl]` scheme that matches the workspace
+ * directory layout. `linkExePlatformBinary` checks this as a fallback so a
+ * future rename of the published packages works without touching this logic.
+ */
+export function exePlatformPkgDirNameNext(platform, arch, libcFamily) {
     const normalizedArch = platform === 'win32' && arch === 'ia32' ? 'x86' : arch;
     const libcSuffix = platform === 'linux' && libcFamily === 'musl' ? '-musl' : '';
     return `exe.${platform}-${normalizedArch}${libcSuffix}`;
 }
 // @pnpm/exe bundles Node.js via optional platform-specific packages
-// (e.g. @pnpm/exe.darwin-arm64, @pnpm/exe.linux-x64-musl).
-// Its postinstall script links the correct binary into the @pnpm/exe package dir.
-// Since scripts are disabled during install (to support systems without Node.js),
-// we replicate that linking here.
+// (e.g. @pnpm/macos-arm64, @pnpm/linuxstatic-x64; or, after a future rename,
+// @pnpm/exe.darwin-arm64, @pnpm/exe.linux-x64-musl). Its postinstall script
+// links the correct binary into the @pnpm/exe package dir. Since scripts are
+// disabled during install (to support systems without Node.js), we replicate
+// that linking here, checking both naming schemes so self-update works across
+// the rename.
 export function linkExePlatformBinary(installDir) {
-    const platform = process.platform;
-    const pkgDirName = exePlatformPkgDirName(platform, process.arch, familySync());
     const exePkgDir = path.join(installDir, 'node_modules', '@pnpm', 'exe');
     if (!fs.existsSync(exePkgDir))
         return;
@@ -254,10 +274,23 @@ export function linkExePlatformBinary(installDir) {
     // to the top-level node_modules. It's a dependency of @pnpm/exe and lives as a
     // sibling in the virtual store. Resolve through the @pnpm/exe symlink to find it.
     const exeRealDir = fs.realpathSync(exePkgDir);
-    const platformPkgDir = path.join(path.dirname(exeRealDir), pkgDirName);
+    const platform = process.platform;
+    const arch = process.arch;
+    const libcFamily = familySync();
     const executable = platform === 'win32' ? 'pnpm.exe' : 'pnpm';
-    const src = path.join(platformPkgDir, executable);
-    if (!fs.existsSync(src))
+    const candidateDirNames = [
+        exePlatformPkgDirName(platform, arch, libcFamily),
+        exePlatformPkgDirNameNext(platform, arch, libcFamily),
+    ];
+    let src;
+    for (const dirName of candidateDirNames) {
+        const candidate = path.join(path.dirname(exeRealDir), dirName, executable);
+        if (fs.existsSync(candidate)) {
+            src = candidate;
+            break;
+        }
+    }
+    if (src == null)
         return;
     const dest = path.join(exePkgDir, executable);
     forceLink(src, dest);

package/lib/self-updater/selfUpdate.js

@@ -6,7 +6,7 @@ import { 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,6 +60,31 @@ 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);
@@ -94,6 +127,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 +147,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.1",
+  "version": "1101.1.0",
   "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/building.policy": "1100.0.1",
-    "@pnpm/cli.utils": "1101.0.0",
     "@pnpm/bins.linker": "1100.0.2",
     "@pnpm/cli.meta": "1100.0.1",
+    "@pnpm/cli.utils": "1101.0.0",
+    "@pnpm/config.reader": "1101.1.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/deps.graph-hasher": "1100.1.0",
-    "@pnpm/global.commands": "1100.0.3",
+    "@pnpm/global.commands": "1100.0.5",
+    "@pnpm/building.policy": "1100.0.1",
+    "@pnpm/deps.graph-hasher": "1100.1.1",
     "@pnpm/global.packages": "1100.0.1",
-    "@pnpm/config.reader": "1101.1.0",
-    "@pnpm/installing.client": "1100.0.3",
-    "@pnpm/installing.deps-restorer": "1100.0.3",
+    "@pnpm/installing.client": "1100.0.5",
+    "@pnpm/installing.deps-restorer": "1101.0.0",
+    "@pnpm/installing.env-installer": "1101.0.0",
     "@pnpm/lockfile.types": "1100.0.2",
-    "@pnpm/installing.env-installer": "1100.1.1",
+    "@pnpm/resolving.npm-resolver": "1101.0.0",
+    "@pnpm/store.connection-manager": "1100.0.5",
     "@pnpm/shell.path": "1100.0.0",
+    "@pnpm/store.controller": "1101.0.0",
     "@pnpm/types": "1101.0.0",
-    "@pnpm/resolving.npm-resolver": "1100.1.0",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.2",
-    "@pnpm/store.controller": "1100.0.2",
-    "@pnpm/store.connection-manager": "1100.0.3"
+    "@pnpm/workspace.project-manifest-reader": "1100.0.2"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
@@ -60,12 +60,12 @@
     "@types/cross-spawn": "^6.0.6",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "@pnpm/logger": "1100.0.0",
-    "@pnpm/error": "1100.0.0",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/prepare": "1100.0.2",
+    "@pnpm/engine.pm.commands": "1101.1.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/prepare": "1100.0.3",
     "@pnpm/testing.mock-agent": "1100.0.1",
-    "@pnpm/engine.pm.commands": "1101.0.1"
+    "@pnpm/logger": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"