@pnpm/default-reporter 10.1.0 → 11.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/lib/index.d.ts +2 -2
- package/lib/index.js +11 -11
- package/lib/index.js.map +1 -1
- package/lib/mergeOutputs.d.ts +1 -1
- package/lib/mergeOutputs.js +2 -1
- package/lib/mergeOutputs.js.map +1 -1
- package/lib/reportError.d.ts +1 -1
- package/lib/reportError.js +4 -3
- package/lib/reportError.js.map +1 -1
- package/lib/reporterForClient/index.d.ts +1 -1
- package/lib/reporterForClient/index.js +31 -56
- package/lib/reporterForClient/index.js.map +1 -1
- package/lib/reporterForClient/pkgsDiff.d.ts +1 -1
- package/lib/reporterForClient/pkgsDiff.js +3 -3
- package/lib/reporterForClient/pkgsDiff.js.map +1 -1
- package/lib/reporterForClient/reportBigTarballsProgress.d.ts +2 -3
- package/lib/reporterForClient/reportBigTarballsProgress.js +4 -2
- package/lib/reporterForClient/reportBigTarballsProgress.js.map +1 -1
- package/lib/reporterForClient/reportContext.d.ts +2 -3
- package/lib/reporterForClient/reportContext.js +4 -2
- package/lib/reporterForClient/reportContext.js.map +1 -1
- package/lib/reporterForClient/reportDeprecations.d.ts +2 -3
- package/lib/reporterForClient/reportDeprecations.js +7 -5
- package/lib/reporterForClient/reportDeprecations.js.map +1 -1
- package/lib/reporterForClient/reportHooks.d.ts +2 -3
- package/lib/reporterForClient/reportHooks.js +4 -2
- package/lib/reporterForClient/reportHooks.js.map +1 -1
- package/lib/reporterForClient/reportInstallChecks.d.ts +2 -3
- package/lib/reporterForClient/reportInstallChecks.js +6 -7
- package/lib/reporterForClient/reportInstallChecks.js.map +1 -1
- package/lib/reporterForClient/reportLifecycleScripts.d.ts +2 -4
- package/lib/reporterForClient/reportLifecycleScripts.js +7 -5
- package/lib/reporterForClient/reportLifecycleScripts.js.map +1 -1
- package/lib/reporterForClient/reportMisc.d.ts +2 -3
- package/lib/reporterForClient/reportMisc.js +10 -9
- package/lib/reporterForClient/reportMisc.js.map +1 -1
- package/lib/reporterForClient/reportPeerDependencyIssues.d.ts +2 -3
- package/lib/reporterForClient/reportPeerDependencyIssues.js +7 -8
- package/lib/reporterForClient/reportPeerDependencyIssues.js.map +1 -1
- package/lib/reporterForClient/reportProgress.d.ts +2 -3
- package/lib/reporterForClient/reportProgress.js +4 -2
- package/lib/reporterForClient/reportProgress.js.map +1 -1
- package/lib/reporterForClient/reportRequestRetry.d.ts +1 -2
- package/lib/reporterForClient/reportRequestRetry.js +6 -4
- package/lib/reporterForClient/reportRequestRetry.js.map +1 -1
- package/lib/reporterForClient/reportScope.d.ts +2 -3
- package/lib/reporterForClient/reportScope.js +4 -2
- package/lib/reporterForClient/reportScope.js.map +1 -1
- package/lib/reporterForClient/reportSkippedOptionalDependencies.d.ts +2 -3
- package/lib/reporterForClient/reportSkippedOptionalDependencies.js +4 -2
- package/lib/reporterForClient/reportSkippedOptionalDependencies.js.map +1 -1
- package/lib/reporterForClient/reportStats.d.ts +2 -3
- package/lib/reporterForClient/reportStats.js +4 -2
- package/lib/reporterForClient/reportStats.js.map +1 -1
- package/lib/reporterForClient/reportSummary.d.ts +3 -3
- package/lib/reporterForClient/reportSummary.js +6 -4
- package/lib/reporterForClient/reportSummary.js.map +1 -1
- package/lib/reporterForClient/reportUpdateCheck.d.ts +3 -3
- package/lib/reporterForClient/reportUpdateCheck.js +4 -2
- package/lib/reporterForClient/reportUpdateCheck.js.map +1 -1
- package/lib/reporterForClient/utils/formatPrefix.d.ts +1 -1
- package/lib/reporterForClient/utils/formatPrefix.js +2 -2
- package/lib/reporterForClient/utils/formatPrefix.js.map +1 -1
- package/lib/reporterForClient/utils/formatWarn.d.ts +1 -1
- package/lib/reporterForClient/utils/formatWarn.js +2 -1
- package/lib/reporterForClient/utils/formatWarn.js.map +1 -1
- package/lib/reporterForClient/utils/zooming.js +2 -2
- package/lib/reporterForClient/utils/zooming.js.map +1 -1
- package/lib/reporterForServer.d.ts +1 -1
- package/lib/reporterForServer.js +5 -4
- package/lib/reporterForServer.js.map +1 -1
- package/package.json +8 -8
package/README.md
CHANGED
|
@@ -12,9 +12,9 @@ pnpm add @pnpm/default-reporter
|
|
|
12
12
|
|
|
13
13
|
```ts
|
|
14
14
|
import { streamParser } from '@pnpm/logger'
|
|
15
|
-
import
|
|
15
|
+
import { initDefaultReporter } from '@pnpm/default-reporter'
|
|
16
16
|
|
|
17
|
-
const stopReporting =
|
|
17
|
+
const stopReporting = initDefaultReporter({
|
|
18
18
|
context: {
|
|
19
19
|
argv: [],
|
|
20
20
|
},
|
package/lib/index.d.ts
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
import { Config } from '@pnpm/config';
|
|
3
3
|
import { LogLevel } from '@pnpm/logger';
|
|
4
4
|
import * as Rx from 'rxjs';
|
|
5
|
-
import formatWarn from './reporterForClient/utils/formatWarn';
|
|
5
|
+
import { formatWarn } from './reporterForClient/utils/formatWarn';
|
|
6
6
|
export { formatWarn };
|
|
7
|
-
export
|
|
7
|
+
export declare function initDefaultReporter(opts: {
|
|
8
8
|
useStderr?: boolean;
|
|
9
9
|
streamParser: object;
|
|
10
10
|
reportingOptions?: {
|
package/lib/index.js
CHANGED
|
@@ -26,21 +26,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.toOutput$ = exports.formatWarn = void 0;
|
|
29
|
+
exports.toOutput$ = exports.initDefaultReporter = exports.formatWarn = void 0;
|
|
30
30
|
const Rx = __importStar(require("rxjs"));
|
|
31
31
|
const operators_1 = require("rxjs/operators");
|
|
32
32
|
const ansi_diff_1 = __importDefault(require("ansi-diff"));
|
|
33
33
|
const constants_1 = require("./constants");
|
|
34
|
-
const mergeOutputs_1 =
|
|
35
|
-
const reporterForClient_1 =
|
|
36
|
-
const formatWarn_1 =
|
|
37
|
-
exports
|
|
38
|
-
const reporterForServer_1 =
|
|
39
|
-
function
|
|
34
|
+
const mergeOutputs_1 = require("./mergeOutputs");
|
|
35
|
+
const reporterForClient_1 = require("./reporterForClient");
|
|
36
|
+
const formatWarn_1 = require("./reporterForClient/utils/formatWarn");
|
|
37
|
+
Object.defineProperty(exports, "formatWarn", { enumerable: true, get: function () { return formatWarn_1.formatWarn; } });
|
|
38
|
+
const reporterForServer_1 = require("./reporterForServer");
|
|
39
|
+
function initDefaultReporter(opts) {
|
|
40
40
|
if (opts.context.argv[0] === 'server') {
|
|
41
41
|
// eslint-disable-next-line
|
|
42
42
|
const log$ = Rx.fromEvent(opts.streamParser, 'data');
|
|
43
|
-
const subscription = (0, reporterForServer_1.
|
|
43
|
+
const subscription = (0, reporterForServer_1.reporterForServer)(log$, opts.context.config);
|
|
44
44
|
return () => subscription.unsubscribe();
|
|
45
45
|
}
|
|
46
46
|
const outputMaxWidth = opts.reportingOptions?.outputMaxWidth ?? (process.stdout.columns && process.stdout.columns - 2) ?? 80;
|
|
@@ -86,7 +86,7 @@ function default_1(opts) {
|
|
|
86
86
|
}
|
|
87
87
|
return () => subscription.unsubscribe();
|
|
88
88
|
}
|
|
89
|
-
exports.
|
|
89
|
+
exports.initDefaultReporter = initDefaultReporter;
|
|
90
90
|
function toOutput$(opts) {
|
|
91
91
|
opts = opts || {};
|
|
92
92
|
const contextPushStream = new Rx.Subject();
|
|
@@ -218,7 +218,7 @@ function toOutput$(opts) {
|
|
|
218
218
|
summary: Rx.from(summaryPushStream),
|
|
219
219
|
updateCheck: Rx.from(updateCheckPushStream),
|
|
220
220
|
};
|
|
221
|
-
const outputs = (0, reporterForClient_1.
|
|
221
|
+
const outputs = (0, reporterForClient_1.reporterForClient)(log$, {
|
|
222
222
|
appendOnly: opts.reportingOptions?.appendOnly,
|
|
223
223
|
cmd: opts.context.argv[0],
|
|
224
224
|
config: opts.context.config,
|
|
@@ -235,7 +235,7 @@ function toOutput$(opts) {
|
|
|
235
235
|
return Rx.merge(...outputs)
|
|
236
236
|
.pipe((0, operators_1.map)((log) => log.pipe((0, operators_1.map)((msg) => msg.msg))), (0, operators_1.mergeAll)());
|
|
237
237
|
}
|
|
238
|
-
return (0, mergeOutputs_1.
|
|
238
|
+
return (0, mergeOutputs_1.mergeOutputs)(outputs);
|
|
239
239
|
}
|
|
240
240
|
exports.toOutput$ = toOutput$;
|
|
241
241
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,yCAA0B;AAC1B,8CAAsD;AACtD,0DAAoC;AACpC,2CAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/mergeOutputs.d.ts
CHANGED
package/lib/mergeOutputs.js
CHANGED
|
@@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.mergeOutputs = void 0;
|
|
26
27
|
const Rx = __importStar(require("rxjs"));
|
|
27
28
|
const operators_1 = require("rxjs/operators");
|
|
28
29
|
const constants_1 = require("./constants");
|
|
@@ -91,5 +92,5 @@ function mergeOutputs(outputs) {
|
|
|
91
92
|
return false;
|
|
92
93
|
}));
|
|
93
94
|
}
|
|
94
|
-
exports.
|
|
95
|
+
exports.mergeOutputs = mergeOutputs;
|
|
95
96
|
//# sourceMappingURL=mergeOutputs.js.map
|
package/lib/mergeOutputs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeOutputs.js","sourceRoot":"","sources":["../src/mergeOutputs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mergeOutputs.js","sourceRoot":"","sources":["../src/mergeOutputs.ts"],"names":[],"mappings":"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"}
|
package/lib/reportError.d.ts
CHANGED
package/lib/reportError.js
CHANGED
|
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
|
|
6
|
+
exports.reportError = void 0;
|
|
7
|
+
const render_peer_issues_1 = require("@pnpm/render-peer-issues");
|
|
7
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
9
|
const equals_1 = __importDefault(require("ramda/src/equals"));
|
|
9
10
|
const stacktracey_1 = __importDefault(require("stacktracey"));
|
|
@@ -31,7 +32,7 @@ function reportError(logObj, config) {
|
|
|
31
32
|
}
|
|
32
33
|
return output;
|
|
33
34
|
}
|
|
34
|
-
exports.
|
|
35
|
+
exports.reportError = reportError;
|
|
35
36
|
function getErrorInfo(logObj, config) {
|
|
36
37
|
if (logObj['err']) {
|
|
37
38
|
const err = logObj['err'];
|
|
@@ -318,7 +319,7 @@ function reportPeerDependencyIssuesError(err, msg) {
|
|
|
318
319
|
hints.push('If you don\'t want pnpm to fail on peer dependency issues, add "strict-peer-dependencies=false" to an .npmrc file at the root of your project.');
|
|
319
320
|
return {
|
|
320
321
|
title: err.message,
|
|
321
|
-
body: `${(0, render_peer_issues_1.
|
|
322
|
+
body: `${(0, render_peer_issues_1.renderPeerIssues)(msg.issuesByProjects)}
|
|
322
323
|
${hints.map((hint) => `hint: ${hint}`).join('\n')}
|
|
323
324
|
`,
|
|
324
325
|
};
|
package/lib/reportError.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportError.js","sourceRoot":"","sources":["../src/reportError.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportError.js","sourceRoot":"","sources":["../src/reportError.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Config } from '@pnpm/config';
|
|
|
3
3
|
import * as logs from '@pnpm/core-loggers';
|
|
4
4
|
import { LogLevel } from '@pnpm/logger';
|
|
5
5
|
import * as Rx from 'rxjs';
|
|
6
|
-
export
|
|
6
|
+
export declare function reporterForClient(log$: {
|
|
7
7
|
context: Rx.Observable<logs.ContextLog>;
|
|
8
8
|
fetchingProgress: Rx.Observable<logs.FetchingProgressLog>;
|
|
9
9
|
executionTime: Rx.Observable<logs.ExecutionTimeLog>;
|
|
@@ -1,80 +1,55 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.reporterForClient = void 0;
|
|
29
4
|
const operators_1 = require("rxjs/operators");
|
|
30
|
-
const reportBigTarballsProgress_1 =
|
|
31
|
-
const reportContext_1 =
|
|
5
|
+
const reportBigTarballsProgress_1 = require("./reportBigTarballsProgress");
|
|
6
|
+
const reportContext_1 = require("./reportContext");
|
|
32
7
|
const reportExecutionTime_1 = require("./reportExecutionTime");
|
|
33
|
-
const reportDeprecations_1 =
|
|
34
|
-
const reportHooks_1 =
|
|
35
|
-
const reportInstallChecks_1 =
|
|
36
|
-
const reportLifecycleScripts_1 =
|
|
37
|
-
const reportMisc_1 =
|
|
38
|
-
const reportPeerDependencyIssues_1 =
|
|
39
|
-
const reportProgress_1 =
|
|
40
|
-
const reportRequestRetry_1 =
|
|
41
|
-
const reportScope_1 =
|
|
42
|
-
const reportSkippedOptionalDependencies_1 =
|
|
43
|
-
const reportStats_1 =
|
|
44
|
-
const reportSummary_1 =
|
|
45
|
-
const reportUpdateCheck_1 =
|
|
8
|
+
const reportDeprecations_1 = require("./reportDeprecations");
|
|
9
|
+
const reportHooks_1 = require("./reportHooks");
|
|
10
|
+
const reportInstallChecks_1 = require("./reportInstallChecks");
|
|
11
|
+
const reportLifecycleScripts_1 = require("./reportLifecycleScripts");
|
|
12
|
+
const reportMisc_1 = require("./reportMisc");
|
|
13
|
+
const reportPeerDependencyIssues_1 = require("./reportPeerDependencyIssues");
|
|
14
|
+
const reportProgress_1 = require("./reportProgress");
|
|
15
|
+
const reportRequestRetry_1 = require("./reportRequestRetry");
|
|
16
|
+
const reportScope_1 = require("./reportScope");
|
|
17
|
+
const reportSkippedOptionalDependencies_1 = require("./reportSkippedOptionalDependencies");
|
|
18
|
+
const reportStats_1 = require("./reportStats");
|
|
19
|
+
const reportSummary_1 = require("./reportSummary");
|
|
20
|
+
const reportUpdateCheck_1 = require("./reportUpdateCheck");
|
|
46
21
|
const PRINT_EXECUTION_TIME_IN_COMMANDS = {
|
|
47
22
|
install: true,
|
|
48
23
|
update: true,
|
|
49
24
|
add: true,
|
|
50
25
|
remove: true,
|
|
51
26
|
};
|
|
52
|
-
function
|
|
27
|
+
function reporterForClient(log$, opts) {
|
|
53
28
|
const width = opts.width ?? process.stdout.columns ?? 80;
|
|
54
29
|
const cwd = opts.pnpmConfig?.dir ?? process.cwd();
|
|
55
30
|
const throttle = typeof opts.throttleProgress === 'number' && opts.throttleProgress > 0
|
|
56
31
|
? (0, operators_1.throttleTime)(opts.throttleProgress, undefined, { leading: true, trailing: true })
|
|
57
32
|
: undefined;
|
|
58
33
|
const outputs = [
|
|
59
|
-
(0, reportLifecycleScripts_1.
|
|
34
|
+
(0, reportLifecycleScripts_1.reportLifecycleScripts)(log$, {
|
|
60
35
|
appendOnly: opts.appendOnly === true || opts.streamLifecycleOutput,
|
|
61
36
|
aggregateOutput: opts.aggregateOutput,
|
|
62
37
|
cwd,
|
|
63
38
|
width,
|
|
64
39
|
}),
|
|
65
|
-
(0, reportMisc_1.
|
|
40
|
+
(0, reportMisc_1.reportMisc)(log$, {
|
|
66
41
|
appendOnly: opts.appendOnly === true,
|
|
67
42
|
config: opts.config,
|
|
68
43
|
cwd,
|
|
69
44
|
logLevel: opts.logLevel,
|
|
70
45
|
zoomOutCurrent: opts.isRecursive,
|
|
71
46
|
}),
|
|
72
|
-
(0, reportInstallChecks_1.
|
|
73
|
-
(0, reportScope_1.
|
|
74
|
-
(0, reportSkippedOptionalDependencies_1.
|
|
75
|
-
(0, reportHooks_1.
|
|
76
|
-
(0, reportContext_1.
|
|
77
|
-
(0, reportUpdateCheck_1.
|
|
47
|
+
(0, reportInstallChecks_1.reportInstallChecks)(log$.installCheck, { cwd }),
|
|
48
|
+
(0, reportScope_1.reportScope)(log$.scope, { isRecursive: opts.isRecursive, cmd: opts.cmd }),
|
|
49
|
+
(0, reportSkippedOptionalDependencies_1.reportSkippedOptionalDependencies)(log$.skippedOptionalDependency, { cwd }),
|
|
50
|
+
(0, reportHooks_1.reportHooks)(log$.hook, { cwd, isRecursive: opts.isRecursive }),
|
|
51
|
+
(0, reportContext_1.reportContext)(log$, { cwd }),
|
|
52
|
+
(0, reportUpdateCheck_1.reportUpdateCheck)(log$.updateCheck, opts),
|
|
78
53
|
];
|
|
79
54
|
if (PRINT_EXECUTION_TIME_IN_COMMANDS[opts.cmd]) {
|
|
80
55
|
outputs.push((0, reportExecutionTime_1.reportExecutionTime)(log$.executionTime));
|
|
@@ -82,13 +57,13 @@ function default_1(log$, opts) {
|
|
|
82
57
|
// logLevelNumber: 0123 = error warn info debug
|
|
83
58
|
const logLevelNumber = reportMisc_1.LOG_LEVEL_NUMBER[opts.logLevel ?? 'info'] ?? reportMisc_1.LOG_LEVEL_NUMBER['info'];
|
|
84
59
|
if (logLevelNumber >= reportMisc_1.LOG_LEVEL_NUMBER.warn) {
|
|
85
|
-
outputs.push((0, reportPeerDependencyIssues_1.
|
|
60
|
+
outputs.push((0, reportPeerDependencyIssues_1.reportPeerDependencyIssues)(log$), (0, reportDeprecations_1.reportDeprecations)(log$.deprecation, { cwd, isRecursive: opts.isRecursive }), (0, reportRequestRetry_1.reportRequestRetry)(log$.requestRetry));
|
|
86
61
|
}
|
|
87
62
|
if (logLevelNumber >= reportMisc_1.LOG_LEVEL_NUMBER.info) {
|
|
88
|
-
outputs.push((0, reportProgress_1.
|
|
63
|
+
outputs.push((0, reportProgress_1.reportProgress)(log$, {
|
|
89
64
|
cwd,
|
|
90
65
|
throttle,
|
|
91
|
-
}), ...(0, reportStats_1.
|
|
66
|
+
}), ...(0, reportStats_1.reportStats)(log$, {
|
|
92
67
|
cmd: opts.cmd,
|
|
93
68
|
cwd,
|
|
94
69
|
isRecursive: opts.isRecursive,
|
|
@@ -96,10 +71,10 @@ function default_1(log$, opts) {
|
|
|
96
71
|
}));
|
|
97
72
|
}
|
|
98
73
|
if (!opts.appendOnly) {
|
|
99
|
-
outputs.push((0, reportBigTarballsProgress_1.
|
|
74
|
+
outputs.push((0, reportBigTarballsProgress_1.reportBigTarballProgress)(log$));
|
|
100
75
|
}
|
|
101
76
|
if (!opts.isRecursive) {
|
|
102
|
-
outputs.push((0, reportSummary_1.
|
|
77
|
+
outputs.push((0, reportSummary_1.reportSummary)(log$, {
|
|
103
78
|
cwd,
|
|
104
79
|
env: opts.env,
|
|
105
80
|
pnpmConfig: opts.pnpmConfig,
|
|
@@ -107,5 +82,5 @@ function default_1(log$, opts) {
|
|
|
107
82
|
}
|
|
108
83
|
return outputs;
|
|
109
84
|
}
|
|
110
|
-
exports.
|
|
85
|
+
exports.reporterForClient = reporterForClient;
|
|
111
86
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/reporterForClient/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/reporterForClient/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export declare const propertyByDependencyType: {
|
|
|
19
19
|
peer: string;
|
|
20
20
|
prod: string;
|
|
21
21
|
};
|
|
22
|
-
export
|
|
22
|
+
export declare function getPkgsDiff(log$: {
|
|
23
23
|
deprecation: Rx.Observable<logs.DeprecationLog>;
|
|
24
24
|
summary: Rx.Observable<logs.SummaryLog>;
|
|
25
25
|
root: Rx.Observable<logs.RootLog>;
|
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.propertyByDependencyType = void 0;
|
|
29
|
+
exports.getPkgsDiff = exports.propertyByDependencyType = void 0;
|
|
30
30
|
const Rx = __importStar(require("rxjs"));
|
|
31
31
|
const operators_1 = require("rxjs/operators");
|
|
32
32
|
const mergeRight_1 = __importDefault(require("ramda/src/mergeRight"));
|
|
@@ -38,7 +38,7 @@ exports.propertyByDependencyType = {
|
|
|
38
38
|
peer: 'peerDependencies',
|
|
39
39
|
prod: 'dependencies',
|
|
40
40
|
};
|
|
41
|
-
function
|
|
41
|
+
function getPkgsDiff(log$, opts) {
|
|
42
42
|
const deprecationSet$ = log$.deprecation
|
|
43
43
|
.pipe((0, operators_1.filter)((log) => log.prefix === opts.prefix), (0, operators_1.scan)((acc, log) => {
|
|
44
44
|
acc.add(log.pkgId);
|
|
@@ -128,7 +128,7 @@ function default_1(log$, opts) {
|
|
|
128
128
|
return pkgsDiff;
|
|
129
129
|
}));
|
|
130
130
|
}
|
|
131
|
-
exports.
|
|
131
|
+
exports.getPkgsDiff = getPkgsDiff;
|
|
132
132
|
function removeOptionalFromProdDeps(pkg) {
|
|
133
133
|
if ((pkg.dependencies == null) || (pkg.optionalDependencies == null))
|
|
134
134
|
return pkg;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pkgsDiff.js","sourceRoot":"","sources":["../../src/reporterForClient/pkgsDiff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAA0B;AAC1B,8CAAkF;AAClF,sEAA6C;AAC7C,sEAA6C;AAgBhC,QAAA,wBAAwB,GAAG;IACtC,GAAG,EAAE,iBAAiB;IACtB,eAAe,EAAE,cAAc;IAC/B,QAAQ,EAAE,sBAAsB;IAChC,IAAI,EAAE,kBAAkB;IACxB,IAAI,EAAE,cAAc;CACrB,CAAA;AAED,
|
|
1
|
+
{"version":3,"file":"pkgsDiff.js","sourceRoot":"","sources":["../../src/reporterForClient/pkgsDiff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { FetchingProgressLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportBigTarballProgress(log$: {
|
|
4
4
|
fetchingProgress: Rx.Observable<FetchingProgressLog>;
|
|
5
|
-
})
|
|
5
|
+
}): Rx.Observable<Rx.Observable<{
|
|
6
6
|
fixed: boolean;
|
|
7
7
|
msg: string;
|
|
8
8
|
}>>;
|
|
9
|
-
export default _default;
|
|
@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.reportBigTarballProgress = void 0;
|
|
6
7
|
const operators_1 = require("rxjs/operators");
|
|
7
8
|
const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
|
|
8
9
|
const outputConstants_1 = require("./outputConstants");
|
|
9
10
|
const BIG_TARBALL_SIZE = 1024 * 1024 * 5; // 5 MB
|
|
10
|
-
|
|
11
|
+
function reportBigTarballProgress(log$) {
|
|
11
12
|
return log$.fetchingProgress.pipe((0, operators_1.filter)((log) => log.status === 'started' &&
|
|
12
13
|
typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE &&
|
|
13
14
|
// When retrying the download, keep the existing progress line.
|
|
@@ -23,5 +24,6 @@ exports.default = (log$) => {
|
|
|
23
24
|
};
|
|
24
25
|
}));
|
|
25
26
|
}));
|
|
26
|
-
}
|
|
27
|
+
}
|
|
28
|
+
exports.reportBigTarballProgress = reportBigTarballProgress;
|
|
27
29
|
//# sourceMappingURL=reportBigTarballsProgress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportBigTarballsProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportBigTarballsProgress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportBigTarballsProgress.js","sourceRoot":"","sources":["../../src/reporterForClient/reportBigTarballsProgress.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAuD;AACvD,gEAAsC;AACtC,uDAG0B;AAE1B,MAAM,gBAAgB,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,CAAA,CAAC,OAAO;AAEhD,SAAgB,wBAAwB,CACtC,IAEC;IAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC/B,IAAA,kBAAM,EAAC,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS;QAC3D,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,IAAI,gBAAgB;QAC5D,+DAA+D;QAC/D,yDAAyD;QACzD,GAAG,CAAC,OAAO,KAAK,CAAC,CAClB,EACD,IAAA,eAAG,EAAC,CAAC,UAA+B,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,IAAA,sBAAW,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC/B,IAAA,kBAAM,EAAC,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,aAAa,IAAI,GAAG,CAAC,SAAS,KAAK,UAAU,CAAC,WAAW,CAAC,CAAC,EAC/G,IAAA,eAAG,EAAC,CAAC,GAAwB,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EACpD,IAAA,qBAAS,EAAC,CAAC,CAAC,EACZ,IAAA,eAAG,EAAC,CAAC,aAAqB,EAAE,EAAE;YAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,aAAa,CAAA;YACjD,MAAM,UAAU,GAAG,IAAA,sBAAW,EAAC,aAAa,CAAC,CAAA;YAC7C,OAAO;gBACL,KAAK,EAAE,CAAC,IAAI;gBACZ,GAAG,EAAE,eAAe,IAAA,yBAAO,EAAC,UAAU,CAAC,WAAW,CAAC,CAAC,KAAK,IAAA,yBAAO,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAO,EAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;aACvH,CAAA;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AA7BD,4DA6BC"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { ContextLog, PackageImportMethodLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportContext(log$: {
|
|
4
4
|
context: Rx.Observable<ContextLog>;
|
|
5
5
|
packageImportMethod: Rx.Observable<PackageImportMethodLog>;
|
|
6
6
|
}, opts: {
|
|
7
7
|
cwd: string;
|
|
8
|
-
})
|
|
8
|
+
}): Rx.Observable<Rx.Observable<{
|
|
9
9
|
msg: string;
|
|
10
10
|
}>>;
|
|
11
|
-
export default _default;
|
|
@@ -26,11 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.reportContext = void 0;
|
|
29
30
|
const path_1 = __importDefault(require("path"));
|
|
30
31
|
const Rx = __importStar(require("rxjs"));
|
|
31
32
|
const operators_1 = require("rxjs/operators");
|
|
32
33
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
33
|
-
|
|
34
|
+
function reportContext(log$, opts) {
|
|
34
35
|
return Rx.combineLatest(log$.context.pipe((0, operators_1.take)(1)), log$.packageImportMethod.pipe((0, operators_1.take)(1)))
|
|
35
36
|
.pipe((0, operators_1.map)(([context, packageImportMethod]) => {
|
|
36
37
|
if (context.currentLockfileExists) {
|
|
@@ -58,5 +59,6 @@ Packages are ${method} from the content-addressable store to the virtual store.
|
|
|
58
59
|
Virtual store is at: ${(0, normalize_path_1.default)(path_1.default.relative(opts.cwd, context.virtualStoreDir))}`,
|
|
59
60
|
});
|
|
60
61
|
}));
|
|
61
|
-
}
|
|
62
|
+
}
|
|
63
|
+
exports.reportContext = reportContext;
|
|
62
64
|
//# sourceMappingURL=reportContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportContext.js","sourceRoot":"","sources":["../../src/reporterForClient/reportContext.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportContext.js","sourceRoot":"","sources":["../../src/reporterForClient/reportContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AAEvB,yCAA0B;AAC1B,8CAA0C;AAC1C,oEAAsC;AAEtC,SAAgB,aAAa,CAC3B,IAGC,EACD,IAAqB;IAErB,OAAO,EAAE,CAAC,aAAa,CACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,CAAC,CAAC,CAAC,EAC1B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAA,gBAAI,EAAC,CAAC,CAAC,CAAC,CACvC;SACE,IAAI,CACH,IAAA,eAAG,EACD,CAAC,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,EAAE;QACjC,IAAI,OAAO,CAAC,qBAAqB,EAAE;YACjC,OAAO,EAAE,CAAC,KAAK,CAAA;SAChB;QACD,IAAI,MAAe,CAAA;QACnB,QAAQ,mBAAmB,CAAC,MAAM,EAAE;YACpC,KAAK,MAAM;gBACT,MAAM,GAAG,QAAQ,CAAA;gBACjB,MAAK;YACP,KAAK,OAAO;gBACV,MAAM,GAAG,QAAQ,CAAA;gBACjB,MAAK;YACP,KAAK,UAAU;gBACb,MAAM,GAAG,aAAa,CAAA;gBACtB,MAAK;YACP;gBACE,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAA;gBACnC,MAAK;SACN;QACD,OAAO,EAAE,CAAC,EAAE,CAAC;YACX,GAAG,EAAE;eACF,MAAM;qCACgB,OAAO,CAAC,QAAQ;qCAChB,IAAA,wBAAS,EAAC,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE;SACvF,CAAC,CAAA;IACJ,CAAC,CACF,CACF,CAAA;AACL,CAAC;AAzCD,sCAyCC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { DeprecationLog } from '@pnpm/core-loggers';
|
|
2
2
|
import * as Rx from 'rxjs';
|
|
3
|
-
declare
|
|
3
|
+
export declare function reportDeprecations(deprecation$: Rx.Observable<DeprecationLog>, opts: {
|
|
4
4
|
cwd: string;
|
|
5
5
|
isRecursive: boolean;
|
|
6
|
-
})
|
|
6
|
+
}): Rx.Observable<Rx.Observable<{
|
|
7
7
|
msg: string;
|
|
8
8
|
}>>;
|
|
9
|
-
export default _default;
|
|
@@ -26,21 +26,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.reportDeprecations = void 0;
|
|
29
30
|
const Rx = __importStar(require("rxjs"));
|
|
30
31
|
const operators_1 = require("rxjs/operators");
|
|
31
32
|
const chalk_1 = __importDefault(require("chalk"));
|
|
32
|
-
const formatWarn_1 =
|
|
33
|
+
const formatWarn_1 = require("./utils/formatWarn");
|
|
33
34
|
const zooming_1 = require("./utils/zooming");
|
|
34
|
-
|
|
35
|
+
function reportDeprecations(deprecation$, opts) {
|
|
35
36
|
return deprecation$.pipe((0, operators_1.map)((log) => {
|
|
36
37
|
if (!opts.isRecursive && log.prefix === opts.cwd) {
|
|
37
38
|
return Rx.of({
|
|
38
|
-
msg: (0, formatWarn_1.
|
|
39
|
+
msg: (0, formatWarn_1.formatWarn)(`${chalk_1.default.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`),
|
|
39
40
|
});
|
|
40
41
|
}
|
|
41
42
|
return Rx.of({
|
|
42
|
-
msg: (0, zooming_1.zoomOut)(opts.cwd, log.prefix, (0, formatWarn_1.
|
|
43
|
+
msg: (0, zooming_1.zoomOut)(opts.cwd, log.prefix, (0, formatWarn_1.formatWarn)(`${chalk_1.default.red('deprecated')} ${log.pkgName}@${log.pkgVersion}`)),
|
|
43
44
|
});
|
|
44
45
|
}));
|
|
45
|
-
}
|
|
46
|
+
}
|
|
47
|
+
exports.reportDeprecations = reportDeprecations;
|
|
46
48
|
//# sourceMappingURL=reportDeprecations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportDeprecations.js","sourceRoot":"","sources":["../../src/reporterForClient/reportDeprecations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportDeprecations.js","sourceRoot":"","sources":["../../src/reporterForClient/reportDeprecations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,8CAAoC;AACpC,kDAAyB;AACzB,mDAA+C;AAC/C,6CAAyC;AAEzC,SAAgB,kBAAkB,CAChC,YAA2C,EAC3C,IAGC;IAED,OAAO,YAAY,CAAC,IAAI,CACtB,IAAA,eAAG,EAAC,CAAC,GAAG,EAAE,EAAE;QACV,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,GAAG,EAAE;YAChD,OAAO,EAAE,CAAC,EAAE,CAAC;gBACX,GAAG,EAAE,IAAA,uBAAU,EAAC,GAAG,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,CAAC,UAAU,EAAE,CAAC;aAClG,CAAC,CAAA;SACH;QACD,OAAO,EAAE,CAAC,EAAE,CAAC;YACX,GAAG,EAAE,IAAA,iBAAO,EAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,IAAA,uBAAU,EAAC,GAAG,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;SAC9G,CAAC,CAAA;IACJ,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AAnBD,gDAmBC"}
|