@pnpm/engine.pm.commands 1000.0.0 → 1100.0.0

package/lib/self-updater/installPnpm.js

@@ -2,12 +2,16 @@ import fs from 'node:fs';
 import path from 'node:path';
 import util from 'node:util';
 import { linkBins } from '@pnpm/bins.linker';
+import { createAllowBuildFunction } from '@pnpm/building.policy';
 import { getCurrentPackageName } from '@pnpm/cli.meta';
 import { iterateHashedGraphNodes, iteratePkgMeta, lockfileToDepGraph, } from '@pnpm/deps.graph-hasher';
 import { installGlobalPackages } from '@pnpm/global.commands';
 import { cleanOrphanedInstallDirs, createGlobalCacheKey, createInstallDir, findGlobalPackage, getHashLink, } from '@pnpm/global.packages';
 import { headlessInstall } from '@pnpm/installing.deps-restorer';
-import symlinkDir from 'symlink-dir';
+import { symlinkDir } from 'symlink-dir';
+// @pnpm/exe has platform-specific binaries, so its GVS hash must
+// include ENGINE_NAME for correct per-platform resolution.
+const PNPM_ALLOW_BUILDS = { '@pnpm/exe': true };
 /**
  * Installs pnpm to the global packages directory (for self-update).
  * Creates an entry in globalPkgDir that is visible to `pnpm ls -g`.
@@ -34,7 +38,7 @@ export async function installPnpmToStore(pnpmVersion, opts) {
     const wantedLockfile = buildLockfileFromEnvLockfile(opts.envLockfile, currentPkgName, pnpmVersion);
     const globalVirtualStoreDir = path.join(opts.storeDir, 'links');
     // Compute the GVS hash for the pnpm package to find its path
-    const pnpmGvsPath = findPnpmGvsPath(wantedLockfile, currentPkgName, globalVirtualStoreDir);
+    const pnpmGvsPath = findPnpmGvsPath(wantedLockfile, currentPkgName, globalVirtualStoreDir, PNPM_ALLOW_BUILDS);
     const pnpmPkgDir = path.join(pnpmGvsPath, 'node_modules', currentPkgName);
     const binDir = path.join(pnpmGvsPath, 'bin');
     // Check if already installed in the GVS
@@ -51,6 +55,7 @@ export async function installPnpmToStore(pnpmVersion, opts) {
     try {
         await installFromLockfile(tmpInstallDir, binDir, {
             wantedLockfile,
+            allowBuilds: PNPM_ALLOW_BUILDS,
             storeController: opts.storeController,
             storeDir: opts.storeDir,
             registries: opts.registries,
@@ -70,10 +75,11 @@ export async function installPnpmToStore(pnpmVersion, opts) {
     }
 }
 function noop(_message) { }
-function findPnpmGvsPath(lockfile, pkgName, globalVirtualStoreDir) {
+function findPnpmGvsPath(lockfile, pkgName, globalVirtualStoreDir, allowBuilds) {
     const graph = lockfileToDepGraph(lockfile);
     const pkgMetaIterator = iteratePkgMeta(lockfile, graph);
-    for (const { hash, pkgMeta } of iterateHashedGraphNodes(graph, pkgMetaIterator)) {
+    const allowBuild = createAllowBuildFunction({ allowBuilds });
+    for (const { hash, pkgMeta } of iterateHashedGraphNodes(graph, pkgMetaIterator, allowBuild)) {
         if (pkgMeta.name === pkgName) {
             return path.join(globalVirtualStoreDir, hash);
         }
@@ -110,6 +116,7 @@ async function installPnpmToGlobalDir(opts, pkgName, version, wantedLockfile) {
         if (wantedLockfile != null && opts.storeController != null && opts.storeDir != null) {
             await installFromLockfile(installDir, binDir, {
                 wantedLockfile,
+                allowBuilds: PNPM_ALLOW_BUILDS,
                 storeController: opts.storeController,
                 storeDir: opts.storeDir,
                 registries: opts.registries,
@@ -150,8 +157,8 @@ async function installFromLockfile(installDir, binDir, opts) {
         registries: opts.registries,
         enableGlobalVirtualStore: true,
         globalVirtualStoreDir: path.join(opts.storeDir, 'links'),
+        allowBuilds: opts.allowBuilds,
         ignoreScripts: true,
-        ignoreDepScripts: true,
         force: false,
         engineStrict: false,
         currentEngine: {
@@ -177,7 +184,7 @@ async function installFromLockfile(installDir, binDir, opts) {
         virtualStoreDirMaxLength: opts.virtualStoreDirMaxLength,
         sideEffectsCacheRead: false,
         sideEffectsCacheWrite: false,
-        rawConfig: {},
+        configByUri: {},
         unsafePerm: false,
         userAgent: '',
         packageManager: opts.packageManager ?? { name: 'pnpm', version: '' },
@@ -238,6 +245,18 @@ export function linkExePlatformBinary(installDir) {
     if (!fs.existsSync(src))
         return;
     const dest = path.join(exePkgDir, executable);
+    forceLink(src, dest);
+    if (platform === 'win') {
+        const exePkgJsonPath = path.join(exePkgDir, 'package.json');
+        const exePkg = JSON.parse(fs.readFileSync(exePkgJsonPath, 'utf8'));
+        exePkg.bin.pnpm = 'pnpm.exe';
+        exePkg.bin.pn = 'pn.cmd';
+        exePkg.bin.pnpx = 'pnpx.cmd';
+        exePkg.bin.pnx = 'pnx.cmd';
+        fs.writeFileSync(exePkgJsonPath, JSON.stringify(exePkg, null, 2));
+    }
+}
+function forceLink(src, dest) {
     try {
         fs.unlinkSync(dest);
     }
@@ -248,13 +267,6 @@ export function linkExePlatformBinary(installDir) {
     }
     fs.linkSync(src, dest);
     fs.chmodSync(dest, 0o755);
-    if (platform === 'win') {
-        const exePkgJsonPath = path.join(exePkgDir, 'package.json');
-        const exePkg = JSON.parse(fs.readFileSync(exePkgJsonPath, 'utf8'));
-        fs.writeFileSync(path.join(exePkgDir, 'pnpm'), 'This file intentionally left blank');
-        exePkg.bin.pnpm = 'pnpm.exe';
-        fs.writeFileSync(exePkgJsonPath, JSON.stringify(exePkg, null, 2));
-    }
 }
 function buildLockfileFromEnvLockfile(envLockfile, pkgName, version) {
     const dependencies = {};

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

@@ -1,9 +1,9 @@
-import { type Config } from '@pnpm/config.reader';
+import { type Config, type ConfigContext } from '@pnpm/config.reader';
 import { type CreateStoreControllerOptions } from '@pnpm/store.connection-manager';
 export declare function rcOptionsTypes(): Record<string, unknown>;
 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' | 'rootProjectManifestDir' | 'wantedPackageManager'>;
+export type SelfUpdateCommandOptions = CreateStoreControllerOptions & Pick<Config, 'globalPkgDir' | 'lockfileDir' | 'managePackageManagerVersions' | 'modulesDir' | 'pnpmHomeDir'> & Pick<ConfigContext, 'rootProjectManifestDir' | 'wantedPackageManager'>;
 export declare function handler(opts: SelfUpdateCommandOptions, params: string[]): Promise<undefined | string>;

package/lib/self-updater/selfUpdate.js

@@ -41,7 +41,7 @@ export async function handler(opts, params) {
     if (isExecutedByCorepack()) {
         throw new PnpmError('CANT_SELF_UPDATE_IN_COREPACK', 'You should update pnpm with corepack');
     }
-    const { resolve } = createResolver({ ...opts, authConfig: opts.rawConfig });
+    const { resolve } = createResolver({ ...opts, configByUri: opts.configByUri });
     const pkgName = 'pnpm';
     const bareSpecifier = params[0] ?? 'latest';
     const resolution = await resolve({ alias: pkgName, bareSpecifier }, {
@@ -108,8 +108,8 @@ export async function handler(opts, params) {
         storeController: store.ctrl,
         storeDir: store.dir,
     });
-    // Link bins to pnpmHomeDir so the updated pnpm is the active global binary
-    await linkBins(path.join(baseDir, 'node_modules'), opts.pnpmHomeDir, { warn: globalWarn });
+    // 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 });
     if (alreadyExisted) {
         return `The ${bareSpecifier} version, v${resolution.manifest.version}, is already present on the system. It was activated by linking it from ${baseDir}.`;
     }

package/lib/setup/setup.d.ts

@@ -2,6 +2,7 @@ export declare const rcOptionsTypes: () => Record<string, unknown>;
 export declare const cliOptionsTypes: () => Record<string, unknown>;
 export declare const shorthands: {};
 export declare const commandNames: string[];
+export declare const overridableByScript = true;
 export declare function help(): string;
 export declare function handler(opts: {
     force?: boolean;

package/lib/setup/setup.js

@@ -5,6 +5,7 @@ import { detectIfCurrentPkgIsExecutable, packageManager } from '@pnpm/cli.meta';
 import { docsUrl } from '@pnpm/cli.utils';
 import { logger } from '@pnpm/logger';
 import { addDirToEnvPath, } from '@pnpm/os.env.path-extender';
+import PATH from 'path-name';
 import { renderHelp } from 'render-help';
 export const rcOptionsTypes = () => ({});
 export const cliOptionsTypes = () => ({
@@ -12,6 +13,7 @@ export const cliOptionsTypes = () => ({
 });
 export const shorthands = {};
 export const commandNames = ['setup'];
+export const overridableByScript = true;
 export function help() {
     return renderHelp({
         description: 'Sets up pnpm',
@@ -55,7 +57,7 @@ function installCliGlobally(execPath, pnpmHomeDir) {
         fs.writeFileSync(pkgJsonPath, JSON.stringify({
             name: '@pnpm/exe',
             version: packageManager.version,
-            bin: { pnpm: execName },
+            bin: { pnpm: execName, pn: execName },
         }));
         createdPkgJson = true;
     }
@@ -64,11 +66,13 @@ function installCliGlobally(execPath, pnpmHomeDir) {
         prefix: process.cwd(),
     });
     try {
+        const binDir = path.join(pnpmHomeDir, 'bin');
         const { status, error } = spawnSync(execPath, ['add', '-g', `file:${execDir}`], {
             stdio: 'inherit',
             env: {
                 ...process.env,
                 PNPM_HOME: pnpmHomeDir,
+                [PATH]: `${binDir}${path.delimiter}${process.env[PATH] ?? ''}`,
             },
         });
         if (error)
@@ -83,7 +87,7 @@ function installCliGlobally(execPath, pnpmHomeDir) {
         }
     }
 }
-function createPnpxScripts(targetDir) {
+function createAliasScripts(targetDir) {
     // Why script files instead of aliases?
     // 1. Aliases wouldn't work on all platform, such as Windows Command Prompt or POSIX `sh`.
     // 2. Aliases wouldn't work on all environments, such as non-interactive shells and CI environments.
@@ -91,32 +95,31 @@ function createPnpxScripts(targetDir) {
     // 4. Aliases cannot be located with the `which` or `where` command.
     // 5. Editing rc files is more error-prone than just write new files to the filesystem.
     fs.mkdirSync(targetDir, { recursive: true });
+    createShellScript(targetDir, 'pn', 'pnpm');
+    createShellScript(targetDir, 'pnpx', 'pnpm dlx');
+    createShellScript(targetDir, 'pnx', 'pnpm dlx');
+}
+function createShellScript(targetDir, name, command) {
     // windows can also use shell script via mingw or cygwin so no filter
-    const shellScript = [
-        '#!/bin/sh',
-        'exec pnpm dlx "$@"',
-    ].join('\n');
-    fs.writeFileSync(path.join(targetDir, 'pnpx'), shellScript, { mode: 0o755 });
+    const shellScript = `#!/bin/sh\nexec ${command} "$@"\n`;
+    fs.writeFileSync(path.join(targetDir, name), shellScript, { mode: 0o755 });
     if (process.platform === 'win32') {
-        const batchScript = [
-            '@echo off',
-            'pnpm dlx %*',
-        ].join('\n');
-        fs.writeFileSync(path.join(targetDir, 'pnpx.cmd'), batchScript);
-        const powershellScript = 'pnpm dlx @args';
-        fs.writeFileSync(path.join(targetDir, 'pnpx.ps1'), powershellScript);
+        fs.writeFileSync(path.join(targetDir, `${name}.cmd`), `@echo off\n${command} %*\n`);
+        fs.writeFileSync(path.join(targetDir, `${name}.ps1`), `${command} @args\n`);
     }
 }
 export async function handler(opts) {
     const execPath = getExecPath();
+    const binDir = path.join(opts.pnpmHomeDir, 'bin');
     if (execPath.match(/\.[cm]?js$/) == null) {
         installCliGlobally(execPath, opts.pnpmHomeDir);
-        createPnpxScripts(opts.pnpmHomeDir);
+        createAliasScripts(binDir);
     }
     try {
         const report = await addDirToEnvPath(opts.pnpmHomeDir, {
             configSectionName: 'pnpm',
             proxyVarName: 'PNPM_HOME',
+            proxyVarSubDir: 'bin',
             overwrite: opts.force,
             position: 'start',
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/engine.pm.commands",
-  "version": "1000.0.0",
+  "version": "1100.0.0",
   "description": "pnpm commands for self-updating and setting up pnpm",
   "keywords": [
     "pnpm",
@@ -24,44 +24,46 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/os.env.path-extender": "^2.0.3",
+    "@pnpm/os.env.path-extender": "^3.0.0",
+    "path-name": "^1.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "render-help": "^2.0.0",
     "semver": "^7.7.2",
-    "symlink-dir": "^7.0.0",
-    "@pnpm/bins.linker": "1000.2.6",
-    "@pnpm/cli.meta": "1000.0.11",
-    "@pnpm/deps.graph-hasher": "1002.0.8",
-    "@pnpm/cli.utils": "1001.2.8",
-    "@pnpm/config.reader": "1004.4.2",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/global.packages": "1000.0.0-0",
-    "@pnpm/installing.client": "1001.1.4",
-    "@pnpm/global.commands": "1000.0.0-0",
-    "@pnpm/installing.deps-restorer": "1006.0.0",
-    "@pnpm/lockfile.types": "1002.0.2",
-    "@pnpm/resolving.npm-resolver": "1004.4.1",
-    "@pnpm/installing.env-installer": "1000.0.19",
-    "@pnpm/store.connection-manager": "1002.2.4",
-    "@pnpm/store.controller": "1004.0.0",
-    "@pnpm/types": "1000.9.0",
-    "@pnpm/workspace.project-manifest-reader": "1001.1.4"
+    "symlink-dir": "^10.0.1",
+    "@pnpm/bins.linker": "1100.0.0",
+    "@pnpm/building.policy": "1100.0.0",
+    "@pnpm/cli.meta": "1100.0.0",
+    "@pnpm/cli.utils": "1100.0.0",
+    "@pnpm/config.reader": "1100.0.0",
+    "@pnpm/deps.graph-hasher": "1100.0.0",
+    "@pnpm/global.commands": "1100.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/installing.client": "1100.0.0",
+    "@pnpm/installing.deps-restorer": "1100.0.0",
+    "@pnpm/installing.env-installer": "1100.0.0",
+    "@pnpm/global.packages": "1100.0.0",
+    "@pnpm/lockfile.types": "1100.0.0",
+    "@pnpm/store.connection-manager": "1100.0.0",
+    "@pnpm/types": "1100.0.0",
+    "@pnpm/store.controller": "1100.0.0",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.0",
+    "@pnpm/resolving.npm-resolver": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "30.0.5",
+    "@jest/globals": "30.3.0",
     "@types/cross-spawn": "^6.0.6",
-    "@types/ramda": "0.29.12",
+    "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
     "cross-spawn": "^7.0.6",
-    "nock": "13.3.4",
-    "@pnpm/engine.pm.commands": "1000.0.0",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/logger": "1001.0.1",
-    "@pnpm/prepare": "1000.0.4",
-    "@pnpm/shell.path": "1000.0.0"
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/engine.pm.commands": "1100.0.0",
+    "@pnpm/prepare": "1100.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/shell.path": "1100.0.0",
+    "@pnpm/testing.mock-agent": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"
@@ -71,8 +73,8 @@
   },
   "scripts": {
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
-    "test": "pnpm run compile && pnpm run _test",
-    "compile": "tsgo --build && pnpm run lint --fix",
-    "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
+    "test": "pn compile && pn .test",
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }