@pnpm/releasing.commands 1100.0.2 → 1100.1.0

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export { deploy } from './deploy/index.js';
+export { packApp } from './pack-app/index.js';
 export { pack, publish } from './publish/index.js';
 export { version } from './version/index.js';

package/lib/index.js

@@ -1,4 +1,5 @@
 export { deploy } from './deploy/index.js';
+export { packApp } from './pack-app/index.js';
 export { pack, publish } from './publish/index.js';
 export { version } from './version/index.js';
 //# sourceMappingURL=index.js.map

package/lib/pack-app/index.d.ts

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

package/lib/pack-app/index.js

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

package/lib/pack-app/packApp.d.ts

@@ -0,0 +1,22 @@
+import type { Config } from '@pnpm/config.reader';
+export declare const commandNames: string[];
+export declare function rcOptionsTypes(): Record<string, unknown>;
+export declare function cliOptionsTypes(): Record<string, unknown>;
+export declare const shorthands: Record<string, string>;
+export declare function help(): string;
+export type PackAppOptions = Pick<Config, 'dir' | 'pnpmHomeDir'> & Partial<Pick<Config, 'ca' | 'cert' | 'configByUri' | 'httpProxy' | 'httpsProxy' | 'key' | 'localAddress' | 'nodeDownloadMirrors' | 'noProxy' | 'strictSsl' | 'userAgent'>> & {
+    entry?: string;
+    target?: string | string[];
+    nodeVersion?: string;
+    outputDir?: string;
+    outputName?: string;
+};
+export declare function handler(opts: PackAppOptions, params: string[]): Promise<string>;
+/** Fields pack-app reads from `pnpm.app` in package.json. */
+export interface ProjectAppConfig {
+    entry?: string;
+    targets?: string[];
+    nodeVersion?: string;
+    outputDir?: string;
+    outputName?: string;
+}

package/lib/pack-app/packApp.js

