@pnpm/default-reporter 8.5.13 → 8.5.16
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/lib/reportError.js +13 -1
- package/lib/reportError.js.map +1 -1
- package/lib/reporterForClient/index.js +41 -14
- package/lib/reporterForClient/index.js.map +1 -1
- package/lib/reporterForClient/reportMisc.d.ts +1 -0
- package/lib/reporterForClient/reportMisc.js +4 -3
- package/lib/reporterForClient/reportMisc.js.map +1 -1
- package/package.json +3 -3
package/lib/reportError.js
CHANGED
|
@@ -311,9 +311,21 @@ function hideSecureInfo(key, value) {
|
|
|
311
311
|
return value;
|
|
312
312
|
}
|
|
313
313
|
function reportPeerDependencyIssuesError(err, msg) {
|
|
314
|
+
const hasMissingPeers = getHasMissingPeers(msg.issuesByProjects);
|
|
315
|
+
const hints = [];
|
|
316
|
+
if (hasMissingPeers) {
|
|
317
|
+
hints.push('If you want peer dependencies to be automatically installed, set the "auto-install-peers" setting to "true".');
|
|
318
|
+
}
|
|
319
|
+
hints.push('If you don\'t want pnpm to fail on peer dependency issues, set the "strict-peer-dependencies" setting to "false".');
|
|
314
320
|
return {
|
|
315
321
|
title: err.message,
|
|
316
|
-
body: (0, render_peer_issues_1.default)(msg.issuesByProjects)
|
|
322
|
+
body: `${(0, render_peer_issues_1.default)(msg.issuesByProjects)}
|
|
323
|
+
${hints.map((hint) => `hint: ${hint}`).join('\n')}
|
|
324
|
+
`,
|
|
317
325
|
};
|
|
318
326
|
}
|
|
327
|
+
function getHasMissingPeers(issuesByProjects) {
|
|
328
|
+
return Object.values(issuesByProjects)
|
|
329
|
+
.some((issues) => Object.values(issues.missing).flat().some(({ optional }) => !optional));
|
|
330
|
+
}
|
|
319
331
|
//# sourceMappingURL=reportError.js.map
|
package/lib/reportError.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportError.js","sourceRoot":"","sources":["../src/reportError.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"reportError.js","sourceRoot":"","sources":["../src/reportError.ts"],"names":[],"mappings":";;;;;AAGA,kFAAuD;AAEvD,kDAAyB;AACzB,8DAAqC;AACrC,8DAAqC;AACrC,2CAAiC;AAEjC,qBAAW,CAAC,eAAe,GAAG;IAC5B,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,GAAG;IACT,UAAU,EAAE,EAAE;CACf,CAAA;AAED,MAAM,SAAS,GAAG,eAAK,CAAC,MAAM,CAAA;AAC9B,MAAM,SAAS,GAAG,eAAK,CAAC,IAAI,CAAA;AAE5B,SAAwB,WAAW,CAAE,MAAW,EAAE,MAAe;IAC/D,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9C,IAAI,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IACvE,IAAI,SAAS,CAAC,IAAI,EAAE;QAClB,MAAM,IAAI,OAAO,SAAS,CAAC,IAAI,EAAE,CAAA;KAClC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAPD,8BAOC;AAED,SAAS,YAAY,CAAE,MAAW,EAAE,MAAe;;IAIjD,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;QACjB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAoC,CAAA;QAC5D,QAAQ,GAAG,CAAC,IAAI,EAAE;YAClB,KAAK,2BAA2B;gBAC9B,OAAO,qBAAqB,CAAC,GAAG,EAAE,MAAa,CAAC,CAAA,CAAC,yDAAyD;YAC5G,KAAK,mCAAmC;gBACtC,OAAO,+BAA+B,CAAC,GAAG,EAAE,MAAa,CAAC,CAAA,CAAC,yDAAyD;YACtH,KAAK,gCAAgC;gBACnC,OAAO,yBAAyB,CAAC,MAAa,CAAC,CAAA,CAAC,yDAAyD;YAC3G,KAAK,kCAAkC;gBACrC,OAAO,2BAA2B,CAAC,MAAa,CAAC,CAAA,CAAC,yDAAyD;YAC7G,KAAK,8BAA8B;gBACjC,OAAO,wBAAwB,CAAC,MAAa,CAAC,CAAA,CAAC,yDAAyD;YAC1G,KAAK,mCAAmC;gBACtC,OAAO,4BAA4B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YAClD,KAAK,kCAAkC;gBACrC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAA;YAC/B,KAAK,8BAA8B;gBACjC,OAAO,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YAC7C,KAAK,yBAAyB;gBAC5B,OAAO,6BAA6B,CAAC,MAAa,CAAC,CAAA,CAAC,yDAAyD;YAC/G,KAAK,2BAA2B;gBAC9B,OAAO,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YAC1C,KAAK,YAAY;gBACf,OAAO,oBAAoB,CAAC,MAAa,CAAC,CAAA,CAAC,yDAAyD;YACtG,KAAK,6BAA6B;gBAChC,OAAO,iBAAiB,CAAC,MAAa,CAAC,CAAA,CAAC,yDAAyD;YACnG,KAAK,0BAA0B;gBAC7B,OAAO,+BAA+B,CAAC,GAAG,EAAE,MAAa,CAAC,CAAA,CAAC,yDAAyD;YACtH,KAAK,oBAAoB,CAAC;YAC1B,KAAK,oBAAoB;gBACvB,OAAO,eAAe,CAAC,GAAG,EAAE,MAAa,EAAE,MAAM,CAAC,CAAA,CAAC,yDAAyD;YAC9G,OAAO,CAAC,CAAC;gBACP,+DAA+D;gBAC/D,IAAI,CAAC,CAAA,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,UAAU,mDAAG,WAAW,CAAC,CAAA,EAAE;oBACxC,OAAO,kBAAkB,CAAC,MAAA,GAAG,CAAC,OAAO,mCAAI,MAAM,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;iBACvE;gBACD,MAAM,WAAW,GAAG,EAAE,CAAA;gBACtB,IAAI,MAAA,MAAM,CAAC,WAAW,CAAC,0CAAE,MAAM,EAAE;oBAC/B,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;iBACvD;gBACD,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE;oBAClB,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAW,CAAC,CAAA;iBAC3C;gBACD,OAAO;oBACL,KAAK,EAAE,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE;oBACxB,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,eAAG,CAAC;iBAC5B,CAAA;aACF;SACA;KACF;IACD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAA;AACrC,CAAC;AAED,SAAS,eAAe,CAAE,SAA+D;IACvF,OAAO;EACP,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO;EACzC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,eAAG,OAAO,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;AAC1F,CAAC;AAED,SAAS,uBAAuB,CAAE,GAAU,EAAE,GAAW;IACvD,MAAM,IAAI,GAIN,GAAG,CAAC,aAAa,CAAC,CAAA;IACtB,IAAI,MAAM,GAAG,yBAAyB,IAAI,CAAC,IAAI,QAAQ,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,eAAG,EAAE,CAAA;IAEzF,IAAI,CAAC,IAAA,gBAAM,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE;QACvD,MAAM,IAAI,eAAG,GAAG,qBAAqB,GAAG,eAAG,CAAA;QAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,MAAM,IAAI,OAAO,GAAG,KAAK,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,GAAG,eAAG,EAAE,CAAA;aACxD;SACF;KACF;IAED,MAAM,IAAI,GAAG,eAAG,oCAAoC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,wCAAwC,IAAI,CAAC,IAAI,aAAa,CAAA;IAEnJ,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,SAAS,qBAAqB,CAC5B,GAAU,EACV,GAIC;IAED,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,IAAI,EAAE,wBAAwB,GAAG,CAAC,UAAU,6CAA6C,GAAG,CAAC,iBAAiB;;sCAE5E,GAAG,CAAC,eAAe;;;;;iGAKwC;KAC9F,CAAA;AACH,CAAC;AAED,SAAS,+BAA+B,CACtC,GAAU,EACV,GAIC;IAED,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,IAAI,EAAE,wBAAwB,GAAG,CAAC,UAAU,kEAAkE,GAAG,CAAC,QAAQ;;8CAEhF,GAAG,CAAC,MAAM;;;;iGAIyC;KAC9F,CAAA;AACH,CAAC;AAED,SAAS,yBAAyB,CAAE,GAKnC;IACC,IAAI,MAAM,GAAG,eAAe,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC;;6CAET,CAAA;IAE3C,IAAI,GAAG,CAAC,qBAAqB,EAAE;QAC7B,MAAM,GAAG,GAAG,MAAM,GAAG,eAAG,GAAG,eAAG,GAAG,GAAG,CAAC,qBAAqB,EAAE,CAAA;KAC7D;IAED,MAAM,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAA;IACnC,OAAO;QACL,KAAK,EAAE,6FAA6F;QACpG,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,SAAS,2BAA2B,CAAE,GAKrC;IACC,IAAI,MAAM,GAAG,sBAAsB,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC;;MAEzD,SAAS,CAAC,cAAc,CAAC,4BAA4B,CAAA;IAEzD,IAAI,GAAG,CAAC,qBAAqB,EAAE;QAC7B,MAAM,GAAG,GAAG,MAAM,GAAG,eAAG,GAAG,eAAG,GAAG,GAAG,CAAC,qBAAqB,EAAE,CAAA;KAC7D;IAED,MAAM,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAA;IACnC,OAAO;QACL,KAAK,EAAE,yFAAyF;QAChG,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB,CAAE,GAG9B;IACC,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,GAAG,CAAC,SAAS;QAAE,OAAO,MAAM,CAAA;IAEtD,MAAM,IAAI,eAAG,CAAA;IAEb,IAAI,GAAG,CAAC,YAAY,EAAE;QACpB,MAAM,IAAI,eAAG,GAAG,kBAAkB,SAAS,CAAC,uCAAuC,GAAG,CAAC,YAAY,EAAE,CAAC,EAAE,CAAA;KACzG;IAED,IAAI,GAAG,CAAC,SAAS,EAAE;QACjB,MAAM,IAAI,eAAG,GAAG,eAAe,SAAS,CAAC,qCAAqC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,CAAA;KACjG;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,kBAAkB,CAAE,YAAoB,EAAE,KAAa;IAC9D,IAAI,KAAK,EAAE;QACT,IAAI,WAA+B,CAAA;QACnC,IAAI;YACF,WAAW,GAAG,IAAI,qBAAW,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAA;SAC/C;QAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;YACzC,WAAW,GAAG,SAAS,CAAA;SACxB;QACD,IAAI,WAAW,EAAE;YACf,OAAO;gBACL,KAAK,EAAE,YAAY;gBACnB,IAAI,EAAE,WAAW;aAClB,CAAA;SACF;KACF;IACD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAA;AAChC,CAAC;AAED,SAAS,kBAAkB,CAAE,OAAe,EAAE,IAAa;IACzD,OAAO,GAAG,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,OAAO,QAAQ,CAAC,IAAI,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;AACvF,CAAC;AAED,SAAS,wBAAwB,CAAE,GAA2B;IAC5D,OAAO;QACL,KAAK,EAAE,yCAAyC;QAChD,IAAI,EAAE;EACR,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,eAAG,CAAC;;cAEvD,SAAS,CAAC,sBAAsB,CAAC,mCAAmC;KAC/E,CAAA;AACH,CAAC;AAED,SAAS,4BAA4B,CAAE,GAAU,EAAE,GAAW;IAC5D,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,IAAI,EAAE,gBAAgB,SAAS,CAAC,SAAS,CAAC,sCAAsC;KACjF,CAAA;AACH,CAAC;AAED,SAAS,6BAA6B,CAAE,GAA+D;IACrG,MAAM,MAAM,GAAG,eAAG,GAAG,YAAY,eAAK,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,KAAK,GAAG,CAAC,MAAM,SAAS,GAAG,eAAG,GAAG,eAAG;QACzG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM,GAAG,GAAG,GAAG,eAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACnE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAG,GAAG,eAAG,CAAC,CAAA;IACpB,OAAO;QACL,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB,CAAE,GAAU,EAAE,GAAW;IACpD,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,IAAI,EAAE;;;;;;;;;;;;;yEAa+D;KACtE,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,GAGC;IAED,IAAI,GAAG,CAAC,KAAK,KAAK,MAAM,EAAE;QACxB,OAAO,EAAE,KAAK,EAAE,0CAA0C,EAAE,CAAA;KAC7D;IACD,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE;QACjC,OAAO,EAAE,KAAK,EAAE,iCAAiC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAA;KAChE;IACD,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAA;AACrC,CAAC;AAED,SAAS,iBAAiB,CACxB,GAWC;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;QACnB,MAAM,IAAI;0CAC4B,GAAG,CAAC,SAAS;;oBAEnC,GAAG,CAAC,MAAM,CAAC,IAAI;OAC5B,GAAG,CAAC,OAAO,CAAC,IAAI;;;;;;2CAMoB,CAAA;KACxC;IACD,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;QACnB,IAAI,MAAM;YAAE,MAAM,IAAI,eAAG,GAAG,eAAG,CAAA;QAC/B,MAAM,IAAI;0CAC4B,GAAG,CAAC,SAAS;;oBAEnC,GAAG,CAAC,MAAM,CAAC,IAAI;OAC5B,GAAG,CAAC,OAAO,CAAC,IAAI;;;sDAG+B,CAAA;KACnD;IACD,OAAO;QACL,KAAK,EAAE,2DAA2D;QAClE,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,SAAS,eAAe,CACtB,GAAU,EACV,GAAsB,EACtB,MAAe;;IAEf,MAAM,aAAa,GAAG,EAAc,CAAA;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,EAAE,CAAC,EAAE;QAClE,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvB,4EAA4E;YAC5E,aAAa,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAA;YACrC,SAAQ;SACT;QACD,IACE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;YACrB,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1B,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;YACxB,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;YACzB,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,EAC3B;YACA,aAAa,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAA;SAC3D;KACF;IACD,IAAI,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,GAAG,eAAG,GAAG,eAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAEtD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,MAAM,IAAI;;sDAEwC,CAAA;KACnD;SAAM;QACL,MAAM,IAAI;EACZ,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;KACzB;IACD,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,SAAS,cAAc,CAAE,GAAW,EAAE,KAAa;IACjD,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;QAAE,OAAO,UAAU,CAAA;IAChD,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,CAAA;IAClG,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,+BAA+B,CACtC,GAAU,EACV,GAAyD;IAEzD,MAAM,eAAe,GAAG,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;IAChE,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,IAAI,eAAe,EAAE;QACnB,KAAK,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAA;KAC3H;IACD,KAAK,CAAC,IAAI,CAAC,mHAAmH,CAAC,CAAA;IAC/H,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,OAAO;QAClB,IAAI,EAAE,GAAG,IAAA,4BAAgB,EAAC,GAAG,CAAC,gBAAgB,CAAC;EACjD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;CAChD;KACE,CAAA;AACH,CAAC;AAED,SAAS,kBAAkB,CAAE,gBAAgD;IAC3E,OAAO,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;SACnC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;AAC7F,CAAC"}
|
|
@@ -1,4 +1,27 @@
|
|
|
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
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -10,7 +33,7 @@ const reportDeprecations_1 = __importDefault(require("./reportDeprecations"));
|
|
|
10
33
|
const reportHooks_1 = __importDefault(require("./reportHooks"));
|
|
11
34
|
const reportInstallChecks_1 = __importDefault(require("./reportInstallChecks"));
|
|
12
35
|
const reportLifecycleScripts_1 = __importDefault(require("./reportLifecycleScripts"));
|
|
13
|
-
const reportMisc_1 =
|
|
36
|
+
const reportMisc_1 = __importStar(require("./reportMisc"));
|
|
14
37
|
const reportPeerDependencyIssues_1 = __importDefault(require("./reportPeerDependencyIssues"));
|
|
15
38
|
const reportProgress_1 = __importDefault(require("./reportProgress"));
|
|
16
39
|
const reportRequestRetry_1 = __importDefault(require("./reportRequestRetry"));
|
|
@@ -20,25 +43,19 @@ const reportStats_1 = __importDefault(require("./reportStats"));
|
|
|
20
43
|
const reportSummary_1 = __importDefault(require("./reportSummary"));
|
|
21
44
|
const reportUpdateCheck_1 = __importDefault(require("./reportUpdateCheck"));
|
|
22
45
|
function default_1(log$, opts) {
|
|
23
|
-
var _a, _b, _c, _d;
|
|
46
|
+
var _a, _b, _c, _d, _e, _f;
|
|
24
47
|
const width = (_b = (_a = opts.width) !== null && _a !== void 0 ? _a : process.stdout.columns) !== null && _b !== void 0 ? _b : 80;
|
|
25
48
|
const cwd = (_d = (_c = opts.pnpmConfig) === null || _c === void 0 ? void 0 : _c.dir) !== null && _d !== void 0 ? _d : process.cwd();
|
|
26
49
|
const throttle = typeof opts.throttleProgress === 'number' && opts.throttleProgress > 0
|
|
27
50
|
? (0, operators_1.throttleTime)(opts.throttleProgress, undefined, { leading: true, trailing: true })
|
|
28
51
|
: undefined;
|
|
29
52
|
const outputs = [
|
|
30
|
-
(0, reportProgress_1.default)(log$, {
|
|
31
|
-
cwd,
|
|
32
|
-
throttle,
|
|
33
|
-
}),
|
|
34
|
-
(0, reportPeerDependencyIssues_1.default)(log$),
|
|
35
53
|
(0, reportLifecycleScripts_1.default)(log$, {
|
|
36
54
|
appendOnly: opts.appendOnly === true || opts.streamLifecycleOutput,
|
|
37
55
|
aggregateOutput: opts.aggregateOutput,
|
|
38
56
|
cwd,
|
|
39
57
|
width,
|
|
40
58
|
}),
|
|
41
|
-
(0, reportDeprecations_1.default)(log$.deprecation, { cwd, isRecursive: opts.isRecursive }),
|
|
42
59
|
(0, reportMisc_1.default)(log$, {
|
|
43
60
|
appendOnly: opts.appendOnly === true,
|
|
44
61
|
config: opts.config,
|
|
@@ -46,12 +63,6 @@ function default_1(log$, opts) {
|
|
|
46
63
|
logLevel: opts.logLevel,
|
|
47
64
|
zoomOutCurrent: opts.isRecursive,
|
|
48
65
|
}),
|
|
49
|
-
...(0, reportStats_1.default)(log$, {
|
|
50
|
-
cmd: opts.cmd,
|
|
51
|
-
cwd,
|
|
52
|
-
isRecursive: opts.isRecursive,
|
|
53
|
-
width,
|
|
54
|
-
}),
|
|
55
66
|
(0, reportInstallChecks_1.default)(log$.installCheck, { cwd }),
|
|
56
67
|
(0, reportRequestRetry_1.default)(log$.requestRetry),
|
|
57
68
|
(0, reportScope_1.default)(log$.scope, { isRecursive: opts.isRecursive, cmd: opts.cmd }),
|
|
@@ -60,6 +71,22 @@ function default_1(log$, opts) {
|
|
|
60
71
|
(0, reportContext_1.default)(log$, { cwd }),
|
|
61
72
|
(0, reportUpdateCheck_1.default)(log$.updateCheck),
|
|
62
73
|
];
|
|
74
|
+
// logLevelNumber: 0123 = error warn info debug
|
|
75
|
+
const logLevelNumber = (_f = reportMisc_1.LOG_LEVEL_NUMBER[(_e = opts.logLevel) !== null && _e !== void 0 ? _e : 'info']) !== null && _f !== void 0 ? _f : reportMisc_1.LOG_LEVEL_NUMBER['info'];
|
|
76
|
+
if (logLevelNumber >= reportMisc_1.LOG_LEVEL_NUMBER.warn) {
|
|
77
|
+
outputs.push((0, reportPeerDependencyIssues_1.default)(log$), (0, reportDeprecations_1.default)(log$.deprecation, { cwd, isRecursive: opts.isRecursive }));
|
|
78
|
+
}
|
|
79
|
+
if (logLevelNumber >= reportMisc_1.LOG_LEVEL_NUMBER.info) {
|
|
80
|
+
outputs.push((0, reportProgress_1.default)(log$, {
|
|
81
|
+
cwd,
|
|
82
|
+
throttle,
|
|
83
|
+
}), ...(0, reportStats_1.default)(log$, {
|
|
84
|
+
cmd: opts.cmd,
|
|
85
|
+
cwd,
|
|
86
|
+
isRecursive: opts.isRecursive,
|
|
87
|
+
width,
|
|
88
|
+
}));
|
|
89
|
+
}
|
|
63
90
|
if (!opts.appendOnly) {
|
|
64
91
|
outputs.push((0, reportBigTarballsProgress_1.default)(log$));
|
|
65
92
|
}
|
|
@@ -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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"}
|
|
@@ -2,6 +2,7 @@ import { Config } from '@pnpm/config';
|
|
|
2
2
|
import { Log, RegistryLog } from '@pnpm/core-loggers';
|
|
3
3
|
import { LogLevel } from '@pnpm/logger';
|
|
4
4
|
import * as Rx from 'rxjs';
|
|
5
|
+
export declare const LOG_LEVEL_NUMBER: Record<LogLevel, number>;
|
|
5
6
|
declare const _default: (log$: {
|
|
6
7
|
registry: Rx.Observable<RegistryLog>;
|
|
7
8
|
other: Rx.Observable<Log>;
|
|
@@ -26,6 +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.LOG_LEVEL_NUMBER = void 0;
|
|
29
30
|
const os_1 = __importDefault(require("os"));
|
|
30
31
|
const Rx = __importStar(require("rxjs"));
|
|
31
32
|
const operators_1 = require("rxjs/operators");
|
|
@@ -33,7 +34,7 @@ const reportError_1 = __importDefault(require("../reportError"));
|
|
|
33
34
|
const formatWarn_1 = __importDefault(require("./utils/formatWarn"));
|
|
34
35
|
const zooming_1 = require("./utils/zooming");
|
|
35
36
|
// eslint-disable:object-literal-sort-keys
|
|
36
|
-
|
|
37
|
+
exports.LOG_LEVEL_NUMBER = {
|
|
37
38
|
error: 0,
|
|
38
39
|
warn: 1,
|
|
39
40
|
info: 2,
|
|
@@ -43,9 +44,9 @@ const LOG_LEVEL_NUMBER = {
|
|
|
43
44
|
const MAX_SHOWN_WARNINGS = 5;
|
|
44
45
|
exports.default = (log$, opts) => {
|
|
45
46
|
var _a, _b;
|
|
46
|
-
const maxLogLevel = (_b = LOG_LEVEL_NUMBER[(_a = opts.logLevel) !== null && _a !== void 0 ? _a : 'info']) !== null && _b !== void 0 ? _b : LOG_LEVEL_NUMBER['info'];
|
|
47
|
+
const maxLogLevel = (_b = exports.LOG_LEVEL_NUMBER[(_a = opts.logLevel) !== null && _a !== void 0 ? _a : 'info']) !== null && _b !== void 0 ? _b : exports.LOG_LEVEL_NUMBER['info'];
|
|
47
48
|
const reportWarning = makeWarningReporter(opts);
|
|
48
|
-
return Rx.merge(log$.registry, log$.other).pipe((0, operators_1.filter)((obj) => LOG_LEVEL_NUMBER[obj.level] <= maxLogLevel &&
|
|
49
|
+
return Rx.merge(log$.registry, log$.other).pipe((0, operators_1.filter)((obj) => exports.LOG_LEVEL_NUMBER[obj.level] <= maxLogLevel &&
|
|
49
50
|
(obj.level !== 'info' || !obj['prefix'] || obj['prefix'] === opts.cwd)), (0, operators_1.map)((obj) => {
|
|
50
51
|
switch (obj.level) {
|
|
51
52
|
case 'warn': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportMisc.js","sourceRoot":"","sources":["../../src/reporterForClient/reportMisc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reportMisc.js","sourceRoot":"","sources":["../../src/reporterForClient/reportMisc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/default-reporter",
|
|
3
|
-
"version": "8.5.
|
|
3
|
+
"version": "8.5.16",
|
|
4
4
|
"description": "The default reporter of pnpm",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@pnpm/logger": "^4.0.0"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@pnpm/config": "13.13.
|
|
27
|
+
"@pnpm/config": "13.13.3",
|
|
28
28
|
"@pnpm/core-loggers": "6.1.4",
|
|
29
29
|
"@pnpm/error": "2.1.0",
|
|
30
30
|
"@pnpm/render-peer-issues": "1.1.2",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"strip-ansi": "^6.0.0"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@pnpm/default-reporter": "8.5.
|
|
47
|
+
"@pnpm/default-reporter": "8.5.16",
|
|
48
48
|
"@pnpm/logger": "^4.0.0",
|
|
49
49
|
"@types/normalize-path": "^3.0.0",
|
|
50
50
|
"@types/ramda": "0.27.39",
|