@pnpm/engine.pm.commands 1100.0.1 → 1101.0.1

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export { selfUpdate } from './self-updater/index.js';
-export { installPnpm, installPnpmToStore, linkExePlatformBinary } from './self-updater/installPnpm.js';
+export { exePlatformPkgDirName, 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,4 +1,5 @@
 export { selfUpdate } from './self-updater/index.js';
-export { installPnpm, installPnpmToStore, linkExePlatformBinary } from './self-updater/installPnpm.js';
+export { exePlatformPkgDirName, 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,11 @@ 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: `exe.<platform>-<arch>[-musl]`. 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;
 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,25 @@ async function installFromResolution(installDir, opts, params) {
         allowBuilds: {},
     }, params);
 }
-// @pnpm/exe bundles Node.js via optional platform-specific packages (e.g. @pnpm/macos-arm64).
+/**
+ * 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.
+ */
+export function exePlatformPkgDirName(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.
 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 platform = process.platform;
+    const pkgDirName = exePlatformPkgDirName(platform, process.arch, familySync());
     const exePkgDir = path.join(installDir, 'node_modules', '@pnpm', 'exe');
     if (!fs.existsSync(exePkgDir))
         return;
@@ -245,14 +254,14 @@ 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 platformPkgDir = path.join(path.dirname(exeRealDir), pkgDirName);
+    const executable = platform === 'win32' ? 'pnpm.exe' : 'pnpm';
     const src = path.join(platformPkgDir, executable);
     if (!fs.existsSync(src))
         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/lib/self-updater/selfUpdate.d.ts

@@ -5,5 +5,5 @@ export declare function cliOptionsTypes(): Record<string, unknown>;
 export declare const commandNames: string[];
 export declare const skipPackageManagerCheck = true;
 export declare function help(): string;
-export type SelfUpdateCommandOptions = CreateStoreControllerOptions & Pick<Config, 'globalPkgDir' | 'lockfileDir' | 'managePackageManagerVersions' | 'modulesDir' | 'pnpmHomeDir'> & Pick<ConfigContext, 'rootProjectManifestDir' | 'wantedPackageManager'>;
+export type SelfUpdateCommandOptions = CreateStoreControllerOptions & Pick<Config, 'globalPkgDir' | 'lockfileDir' | 'modulesDir' | 'pnpmHomeDir'> & Pick<ConfigContext, 'rootProjectManifestDir' | 'wantedPackageManager'>;
 export declare function handler(opts: SelfUpdateCommandOptions, params: string[]): Promise<undefined | string>;

package/lib/with/index.d.ts

@@ -0,0 +1,2 @@
+import * as withCmd from './with.js';
+export { withCmd };

package/lib/with/index.js

@@ -0,0 +1,3 @@
+import * as withCmd from './with.js';
+export { withCmd };
+//# sourceMappingURL=index.js.map

package/lib/with/with.d.ts

@@ -0,0 +1,11 @@
+import { type Config, type ConfigContext } from '@pnpm/config.reader';
+import { type CreateStoreControllerOptions } from '@pnpm/store.connection-manager';
+export declare const commandNames: string[];
+export declare const skipPackageManagerCheck = true;
+export declare const rcOptionsTypes: typeof cliOptionsTypes;
+export declare function cliOptionsTypes(): Record<string, unknown>;
+export declare function help(): string;
+export type WithCommandOptions = CreateStoreControllerOptions & Pick<Config, 'dir' | 'lockfileDir' | 'pnpmHomeDir' | 'virtualStoreDirMaxLength'> & Pick<ConfigContext, 'rootProjectManifestDir'>;
+export declare function handler(opts: WithCommandOptions, params: string[]): Promise<{
+    exitCode: number;
+}>;

package/lib/with/with.js

@@ -0,0 +1,101 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { isExecutedByCorepack, packageManager } from '@pnpm/cli.meta';
+import { docsUrl } from '@pnpm/cli.utils';
+import { types as allTypes } from '@pnpm/config.reader';
+import { PnpmError } from '@pnpm/error';
+import { resolvePackageManagerIntegrities } from '@pnpm/installing.env-installer';
+import { prependDirsToPath } from '@pnpm/shell.path';
+import { createStoreController } from '@pnpm/store.connection-manager';
+import crossSpawn from 'cross-spawn';
+import { pick } from 'ramda';
+import { renderHelp } from 'render-help';
+import { installPnpmToStore } from '../self-updater/installPnpm.js';
+export const commandNames = ['with'];
+export const skipPackageManagerCheck = true;
+export const rcOptionsTypes = cliOptionsTypes;
+export function cliOptionsTypes() {
+    return pick([], allTypes);
+}
+export function help() {
+    return renderHelp({
+        description: 'Run pnpm with a specific version (or the currently running one), ignoring the "packageManager" and "devEngines.packageManager" fields of the project manifest.',
+        descriptionLists: [],
+        url: docsUrl('with'),
+        usages: [
+            'pnpm with current <pnpm args>',
+            'pnpm with <version> <pnpm args>',
+            'pnpm with next install',
+            'pnpm with 10 install',
+        ],
+    });
+}
+export async function handler(opts, params) {
+    if (params.length === 0) {
+        throw new PnpmError('MISSING_WITH_SPEC', 'Missing version argument. Usage: pnpm with <version|current> <args...>');
+    }
+    if (isExecutedByCorepack()) {
+        throw new PnpmError('CANT_USE_WITH_IN_COREPACK', 'The "pnpm with" command does not work under corepack');
+    }
+    // `with current` is handled earlier in parseCliArgs.ts, which re-parses it
+    // for in-process execution, so this handler only ever sees version/dist-tag specs.
+    const [spec, ...args] = params;
+    fs.mkdirSync(opts.pnpmHomeDir, { recursive: true });
+    const store = await createStoreController(opts);
+    let binDir;
+    try {
+        // resolvePackageManagerIntegrities resolves ranges/dist-tags via the
+        // registry and writes the resolved exact version to the envLockfile.
+        const envLockfile = await resolvePackageManagerIntegrities(spec, {
+            rootDir: opts.pnpmHomeDir,
+            registries: opts.registries,
+            storeController: store.ctrl,
+            storeDir: store.dir,
+        });
+        const resolvedVersion = envLockfile.importers['.'].packageManagerDependencies?.['pnpm']?.version;
+        if (!resolvedVersion) {
+            throw new PnpmError('CANNOT_RESOLVE_PNPM', `Cannot resolve pnpm version for "${spec}"`);
+        }
+        ;
+        ({ binDir } = await installPnpmToStore(resolvedVersion, {
+            envLockfile,
+            storeController: store.ctrl,
+            storeDir: store.dir,
+            registries: opts.registries,
+            virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
+            packageManager: { name: packageManager.name, version: packageManager.version },
+        }));
+    }
+    finally {
+        await store.ctrl.close();
+    }
+    // The child pnpm must skip the packageManager/devEngines check so the requested
+    // version stays active. Two keys are set for backward compatibility:
+    //   - `COREPACK_ROOT` is honored by every pnpm release that supports corepack
+    //     (older versions skip the pm check whenever this is set).
+    //   - `pnpm_config_pm_on_fail=ignore` is the principled override recognized
+    //     by pnpm releases that ship the `pmOnFail` setting.
+    const pnpmEnv = prependDirsToPath([binDir]);
+    const spawnEnv = {
+        ...process.env,
+        [pnpmEnv.name]: pnpmEnv.value,
+        COREPACK_ROOT: process.env.COREPACK_ROOT ?? 'pnpm-with',
+        pnpm_config_pm_on_fail: 'ignore',
+    };
+    const pnpmBinPath = path.join(binDir, 'pnpm');
+    const { status, signal, error } = crossSpawn.sync(pnpmBinPath, args, {
+        stdio: 'inherit',
+        env: spawnEnv,
+    });
+    if (error)
+        throw error;
+    if (signal) {
+        // Best-effort: try to terminate with the same signal the child received.
+        // If the signal is handled or ignored, fall back to a non-zero exit code
+        // so the caller doesn't mistake an interrupted run for a successful one.
+        process.kill(process.pid, signal);
+        return { exitCode: 1 };
+    }
+    return { exitCode: status ?? 0 };
+}
+//# sourceMappingURL=with.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/engine.pm.commands",
-  "version": "1100.0.1",
+  "version": "1101.0.1",
   "description": "pnpm commands for self-updating and setting up pnpm",
   "keywords": [
     "pnpm",
@@ -25,29 +25,32 @@
   ],
   "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/bins.linker": "1100.0.1",
     "@pnpm/building.policy": "1100.0.1",
-    "@pnpm/config.reader": "1100.0.1",
+    "@pnpm/cli.utils": "1101.0.0",
+    "@pnpm/bins.linker": "1100.0.2",
     "@pnpm/cli.meta": "1100.0.1",
-    "@pnpm/cli.utils": "1100.0.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/deps.graph-hasher": "1100.0.1",
-    "@pnpm/global.commands": "1100.0.1",
+    "@pnpm/deps.graph-hasher": "1100.1.0",
+    "@pnpm/global.commands": "1100.0.3",
     "@pnpm/global.packages": "1100.0.1",
-    "@pnpm/installing.client": "1100.0.1",
-    "@pnpm/installing.env-installer": "1100.0.1",
-    "@pnpm/installing.deps-restorer": "1100.0.1",
-    "@pnpm/lockfile.types": "1100.0.1",
-    "@pnpm/store.connection-manager": "1100.0.1",
-    "@pnpm/resolving.npm-resolver": "1100.0.1",
+    "@pnpm/config.reader": "1101.1.0",
+    "@pnpm/installing.client": "1100.0.3",
+    "@pnpm/installing.deps-restorer": "1100.0.3",
+    "@pnpm/lockfile.types": "1100.0.2",
+    "@pnpm/installing.env-installer": "1100.1.1",
+    "@pnpm/shell.path": "1100.0.0",
     "@pnpm/types": "1101.0.0",
-    "@pnpm/store.controller": "1100.0.1",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.1"
+    "@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"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
@@ -57,14 +60,12 @@
     "@types/cross-spawn": "^6.0.6",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "cross-spawn": "^7.0.6",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/error": "1100.0.0",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.1",
-    "@pnpm/engine.pm.commands": "1100.0.1",
-    "@pnpm/shell.path": "1100.0.0",
-    "@pnpm/testing.mock-agent": "1100.0.1"
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/prepare": "1100.0.2",
+    "@pnpm/testing.mock-agent": "1100.0.1",
+    "@pnpm/engine.pm.commands": "1101.0.1"
   },
   "engines": {
     "node": ">=22.13"