@pnpm/releasing.commands 1100.3.1 → 1100.4.0

package/lib/publish/otp.d.ts

@@ -1,6 +1,9 @@
 import { type OtpContext as BaseOtpContext } from '@pnpm/network.web-auth';
 import type { ExportedManifest } from '@pnpm/releasing.exportable-manifest';
 import type { PublishOptions } from 'libnpmpublish';
+export type PublishOptionsWithDefaultAccess = Omit<PublishOptions, 'access'> & {
+    access?: PublishOptions['access'] | null;
+};
 export interface OtpPublishResponse {
     readonly ok: boolean;
     readonly status: number;
@@ -9,14 +12,14 @@ export interface OtpPublishResponse {
     /** Set by the registry only when the publish was staged (i.e. `stage: true` was sent). */
     readonly stageId?: string;
 }
-export type OtpPublishFn = (manifest: ExportedManifest, tarballData: Buffer, options: PublishOptions) => Promise<OtpPublishResponse>;
+export type OtpPublishFn = (manifest: ExportedManifest, tarballData: Buffer, options: PublishOptionsWithDefaultAccess) => Promise<OtpPublishResponse>;
 export interface OtpContext extends BaseOtpContext {
     publish: OtpPublishFn;
 }
 export interface OtpParams {
     context?: OtpContext;
     manifest: ExportedManifest;
-    publishOptions: PublishOptions;
+    publishOptions: PublishOptionsWithDefaultAccess;
     tarballData: Buffer;
 }
 /**

package/lib/publish/publish.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { confirm } from '@inquirer/prompts';
 import { FILTERING } from '@pnpm/cli.common-cli-options-help';
 import { docsUrl, readProjectManifest } from '@pnpm/cli.utils';
 import { types as allTypes } from '@pnpm/config.reader';
@@ -6,7 +7,6 @@ import { PnpmError } from '@pnpm/error';
 import { runLifecycleHook } from '@pnpm/exec.lifecycle';
 import { getCurrentBranch, isGitRepo, isRemoteHistoryClean, isWorkingTreeClean } from '@pnpm/network.git-utils';
 import { rimraf } from '@zkochan/rimraf';
-import enquirer from 'enquirer';
 import { pick } from 'ramda';
 import { realpathMissing } from 'realpath-missing';
 import { renderHelp } from 'render-help';
@@ -140,13 +140,21 @@ export async function publish(opts, params) {
             });
         }
         if (!branches.includes(currentBranch)) {
-            const { confirm } = await enquirer.prompt({
-                message: `You're on branch "${currentBranch}" but your "publish-branch" is set to "${branches.join('|')}". \
-Do you want to continue?`,
-                name: 'confirm',
-                type: 'confirm',
-            }); // eslint-disable-line @typescript-eslint/no-explicit-any
-            if (!confirm) {
+            let isConfirmed;
+            try {
+                isConfirmed = await confirm({
+                    message: `You're on branch "${currentBranch}" but your "publish-branch" is set to "${branches.join('|')}". Do you want to continue?`,
+                });
+            }
+            catch (err) {
+                if (err instanceof Error && err.name === 'ExitPromptError') {
+                    isConfirmed = false;
+                }
+                else {
+                    throw err;
+                }
+            }
+            if (!isConfirmed) {
                 throw new PnpmError('GIT_NOT_CORRECT_BRANCH', `Branch is not on '${branches.join('|')}'.`, {
                     hint: GIT_CHECKS_HINT,
                 });

package/lib/publish/publishPackedPkg.d.ts

@@ -1,9 +1,8 @@
 import type { Config } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
 import type { ExportedManifest } from '@pnpm/releasing.exportable-manifest';
-import type { PublishOptions } from 'libnpmpublish';
 import { type PublishSummary } from '../tarball/publishSummary.js';
-import { type OtpContext } from './otp.js';
+import { type OtpContext, type PublishOptionsWithDefaultAccess } from './otp.js';
 import type { PackResult } from './pack.js';
 export type { PublishSummary };
 export type PublishPackedPkgOptions = Pick<Config, 'configByUri' | 'dryRun' | 'fetchRetries' | 'fetchRetryFactor' | 'fetchRetryMaxtimeout' | 'fetchRetryMintimeout' | 'fetchTimeout' | 'registries' | 'tag' | 'userAgent'> & Partial<Pick<Config, 'ca' | 'cert' | 'httpProxy' | 'httpsProxy' | 'key' | 'localAddress' | 'noProxy' | 'strictSsl'>> & {
@@ -23,11 +22,15 @@ export declare function publishPackedPkg(packResult: Pick<PackResult, 'published
  * https://github.com/pnpm/pnpm/issues/11561).
  */
 export declare function createPublishContext(opts: PublishPackedPkgOptions): OtpContext;
+type StagePublishOptions = PublishOptionsWithDefaultAccess & {
+    command?: string;
+    stage?: boolean;
+};
 /**
  * @internal Exported for unit testing of the access / registry / auth fallback rules. Not part of the package's
  *   public API.
  */
-export declare function createPublishOptions(manifest: ExportedManifest, options: PublishPackedPkgOptions): Promise<PublishOptions>;
+export declare function createPublishOptions(manifest: ExportedManifest, options: PublishPackedPkgOptions): Promise<StagePublishOptions>;
 export declare class PublishUnsupportedRegistryProtocolError extends PnpmError {
     readonly registryUrl: string;
     constructor(registryUrl: string);

package/lib/publish/publishPackedPkg.js

@@ -81,7 +81,7 @@ export async function createPublishOptions(manifest, options) {
     const { registry, config } = findRegistryInfo(manifest, options, publishConfigRegistry);
     const { creds, tls } = config ?? {};
     const publishConfigAccess = manifest.publishConfig?.access;
-    const access = options.access ?? (isPublishAccess(publishConfigAccess) ? publishConfigAccess : undefined);
+    const access = options.access ?? (isPublishAccess(publishConfigAccess) ? publishConfigAccess : null);
     const { ci: isFromCI, fetchRetries, fetchRetryFactor, fetchRetryMaxtimeout, fetchRetryMintimeout, fetchTimeout: timeout, otp, provenance, provenanceFile, tag: defaultTag, userAgent, } = options;
     const npmCommand = options.stage === true ? 'stage' : 'publish';
     const headers = {

package/lib/publish/utils/shared-context.js

@@ -1,15 +1,15 @@
 import readline from 'node:readline';
+import { input } from '@inquirer/prompts';
 import { globalInfo, globalWarn } from '@pnpm/logger';
 import { fetch } from '@pnpm/network.fetch';
 import ciInfo from 'ci-info';
-import enquirer from 'enquirer';
 import { publish as _publish } from 'libnpmpublish';
 const publish = _publish;
 export const SHARED_CONTEXT = {
     Date,
     createReadlineInterface: readline.createInterface.bind(null, { input: process.stdin }),
     ciInfo,
-    enquirer,
+    enquirer: { input },
     fetch,
     globalInfo,
     globalWarn,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/releasing.commands",
-  "version": "1100.3.1",
+  "version": "1100.4.0",
   "description": "Commands for deploy, pack, and publish",
   "keywords": [
     "pnpm",
@@ -24,13 +24,13 @@
     "!*.map"
   ],
   "dependencies": {
+    "@inquirer/prompts": "^8.4.3",
     "@pnpm/npm-package-arg": "^2.0.0",
     "@types/normalize-path": "^3.0.2",
     "@zkochan/rimraf": "^4.0.0",
     "chalk": "^5.6.2",
     "ci-info": "^4.4.0",
     "detect-libc": "^2.1.2",
-    "enquirer": "^2.4.1",
     "execa": "npm:safe-execa@0.3.0",
     "libnpmpublish": "^11.2.0",
     "normalize-path": "^3.0.0",
@@ -47,35 +47,35 @@
     "validate-npm-package-name": "7.0.2",
     "write-json-file": "^7.0.0",
     "write-yaml-file": "^6.0.0",
+    "@pnpm/bins.resolver": "1100.0.5",
     "@pnpm/catalogs.types": "1100.0.0",
-    "@pnpm/cli.utils": "1101.0.8",
     "@pnpm/cli.common-cli-options-help": "1100.0.1",
-    "@pnpm/config.reader": "1101.4.1",
+    "@pnpm/cli.utils": "1101.0.8",
     "@pnpm/config.pick-registry-for-package": "1100.0.6",
-    "@pnpm/deps.path": "1100.0.5",
+    "@pnpm/config.reader": "1101.5.0",
     "@pnpm/constants": "1100.0.0",
+    "@pnpm/deps.path": "1100.0.5",
+    "@pnpm/engine.runtime.commands": "1100.1.1",
+    "@pnpm/engine.runtime.node-resolver": "1101.1.3",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/exec.lifecycle": "1100.0.14",
     "@pnpm/exec.pnpm-cli-runner": "1100.0.1",
-    "@pnpm/engine.runtime.commands": "1100.1.0",
-    "@pnpm/bins.resolver": "1100.0.5",
-    "@pnpm/fs.indexed-pkg-importer": "1100.0.10",
     "@pnpm/fetching.directory-fetcher": "1100.0.13",
-    "@pnpm/installing.client": "1100.2.3",
-    "@pnpm/engine.runtime.node-resolver": "1101.1.2",
-    "@pnpm/fs.packlist": "1100.0.1",
     "@pnpm/fs.is-empty-dir-or-nothing": "1100.0.0",
-    "@pnpm/installing.commands": "1100.6.0",
+    "@pnpm/fs.packlist": "1100.0.1",
+    "@pnpm/fs.indexed-pkg-importer": "1100.0.10",
+    "@pnpm/installing.client": "1100.2.4",
+    "@pnpm/installing.commands": "1100.7.0",
     "@pnpm/lockfile.types": "1100.0.8",
     "@pnpm/lockfile.fs": "1100.1.2",
-    "@pnpm/network.fetch": "1100.0.7",
+    "@pnpm/exec.lifecycle": "1100.0.14",
+    "@pnpm/network.auth-header": "1101.0.0",
+    "@pnpm/network.fetch": "1100.0.8",
     "@pnpm/network.git-utils": "1100.0.1",
-    "@pnpm/network.web-auth": "1101.0.0",
+    "@pnpm/network.web-auth": "1101.1.0",
     "@pnpm/releasing.exportable-manifest": "1100.1.1",
-    "@pnpm/network.auth-header": "1101.0.0",
     "@pnpm/resolving.resolver-base": "1100.3.1",
     "@pnpm/types": "1101.2.0",
-    "@pnpm/workspace.projects-filter": "1100.0.16",
+    "@pnpm/workspace.projects-filter": "1100.0.17",
     "@pnpm/workspace.projects-sorter": "1100.0.4"
   },
   "peerDependencies": {
@@ -83,7 +83,6 @@
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
-    "@pnpm/registry-mock": "6.0.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/is-windows": "^1.0.2",
     "@types/libnpmpublish": "^9.0.1",
@@ -100,15 +99,16 @@
     "tar": "^7.5.15",
     "undici": "^7.26.0",
     "write-yaml-file": "^6.0.0",
-    "@pnpm/assert-project": "1100.0.11",
+    "@pnpm/assert-project": "1100.0.12",
+    "@pnpm/catalogs.config": "1100.0.0",
     "@pnpm/hooks.pnpmfile": "1100.0.11",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/releasing.commands": "1100.3.1",
+    "@pnpm/prepare": "1100.0.12",
+    "@pnpm/releasing.commands": "1100.4.0",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/catalogs.config": "1100.0.0",
-    "@pnpm/prepare": "1100.0.11",
+    "@pnpm/testing.command-defaults": "1100.0.2",
     "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.1"
+    "@pnpm/testing.registry-mock": "1100.0.2"
   },
   "engines": {
     "node": ">=22.13"