@pnpm/engine.pm.commands 1101.0.0 → 1101.0.2

package/lib/index.d.ts

@@ -1,4 +1,4 @@
 export { selfUpdate } from './self-updater/index.js';
-export { 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 { 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

@@ -39,4 +39,20 @@ export declare function installPnpmToStore(pnpmVersion: string, opts: {
 }): Promise<{
     binDir: string;
 }>;
+/**
+ * Computes the scope-local directory name of the `@pnpm/exe` 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

@@ -9,6 +9,7 @@ import { installGlobalPackages } from '@pnpm/global.commands';
 import { cleanOrphanedInstallDirs, createGlobalCacheKey, createInstallDir, findGlobalPackage, getHashLink, } from '@pnpm/global.packages';
 import { headlessInstall } from '@pnpm/installing.deps-restorer';
 import { registerProject } from '@pnpm/store.controller';
+import { familySync } from 'detect-libc';
 import { symlinkDir } from 'symlink-dir';
 // @pnpm/exe has platform-specific binaries, so its GVS hash must
 // include ENGINE_NAME for correct per-platform resolution.
@@ -227,17 +228,45 @@ async function installFromResolution(installDir, opts, params) {
         allowBuilds: {},
     }, params);
 }
-// @pnpm/exe bundles Node.js via optional platform-specific packages (e.g. @pnpm/macos-arm64).
-// 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.
+/**
+ * Computes the scope-local directory name of the `@pnpm/exe` 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/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 === 'win32'
-        ? 'win'
-        : process.platform === 'darwin'
-            ? 'macos'
-            : process.platform;
-    const arch = platform === 'win' && process.arch === 'ia32' ? 'x86' : process.arch;
     const exePkgDir = path.join(installDir, 'node_modules', '@pnpm', 'exe');
     if (!fs.existsSync(exePkgDir))
         return;
@@ -245,14 +274,27 @@ 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), `${platform}-${arch}`);
-    const executable = platform === 'win' ? 'pnpm.exe' : 'pnpm';
-    const src = path.join(platformPkgDir, executable);
-    if (!fs.existsSync(src))
+    const platform = process.platform;
+    const arch = process.arch;
+    const libcFamily = familySync();
+    const executable = platform === 'win32' ? 'pnpm.exe' : 'pnpm';
+    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);
-    if (platform === 'win') {
+    if (platform === 'win32') {
         const exePkgJsonPath = path.join(exePkgDir, 'package.json');
         const exePkg = JSON.parse(fs.readFileSync(exePkgJsonPath, 'utf8'));
         exePkg.bin.pnpm = 'pnpm.exe';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/engine.pm.commands",
-  "version": "1101.0.0",
+  "version": "1101.0.2",
   "description": "pnpm commands for self-updating and setting up pnpm",
   "keywords": [
     "pnpm",
@@ -26,29 +26,30 @@
   "dependencies": {
     "@pnpm/os.env.path-extender": "^3.0.0",
     "cross-spawn": "^7.0.6",
+    "detect-libc": "^2.0.3",
     "path-name": "^1.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "render-help": "^2.0.0",
     "semver": "^7.7.2",
     "symlink-dir": "^10.0.1",
-    "@pnpm/building.policy": "1100.0.1",
-    "@pnpm/bins.linker": "1100.0.2",
     "@pnpm/cli.meta": "1100.0.1",
+    "@pnpm/bins.linker": "1100.0.2",
+    "@pnpm/building.policy": "1100.0.1",
     "@pnpm/cli.utils": "1101.0.0",
-    "@pnpm/config.reader": "1101.0.0",
-    "@pnpm/deps.graph-hasher": "1100.0.1",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/installing.client": "1100.0.2",
-    "@pnpm/global.commands": "1100.0.2",
+    "@pnpm/deps.graph-hasher": "1100.1.1",
+    "@pnpm/global.commands": "1100.0.4",
     "@pnpm/global.packages": "1100.0.1",
-    "@pnpm/installing.deps-restorer": "1100.0.2",
-    "@pnpm/installing.env-installer": "1100.1.0",
-    "@pnpm/lockfile.types": "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/resolving.npm-resolver": "1100.0.1",
-    "@pnpm/store.connection-manager": "1100.0.2",
-    "@pnpm/store.controller": "1100.0.1",
+    "@pnpm/store.connection-manager": "1100.0.4",
+    "@pnpm/installing.env-installer": "1101.0.0",
+    "@pnpm/resolving.npm-resolver": "1101.0.0",
+    "@pnpm/error": "1100.0.0",
     "@pnpm/types": "1101.0.0",
+    "@pnpm/store.controller": "1101.0.0",
     "@pnpm/workspace.project-manifest-reader": "1100.0.2"
   },
   "peerDependencies": {
@@ -61,10 +62,10 @@
     "@types/semver": "7.7.1",
     "@pnpm/constants": "1100.0.0",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/logger": "1100.0.0",
-    "@pnpm/engine.pm.commands": "1101.0.0",
-    "@pnpm/prepare": "1100.0.1",
-    "@pnpm/testing.mock-agent": "1100.0.1"
+    "@pnpm/engine.pm.commands": "1101.0.2",
+    "@pnpm/testing.mock-agent": "1100.0.1",
+    "@pnpm/prepare": "1100.0.3",
+    "@pnpm/logger": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"