diff --git a/.changeset/spotty-planets-pretend.md b/.changeset/spotty-planets-pretend.md new file mode 100644 index 0000000000..f351a79182 --- /dev/null +++ b/.changeset/spotty-planets-pretend.md @@ -0,0 +1,6 @@ +--- +"@pnpm/default-reporter": patch +"pnpm": patch +--- + +Don't prefix install output for the dlx command. diff --git a/cli/default-reporter/src/index.ts b/cli/default-reporter/src/index.ts index 170fa5f370..db4ffe7218 100644 --- a/cli/default-reporter/src/index.ts +++ b/cli/default-reporter/src/index.ts @@ -247,11 +247,12 @@ export function toOutput$ ( summary: Rx.from(summaryPushStream), updateCheck: Rx.from(updateCheckPushStream), } + const cmd = opts.context.argv[0] const outputs: Array>> = reporterForClient( log$, { appendOnly: opts.reportingOptions?.appendOnly, - cmd: opts.context.argv[0], + cmd, config: opts.context.config, env: opts.context.env ?? process.env, filterPkgsDiff: opts.filterPkgsDiff, @@ -264,7 +265,7 @@ export function toOutput$ ( throttleProgress: opts.reportingOptions?.throttleProgress, width: opts.reportingOptions?.outputMaxWidth, hideAddedPkgsProgress: opts.reportingOptions?.hideAddedPkgsProgress, - hideProgressPrefix: opts.reportingOptions?.hideProgressPrefix, + hideProgressPrefix: opts.reportingOptions?.hideProgressPrefix ?? (cmd === 'dlx'), } ) diff --git a/cli/default-reporter/src/reporterForClient/index.ts b/cli/default-reporter/src/reporterForClient/index.ts index c5c7c68466..576a96cacb 100644 --- a/cli/default-reporter/src/reporterForClient/index.ts +++ b/cli/default-reporter/src/reporterForClient/index.ts @@ -132,6 +132,7 @@ export function reporterForClient ( cwd, isRecursive: opts.isRecursive, width, + hideProgressPrefix: opts.hideProgressPrefix, }) ) } diff --git a/cli/default-reporter/src/reporterForClient/reportStats.ts b/cli/default-reporter/src/reporterForClient/reportStats.ts index c88b2038e6..69949dc7c5 100644 --- a/cli/default-reporter/src/reporterForClient/reportStats.ts +++ b/cli/default-reporter/src/reporterForClient/reportStats.ts @@ -20,8 +20,15 @@ export function reportStats ( cwd: string isRecursive: boolean width: number + hideProgressPrefix?: boolean } ) { + if (opts.hideProgressPrefix) { + return [statsForCurrentPackage(log$.stats, { + cmd: opts.cmd, + width: opts.width, + })] + } const stats$ = opts.isRecursive ? log$.stats : log$.stats.pipe(filter((log) => log.prefix !== opts.cwd)) @@ -35,9 +42,10 @@ export function reportStats ( ] if (!opts.isRecursive) { - outputs.push(statsForCurrentPackage(log$.stats, { + outputs.push(statsForCurrentPackage(log$.stats.pipe( + filter((log) => log.prefix === opts.cwd) + ), { cmd: opts.cmd, - currentPrefix: opts.cwd, width: opts.width, })) } @@ -49,13 +57,11 @@ function statsForCurrentPackage ( stats$: Rx.Observable, opts: { cmd: string - currentPrefix: string width: number } ) { return stats$.pipe( - filter((log) => log.prefix === opts.currentPrefix), - take((opts.cmd === 'install' || opts.cmd === 'install-test' || opts.cmd === 'add' || opts.cmd === 'update') ? 2 : 1), + take((opts.cmd === 'install' || opts.cmd === 'install-test' || opts.cmd === 'add' || opts.cmd === 'update' || opts.cmd === 'dlx') ? 2 : 1), reduce((acc, log) => { if (typeof log['added'] === 'number') { acc['added'] = log['added']