@@ -0,0 +1,398 @@
+import fs from 'node:fs';
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { docsUrl } from '@pnpm/cli.utils';
+import { getNodeMirror, parseNodeSpecifier, resolveNodeVersion, } from '@pnpm/engine.runtime.node-resolver';
+import { PnpmError } from '@pnpm/error';
+import { runPnpmCli } from '@pnpm/exec.pnpm-cli-runner';
+import { createFetchFromRegistry } from '@pnpm/network.fetch';
+import { familySync } from 'detect-libc';
+import { safeExeca as execa } from 'execa';
+import { renderHelp } from 'render-help';
+/** Minimum Node.js version that supports `node --build-sea`. */
+const MIN_BUILDER_VERSION = { major: 25, minor: 5 };
+// Range to download when the running Node is too old. Constrained to the
+// current major so we don't silently jump majors across releases, and pinned
+// above MIN_BUILDER_VERSION.minor so older point releases (e.g. 25.0.x) that
+// don't support `--build-sea` aren't picked.
+const DEFAULT_BUILDER_SPEC = `>=${MIN_BUILDER_VERSION.major}.${MIN_BUILDER_VERSION.minor}.0 <${MIN_BUILDER_VERSION.major + 1}.0.0`;
+// Target OS names match `process.platform`. That keeps the CLI surface
+// consistent with pnpm's own `--os` flag (which also takes platform constants)
+// and with `supportedArchitectures.os` in pnpm-workspace.yaml.
+const SUPPORTED_OS = ['linux', 'darwin', 'win32'];
+const SUPPORTED_TARGETS = 'linux-x64, linux-x64-musl, linux-arm64, linux-arm64-musl, darwin-x64, darwin-arm64, win32-x64, win32-arm64';
+export const commandNames = ['pack-app'];
+export function rcOptionsTypes() {
+    return {};
+}
+export function cliOptionsTypes() {
+    return {
+        entry: String,
+        target: [String, Array],
+        'node-version': String,
+        'output-dir': String,
+        'output-name': String,
+    };
+}
+export const shorthands = {
+    t: '--target',
+    o: '--output-dir',
+};
+export function help() {
+    return renderHelp({
+        description: 'Pack a CommonJS entry file into a standalone executable for one or more target platforms.\n\n' +
+            'The executable embeds a Node.js binary via the Node.js Single Executable Applications API.\n' +
+            `Requires Node.js v${MIN_BUILDER_VERSION.major}.${MIN_BUILDER_VERSION.minor}+ to perform ` +
+            'the injection. The running Node.js is used when it is new enough; otherwise, the ' +
+            `latest Node.js v${MIN_BUILDER_VERSION.major}.${MIN_BUILDER_VERSION.minor}+ in the ` +
+            `v${MIN_BUILDER_VERSION.major}.x line is downloaded automatically.\n\n` +
+            'Defaults for --entry, --target, --node-version, --output-dir, and --output-name can be ' +
+            'set in the package.json under "pnpm.app". CLI flags override the config; --target entirely ' +
+            'replaces the configured list so you can narrow it at invocation time.',
+        url: docsUrl('pack-app'),
+        usages: [
+            'pnpm pack-app --entry dist/index.cjs --target linux-x64 --target win32-x64',
+            'pnpm pack-app --entry dist/index.cjs --target linux-x64-musl --node-version 22',
+        ],
+        descriptionLists: [
+            {
+                title: 'Options',
+                list: [
+                    {
+                        description: 'Path to the CJS entry file to embed in the executable',
+                        name: '--entry',
+                    },
+                    {
+                        description: `Target to build for. May be specified multiple times. Supported: ${SUPPORTED_TARGETS}`,
+                        name: '--target',
+                        shortAlias: '-t',
+                    },
+                    {
+                        description: 'Node.js version to embed in the output executables (e.g. "22", "22.0.0", "lts"). ' +
+                            'Defaults to the running Node.js version.',
+                        name: '--node-version',
+                    },
+                    {
+                        description: 'Output directory for the built executables. Defaults to "dist-app".',
+                        name: '--output-dir',
+                        shortAlias: '-o',
+                    },
+                    {
+                        description: 'Name for the output executable (without extension). Defaults to the unscoped package name.',
+                        name: '--output-name',
+                    },
+                ],
+            },
+        ],
+    });
+}
+export async function handler(opts, params) {
+    // pnpm.app in package.json supplies defaults for every flag. CLI flags win,
+    // but `--target` entirely replaces the config list (additive merging would
+    // prevent narrowing from the CLI). See ProjectAppConfig below for the shape.
+    const project = await readProjectAppConfig(opts.dir);
+    const entryPath = opts.entry ?? params[0] ?? project.app?.entry;
+    if (!entryPath) {
+        throw new PnpmError('PACK_APP_MISSING_ENTRY', '"pnpm pack-app" requires a CJS entry file — pass --entry <path> or set "pnpm.app.entry" in package.json.');
+    }
+    const resolvedEntry = path.resolve(opts.dir, entryPath);
+    let entryStat;
+    try {
+        entryStat = fs.statSync(resolvedEntry);
+    }
+    catch {
+        throw new PnpmError('PACK_APP_ENTRY_NOT_FOUND', `Entry file not found: ${resolvedEntry}`);
+    }
+    if (!entryStat.isFile()) {
+        throw new PnpmError('PACK_APP_ENTRY_NOT_FILE', `Entry path must be a regular file: ${resolvedEntry}`);
+    }
+    const cliTargets = opts.target == null
+        ? undefined
+        : Array.isArray(opts.target) ? opts.target : [opts.target];
+    const rawTargets = cliTargets ?? project.app?.targets ?? [];
+    if (rawTargets.length === 0) {
+        throw new PnpmError('PACK_APP_MISSING_TARGET', `"pnpm pack-app" requires at least one target — pass --target <triplet> or set "pnpm.app.targets" in package.json. Supported: ${SUPPORTED_TARGETS}`);
+    }
+    const targets = rawTargets.map(parseTarget);
+    const outputDir = path.resolve(opts.dir, opts.outputDir ?? project.app?.outputDir ?? 'dist-app');
+    await mkdir(outputDir, { recursive: true });
+    const outputName = validateOutputName(opts.outputName ?? project.app?.outputName ?? deriveOutputNameFromPackage(project, opts.dir));
+    const requestedNodeSpec = opts.nodeVersion ?? project.app?.nodeVersion ?? process.version.slice(1);
+    const fetch = createFetchFromRegistry(opts);
+    const buildRoot = path.join(opts.pnpmHomeDir, 'pack-app');
+    const builderBin = await resolveBuilderBinary({ fetch, nodeDownloadMirrors: opts.nodeDownloadMirrors, buildRoot });
+    const resolvedTargetVersion = await resolveVersion(fetch, requestedNodeSpec, opts.nodeDownloadMirrors);
+    const results = [];
+    for (const target of targets) {
+        // eslint-disable-next-line no-await-in-loop
+        const embeddedNodeBin = await ensureNodeRuntime({
+            buildRoot,
+            version: resolvedTargetVersion,
+            platform: target.platform,
+            arch: target.arch,
+            libc: target.libc,
+        });
+        const targetOutputDir = path.join(outputDir, target.raw);
+        // eslint-disable-next-line no-await-in-loop
+        await mkdir(targetOutputDir, { recursive: true });
+        const outputFile = target.platform === 'win32'
+            ? path.join(targetOutputDir, `${outputName}.exe`)
+            : path.join(targetOutputDir, outputName);
+        const seaConfig = {
+            main: resolvedEntry,
+            output: outputFile,
+            executable: embeddedNodeBin,
+            disableExperimentalSEAWarning: true,
+            useCodeCache: false,
+            useSnapshot: false,
+        };
+        // Write the SEA config into a fresh, unpredictable temp directory (0700
+        // by default) rather than a predictable path under os.tmpdir(). Avoids
+        // TOCTOU/symlink attacks on multi-user systems.
+        // eslint-disable-next-line no-await-in-loop
+        const tmpConfigDir = await mkdtemp(path.join(os.tmpdir(), 'pnpm-pack-app-'));
+        const configPath = path.join(tmpConfigDir, 'sea-config.json');
+        // eslint-disable-next-line no-await-in-loop
+        await writeFile(configPath, JSON.stringify(seaConfig, null, 2), { flag: 'wx' });
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            await execa(builderBin, ['--build-sea', configPath], { stdio: 'inherit' });
+        }
+        finally {
+            // eslint-disable-next-line no-await-in-loop
+            await rm(tmpConfigDir, { recursive: true, force: true }).catch(() => { });
+        }
+        // eslint-disable-next-line no-await-in-loop
+        await adHocSignMacBinary(target, outputFile);
+        results.push(`  ${target.raw}: ${outputFile} (Node.js ${resolvedTargetVersion})`);
+    }
+    return `Built ${targets.length} executable${targets.length === 1 ? '' : 's'}:\n${results.join('\n')}`;
+}
+/**
+ * Returns a Node.js binary that supports `--build-sea`. Prefers the running
+ * interpreter to avoid a download; falls back to downloading Node.js v25.
+ */
+async function resolveBuilderBinary(ctx) {
+    if (runningNodeCanBuildSea()) {
+        return process.execPath;
+    }
+    const version = await resolveVersion(ctx.fetch, DEFAULT_BUILDER_SPEC, ctx.nodeDownloadMirrors);
+    return ensureNodeRuntime({
+        buildRoot: ctx.buildRoot,
+        version,
+        platform: process.platform,
+        arch: process.arch,
+        // Pin libc to the host's. Otherwise a caller that had set
+        // supportedArchitectures.libc=musl in their config would cause the
+        // glibc host to download a musl Node that it cannot execute.
+        libc: hostLinuxLibc(),
+    });
+}
+function hostLinuxLibc() {
+    if (process.platform !== 'linux')
+        return undefined;
+    const family = familySync();
+    return family === 'musl' ? 'musl' : 'glibc';
+}
+function runningNodeCanBuildSea() {
+    const [majorStr, minorStr] = process.version.slice(1).split('.');
+    const major = Number(majorStr);
+    const minor = Number(minorStr);
+    return (major > MIN_BUILDER_VERSION.major ||
+        (major === MIN_BUILDER_VERSION.major && minor >= MIN_BUILDER_VERSION.minor));
+}
+/**
+ * Fetches a Node.js runtime into a dedicated per-target directory under the
+ * pnpm home, reusing the cached binary if already present. Actual files are
+ * hardlinked from pnpm's content-addressable store, so repeated calls are
+ * cheap and `pnpm store prune` can reclaim them.
+ */
+async function ensureNodeRuntime(opts) {
+    // Linux variants always need a libc pin (glibc or musl) so that variant
+    // selection is deterministic and doesn't depend on the host's detected
+    // libc or the user's supportedArchitectures.libc config.
+    const libc = opts.platform === 'linux' ? opts.libc ?? 'glibc' : opts.libc;
+    const targetId = [opts.platform, opts.arch, libc].filter(Boolean).join('-');
+    const installDir = path.join(opts.buildRoot, `${targetId}-${opts.version}`);
+    const nodeDir = path.join(installDir, 'node_modules', 'node');
+    const binaryPath = nodeBinaryPath(nodeDir, opts.platform);
+    if (fs.existsSync(binaryPath))
+        return binaryPath;
+    await mkdir(installDir, { recursive: true });
+    await writeFile(path.join(installDir, 'package.json'), `${JSON.stringify({ name: `pnpm-pack-app-${targetId}`, private: true }, null, 2)}\n`);
+    // Flags that select the target variant must come before the positional
+    // package spec; otherwise `pnpm add` silently installs the host variant.
+    const args = [
+        'add',
+        '--ignore-scripts',
+        '--ignore-workspace',
+        `--os=${opts.platform}`,
+        `--cpu=${opts.arch}`,
+    ];
+    if (libc != null) {
+        args.push(`--libc=${libc}`);
+    }
+    args.push(`node@runtime:${opts.version}`);
+    runPnpmCli(args, { cwd: installDir });
+    if (!fs.existsSync(binaryPath)) {
+        throw new PnpmError('PACK_APP_NODE_BINARY_MISSING', `Expected Node.js binary at ${binaryPath} after installing node@runtime:${opts.version}, but it was not found.`);
+    }
+    return binaryPath;
+}
+function nodeBinaryPath(nodeDir, platform) {
+    return platform === 'win32'
+        ? path.join(nodeDir, 'node.exe')
+        : path.join(nodeDir, 'bin', 'node');
+}
+async function resolveVersion(fetch, specifier, nodeDownloadMirrors) {
+    const { releaseChannel, versionSpecifier } = parseNodeSpecifier(specifier);
+    const nodeMirrorBaseUrl = getNodeMirror(nodeDownloadMirrors, releaseChannel);
+    const version = await resolveNodeVersion(fetch, versionSpecifier, nodeMirrorBaseUrl);
+    if (!version) {
+        throw new PnpmError('PACK_APP_NODE_VERSION_NOT_FOUND', `Could not find a Node.js version that satisfies "${specifier}"`);
+    }
+    return version;
+}
+// Parsed triplet must match this shape exactly. We anchor and constrain each
+// segment so that inputs like `linux-x64-musl-../../outside` are rejected
+// outright — otherwise `target.raw` would later flow into path.join for the
+// output directory and could escape it.
+const TARGET_PATTERN = /^(linux|darwin|win32)-(x64|arm64)(?:-(musl))?$/;
+function parseTarget(raw) {
+    const match = TARGET_PATTERN.exec(raw);
+    if (!match) {
+        throw new PnpmError('PACK_APP_INVALID_TARGET', `Invalid target: "${raw}". Expected format: <os>-<arch>[-<libc>] where <os> is ${SUPPORTED_OS.join('|')}, <arch> is x64|arm64, optional <libc> is musl (linux only).`);
+    }
+    const [, platform, arch, libc] = match;
+    if (libc === 'musl' && platform !== 'linux') {
+        throw new PnpmError('PACK_APP_INVALID_TARGET', `The "musl" libc suffix is only valid for linux targets (got "${raw}").`);
+    }
+    return { raw, platform, arch, libc: libc || undefined };
+}
+// Characters that Win32 rejects in filenames, plus NUL. Path separators are
+// checked separately via `path.basename` so the message is crisp.
+const INVALID_FILENAME_CHARS = /[<>:"|?*\0]/;
+// Win32 reserved device names (case-insensitive, with or without an extension).
+const RESERVED_WINDOWS_NAME = /^(?:con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\..*)?$/i;
+// Reject anything that would let the output escape its target directory, or
+// that would fail filesystem-level validation on any supported host. This
+// surfaces problems at `pack-app` invocation time instead of letting them
+// blow up later in `writeFile(outputFile, …)`.
+function validateOutputName(name) {
+    if (name !== path.basename(name) ||
+        name === '' || name === '.' || name === '..' ||
+        name.includes('/') || name.includes('\\') ||
+        INVALID_FILENAME_CHARS.test(name) ||
+        RESERVED_WINDOWS_NAME.test(name) ||
+        /[. ]$/.test(name)) {
+        throw new PnpmError('PACK_APP_INVALID_OUTPUT_NAME', `Invalid --output-name "${name}". The name must be a plain filename without path separators, Windows-reserved names (e.g. CON, NUL), characters like <>:"|?* or NUL, and must not end in a dot or space.`);
+    }
+    return name;
+}
+// A narrow reader just for this command. Using readProjectManifest from
+// @pnpm/cli.utils would pull in the installable/engine checks, which are
+// irrelevant here: pack-app doesn't need the current project to be installable
+// under the running Node, just to have a package.json with optional settings.
+async function readProjectAppConfig(dir) {
+    let raw;
+    try {
+        raw = await readFile(path.join(dir, 'package.json'), 'utf8');
+    }
+    catch {
+        return {};
+    }
+    let manifest;
+    try {
+        manifest = JSON.parse(raw);
+    }
+    catch (err) {
+        throw new PnpmError('PACK_APP_INVALID_PACKAGE_JSON', `Failed to parse ${path.join(dir, 'package.json')}: ${err.message}`);
+    }
+    if (!isObject(manifest))
+        return {};
+    const name = typeof manifest.name === 'string' && manifest.name !== '' ? manifest.name : undefined;
+    const pnpmField = isObject(manifest.pnpm) ? manifest.pnpm : undefined;
+    const appField = pnpmField && isObject(pnpmField.app) ? pnpmField.app : undefined;
+    if (!appField)
+        return { name };
+    return { name, app: validateAppConfig(appField) };
+}
+function validateAppConfig(raw) {
+    const known = new Set(['entry', 'targets', 'nodeVersion', 'outputDir', 'outputName']);
+    for (const key of Object.keys(raw)) {
+        if (!known.has(key)) {
+            throw new PnpmError('PACK_APP_INVALID_CONFIG', `Unknown "pnpm.app.${key}" setting in package.json. Allowed keys: ${Array.from(known).join(', ')}.`);
+        }
+    }
+    const config = {};
+    if (raw.entry != null) {
+        if (typeof raw.entry !== 'string') {
+            throw new PnpmError('PACK_APP_INVALID_CONFIG', '"pnpm.app.entry" must be a string.');
+        }
+        config.entry = raw.entry;
+    }
+    if (raw.targets != null) {
+        if (!Array.isArray(raw.targets) || !raw.targets.every((t) => typeof t === 'string')) {
+            throw new PnpmError('PACK_APP_INVALID_CONFIG', '"pnpm.app.targets" must be an array of strings.');
+        }
+        config.targets = raw.targets;
+    }
+    if (raw.nodeVersion != null) {
+        if (typeof raw.nodeVersion !== 'string') {
+            throw new PnpmError('PACK_APP_INVALID_CONFIG', '"pnpm.app.nodeVersion" must be a string.');
+        }
+        config.nodeVersion = raw.nodeVersion;
+    }
+    if (raw.outputDir != null) {
+        if (typeof raw.outputDir !== 'string') {
+            throw new PnpmError('PACK_APP_INVALID_CONFIG', '"pnpm.app.outputDir" must be a string.');
+        }
+        config.outputDir = raw.outputDir;
+    }
+    if (raw.outputName != null) {
+        if (typeof raw.outputName !== 'string') {
+            throw new PnpmError('PACK_APP_INVALID_CONFIG', '"pnpm.app.outputName" must be a string.');
+        }
+        config.outputName = raw.outputName;
+    }
+    return config;
+}
+function deriveOutputNameFromPackage(project, dir) {
+    if (!project.name) {
+        throw new PnpmError('PACK_APP_NO_OUTPUT_NAME', `Could not determine the output name: package.json in ${dir} has no "name" field.`, { hint: 'Pass --output-name <name> or set "pnpm.app.outputName" in package.json.' });
+    }
+    // Strip @scope/ prefix from scoped packages so the binary name is a plain
+    // filename instead of "scope/name". The second validateOutputName() pass
+    // downstream rejects any leftover path separators.
+    return project.name.replace(/^@[^/]+\//, '');
+}
+function isObject(value) {
+    return value != null && typeof value === 'object' && !Array.isArray(value);
+}
+/**
+ * SEA injection invalidates the existing code signature on macOS binaries, so
+ * the output must be re-signed. Native macOS hosts use `codesign`; Linux hosts
+ * cross-signing a darwin target use `ldid`. Windows hosts have no readily
+ * available ad-hoc signer, so we refuse to produce an unsigned output silently
+ * and tell the user to re-sign on macOS or Linux.
+ */
+async function adHocSignMacBinary(target, outputFile) {
+    if (target.platform !== 'darwin')
+        return;
+    if (process.platform === 'darwin') {
+        await execa('codesign', ['--sign', '-', outputFile], { stdio: 'inherit' });
+        return;
+    }
+    if (process.platform === 'linux') {
+        try {
+            await execa('ldid', ['-S', outputFile], { stdio: 'inherit' });
+        }
+        catch {
+            throw new PnpmError('PACK_APP_MACOS_SIGN_FAILED', `Cross-compiled macOS binary at ${outputFile} could not be ad-hoc signed with "ldid".`, { hint: 'Install ldid (https://github.com/ProcursusTeam/ldid) or re-sign the binary on macOS with "codesign --sign - <file>".' });
+        }
+        return;
+    }
+    throw new PnpmError('PACK_APP_MACOS_SIGN_UNSUPPORTED_HOST', `Cannot ad-hoc sign the macOS binary at ${outputFile} on a ${process.platform} host.`, { hint: 'Build macOS targets on a macOS or Linux host, or re-sign the produced binary yourself with "codesign --sign -" on macOS.' });
+}
+//# sourceMappingURL=packApp.js.map

package/lib/version/index.d.ts

@@ -5,14 +5,15 @@ export declare const commandNames: string[];
 export declare function help(): string;
 interface VersionHandlerOptions extends Config {
     allowSameVersion?: boolean;
-    noGitChecks?: boolean;
-    noCommitHooks?: boolean;
-    noStrict?: boolean;
+    commitHooks?: boolean;
+    gitChecks?: boolean;
+    gitTagVersion?: boolean;
+    json?: boolean;
+    message?: string;
     preid?: string;
-    tagVersionPrefix?: string;
     recursive?: boolean;
-    json?: boolean;
-    ignoredPackages?: string[];
+    signGitTag?: boolean;
+    tagVersionPrefix?: string;
 }
 export declare function handler(opts: VersionHandlerOptions, params: string[]): Promise<string | {
     output?: string;

package/lib/version/index.js

@@ -1,34 +1,42 @@
+import path from 'node:path';
 import { readProjectManifest } from '@pnpm/cli.utils';
 import { types as allTypes } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
 import { isGitRepo, isWorkingTreeClean } from '@pnpm/network.git-utils';
 import { filterProjectsFromDir } from '@pnpm/workspace.projects-filter';
+import { safeExeca as execa } from 'execa';
 import { pick } from 'ramda';
 import { renderHelp } from 'render-help';
 import { inc, valid } from 'semver';
 export function rcOptionsTypes() {
     return pick([
+        'allow-same-version',
+        'commit-hooks',
         'git-checks',
+        'git-tag-version',
+        'message',
+        'sign-git-tag',
+        'tag-version-prefix',
     ], allTypes);
 }
 export function cliOptionsTypes() {
     return {
         ...rcOptionsTypes(),
-        'allow-same-version': Boolean,
-        'no-git-checks': Boolean,
-        'no-commit-hooks': Boolean,
-        'no-strict': Boolean,
-        'preid': String,
-        'tag-version-prefix': String,
-        recursive: Boolean,
         json: Boolean,
+        preid: String,
+        recursive: Boolean,
     };
 }
 export const commandNames = ['version'];
+const BUMP_TYPES = ['major', 'minor', 'patch', 'premajor', 'preminor', 'prepatch', 'prerelease'];
+function isBumpType(value) {
+    return BUMP_TYPES.includes(value);
+}
 export function help() {
     return renderHelp({
         description: 'Bumps the version of a package.',
         usages: [
+            'pnpm version <newversion>',
             'pnpm version <major|minor|patch|premajor|preminor|prepatch|prerelease>',
         ],
         descriptionLists: [
@@ -44,7 +52,7 @@ export function help() {
                         name: '--preid <preid>',
                     },
                     {
-                        description: 'Sets the tag prefix (default: v)',
+                        description: 'Sets the tag prefix. Default is "v". Set to empty string to remove the prefix.',
                         name: '--tag-version-prefix <prefix>',
                     },
                     {
@@ -52,9 +60,21 @@ export function help() {
                         name: '--allow-same-version',
                     },
                     {
-                        description: 'Skip running commit hooks',
+                        description: 'Commit message. "%s" is replaced with the new version. Default is "%s".',
+                        name: '--message <message>',
+                    },
+                    {
+                        description: "Don't create a commit or tag for the version bump. Git commits and tags are always skipped in recursive mode.",
+                        name: '--no-git-tag-version',
+                    },
+                    {
+                        description: 'Skip running git commit hooks when committing the version bump',
                         name: '--no-commit-hooks',
                     },
+                    {
+                        description: 'Sign the generated git tag with GPG',
+                        name: '--sign-git-tag',
+                    },
                     {
                         description: 'Filter packages by name (glob pattern)',
                         name: '--filter <pattern>',
@@ -73,19 +93,22 @@ export function help() {
     });
 }
 export async function handler(opts, params) {
-    const bumpType = params[0];
-    if (!bumpType || !['major', 'minor', 'patch', 'premajor', 'preminor', 'prepatch', 'prerelease'].includes(bumpType)) {
-        throw new PnpmError('INVALID_VERSION_BUMP', 'Invalid version bump type. Must be one of: major, minor, patch, premajor, preminor, prepatch, prerelease');
+    const rawBump = params[0];
+    if (!rawBump) {
+        throw new PnpmError('INVALID_VERSION_BUMP', 'A version argument is required. Must be a valid semver version (e.g. 1.2.3) or one of: major, minor, patch, premajor, preminor, prepatch, prerelease');
     }
-    // Check git status if needed
-    if (!opts.noGitChecks && await isGitRepo()) {
-        if (!await isWorkingTreeClean()) {
+    const explicitVersion = valid(rawBump);
+    if (!explicitVersion && !isBumpType(rawBump)) {
+        throw new PnpmError('INVALID_VERSION_BUMP', `Invalid version argument: ${rawBump}. Must be a valid semver version (e.g. 1.2.3) or one of: major, minor, patch, premajor, preminor, prepatch, prerelease`);
+    }
+    const gitCwd = opts.workspaceDir ?? opts.dir;
+    if (opts.gitChecks !== false && await isGitRepo({ cwd: gitCwd })) {
+        if (!await isWorkingTreeClean({ cwd: gitCwd })) {
             throw new PnpmError('UNCLEAN_WORKING_TREE', 'Working tree is not clean. Commit or stash your changes.');
         }
     }
     const changes = [];
     if (opts.recursive) {
-        // Handle workspace versioning
         const workspaceDir = opts.workspaceDir || opts.dir;
         const filters = [];
         if (opts.filter && opts.filter.length > 0) {
@@ -101,7 +124,7 @@ export async function handler(opts, params) {
             prefix: opts.dir,
         });
         const pkgDirs = Object.keys(result.selectedProjectsGraph);
-        const bumpResults = await Promise.all(pkgDirs.map(pkgDir => bumpPackageVersion(pkgDir, bumpType, opts)));
+        const bumpResults = await Promise.all(pkgDirs.map(pkgDir => bumpPackageVersion(pkgDir, rawBump, explicitVersion, opts)));
         for (const change of bumpResults) {
             if (change) {
                 changes.push(change);
@@ -109,8 +132,7 @@ export async function handler(opts, params) {
         }
     }
     else {
-        // Handle single package versioning
-        const change = await bumpPackageVersion(opts.dir, bumpType, opts);
+        const change = await bumpPackageVersion(opts.dir, rawBump, explicitVersion, opts);
         if (change) {
             changes.push(change);
         }
@@ -118,9 +140,14 @@ export async function handler(opts, params) {
     if (changes.length === 0) {
         throw new PnpmError('NO_PACKAGES_TO_VERSION', 'No packages to version');
     }
-    // Output results
+    // In recursive mode, multiple packages can be bumped to different versions
+    // in a single run, and there is no obvious single version to tag the commit
+    // with. Skip the git commit and tag entirely in that case.
+    if (!opts.recursive && opts.gitTagVersion !== false && await isGitRepo({ cwd: gitCwd })) {
+        await commitAndTag(changes, { ...opts, cwd: gitCwd });
+    }
     if (opts.json) {
-        return JSON.stringify(changes, null, 2);
+        return JSON.stringify(changes.map(({ manifestPath: _manifestPath, ...change }) => change), null, 2);
     }
     let output = 'Version bumped successfully:\n';
     for (const change of changes) {
@@ -128,8 +155,8 @@ export async function handler(opts, params) {
     }
     return output;
 }
-async function bumpPackageVersion(pkgDir, bumpType, opts) {
-    const { manifest, writeProjectManifest } = await readProjectManifest(pkgDir);
+async function bumpPackageVersion(pkgDir, rawBump, explicitVersion, opts) {
+    const { manifest, writeProjectManifest, fileName } = await readProjectManifest(pkgDir);
     if (!manifest.name || !manifest.version) {
         return null;
     }
@@ -137,9 +164,9 @@ async function bumpPackageVersion(pkgDir, bumpType, opts) {
     if (!valid(currentVersion)) {
         throw new PnpmError('INVALID_VERSION', `Invalid version in ${pkgDir}: ${currentVersion}`);
     }
-    const newVersion = inc(currentVersion, bumpType, false, opts.preid);
+    const newVersion = explicitVersion ?? inc(currentVersion, rawBump, false, opts.preid);
     if (!newVersion) {
-        throw new PnpmError('VERSION_BUMP_FAILED', `Failed to bump version from ${currentVersion} using ${bumpType}`);
+        throw new PnpmError('VERSION_BUMP_FAILED', `Failed to bump version from ${currentVersion} using ${rawBump}`);
     }
     if (newVersion === currentVersion && !opts.allowSameVersion) {
         throw new PnpmError('VERSION_NOT_CHANGED', `Version was not changed: ${currentVersion}`);
@@ -151,8 +178,49 @@ async function bumpPackageVersion(pkgDir, bumpType, opts) {
         currentVersion,
         newVersion,
         path: pkgDir,
+        manifestPath: path.join(pkgDir, fileName),
     };
 }
+async function commitAndTag(changes, opts) {
+    const resolvedCwd = path.resolve(opts.cwd);
+    const [change] = changes;
+    const rawMessage = opts.message ?? '%s';
+    const message = rawMessage.replace(/%s/g, change.newVersion);
+    const tagPrefix = opts.tagVersionPrefix ?? 'v';
+    const tagName = `${tagPrefix}${change.newVersion}`;
+    const execOpts = { cwd: opts.cwd };
+    const resolvedManifestPath = path.resolve(change.manifestPath);
+    const relativeManifestPath = path.relative(resolvedCwd, resolvedManifestPath);
+    if (relativeManifestPath === '' ||
+        path.isAbsolute(relativeManifestPath) ||
+        relativeManifestPath.startsWith(`..${path.sep}`) ||
+        relativeManifestPath === '..') {
+        throw new PnpmError('INVALID_MANIFEST_PATH', `Cannot stage manifest outside of git cwd: ${change.manifestPath}`);
+    }
+    const manifestPath = relativeManifestPath.split(path.sep).join('/');
+    await execa('git', ['add', manifestPath], execOpts);
+    const commitArgs = ['commit', '-m', message];
+    if (opts.commitHooks === false) {
+        commitArgs.push('--no-verify');
+    }
+    // writeProjectManifest skips writing when the new content matches the existing
+    // file, so an --allow-same-version run can leave nothing staged and fail the
+    // commit. Pass --allow-empty in that case to let the tag point at the current
+    // HEAD as a deliberate marker.
+    if (opts.allowSameVersion) {
+        commitArgs.push('--allow-empty');
+    }
+    await execa('git', commitArgs, execOpts);
+    const tagArgs = ['tag'];
+    if (opts.signGitTag) {
+        tagArgs.push('-s');
+    }
+    else {
+        tagArgs.push('-a');
+    }
+    tagArgs.push(tagName, '-m', message);
+    await execa('git', tagArgs, execOpts);
+}
 export const version = {
     handler,
     help,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/releasing.commands",
-  "version": "1100.0.2",
+  "version": "1100.1.0",
   "description": "Commands for deploy, pack, and publish",
   "keywords": [
     "pnpm",
@@ -29,6 +29,7 @@
     "@zkochan/rimraf": "^4.0.0",
     "chalk": "^5.6.0",
     "ci-info": "^4.3.0",
+    "detect-libc": "^2.0.3",
     "enquirer": "^2.4.1",
     "execa": "npm:safe-execa@0.3.0",
     "libnpmpublish": "^11.1.3",
@@ -47,32 +48,34 @@
     "write-json-file": "^7.0.0",
     "write-yaml-file": "^6.0.0",
     "@pnpm/bins.resolver": "1100.0.1",
+    "@pnpm/cli.utils": "1101.0.0",
     "@pnpm/cli.common-cli-options-help": "1100.0.0",
-    "@pnpm/catalogs.types": "1100.0.0",
     "@pnpm/config.pick-registry-for-package": "1100.0.1",
-    "@pnpm/cli.utils": "1101.0.0",
-    "@pnpm/config.reader": "1101.0.0",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/deps.path": "1100.0.1",
+    "@pnpm/engine.runtime.node-resolver": "1100.0.3",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/exec.lifecycle": "1100.0.2",
-    "@pnpm/engine.runtime.commands": "1100.0.2",
-    "@pnpm/fetching.directory-fetcher": "1100.0.2",
+    "@pnpm/fetching.directory-fetcher": "1100.0.3",
+    "@pnpm/exec.pnpm-cli-runner": "1100.0.0",
+    "@pnpm/exec.lifecycle": "1100.0.3",
+    "@pnpm/deps.path": "1100.0.1",
+    "@pnpm/installing.client": "1100.0.3",
     "@pnpm/fs.is-empty-dir-or-nothing": "1100.0.0",
-    "@pnpm/installing.client": "1100.0.2",
     "@pnpm/fs.packlist": "1100.0.0",
-    "@pnpm/lockfile.fs": "1100.0.1",
-    "@pnpm/lockfile.types": "1100.0.1",
-    "@pnpm/installing.commands": "1100.1.0",
-    "@pnpm/network.git-utils": "1100.0.0",
-    "@pnpm/network.fetch": "1100.0.1",
+    "@pnpm/catalogs.types": "1100.0.0",
+    "@pnpm/fs.indexed-pkg-importer": "1100.0.2",
+    "@pnpm/engine.runtime.commands": "1100.0.3",
+    "@pnpm/lockfile.types": "1100.0.2",
     "@pnpm/network.web-auth": "1101.0.0",
+    "@pnpm/network.git-utils": "1100.0.0",
     "@pnpm/releasing.exportable-manifest": "1100.0.2",
-    "@pnpm/fs.indexed-pkg-importer": "1100.0.1",
-    "@pnpm/resolving.resolver-base": "1100.0.1",
-    "@pnpm/workspace.projects-filter": "1100.0.2",
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/resolving.resolver-base": "1100.1.0",
+    "@pnpm/lockfile.fs": "1100.0.2",
+    "@pnpm/workspace.projects-filter": "1100.0.3",
     "@pnpm/workspace.projects-sorter": "1100.0.1",
-    "@pnpm/types": "1101.0.0"
+    "@pnpm/network.fetch": "1100.0.1",
+    "@pnpm/config.reader": "1101.1.0",
+    "@pnpm/installing.commands": "1100.1.1"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0"
@@ -95,15 +98,15 @@
     "load-json-file": "^7.0.1",
     "tar": "^7.5.10",
     "write-yaml-file": "^6.0.0",
-    "@pnpm/assert-project": "1100.0.1",
-    "@pnpm/catalogs.config": "1100.0.0",
-    "@pnpm/hooks.pnpmfile": "1100.0.1",
-    "@pnpm/prepare": "1100.0.1",
+    "@pnpm/hooks.pnpmfile": "1100.0.2",
+    "@pnpm/prepare": "1100.0.2",
+    "@pnpm/assert-project": "1100.0.2",
+    "@pnpm/releasing.commands": "1100.1.0",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/releasing.commands": "1100.0.2",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.0"
+    "@pnpm/testing.command-defaults": "1100.0.1",
+    "@pnpm/catalogs.config": "1100.0.0",
+    "@pnpm/test-ipc-server": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"