Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Previously, `npmlog` was attempting to enable the progress bar even when
logs were paused. This displayed the most recent log (most often an
error) for the rest of the process.

Fixes #4527
  • Loading branch information
lukekarrys committed Oct 19, 2022
1 parent 332914b commit 88137a3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 17 deletions.
6 changes: 1 addition & 5 deletions node_modules/npmlog/lib/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,12 @@ log.setGaugeTemplate = function (template) {
}

log.enableProgress = function () {
if (this.progressEnabled) {
if (this.progressEnabled || this._paused) {
return
}

this.progressEnabled = true
this.tracker.on('change', this.showProgress)
if (this._paused) {
return
}

this.gauge.enable()
}

Expand Down
6 changes: 3 additions & 3 deletions node_modules/npmlog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "GitHub Inc.",
"name": "npmlog",
"description": "logger for npm",
"version": "7.0.0",
"version": "7.0.1",
"repository": {
"type": "git",
"url": "https://github.com/npm/npmlog.git"
Expand Down Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@npmcli/eslint-config": "^4.0.0",
"@npmcli/template-oss": "4.5.1",
"@npmcli/template-oss": "4.6.1",
"tap": "^16.0.1"
},
"license": "ISC",
Expand All @@ -47,6 +47,6 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.5.1"
"version": "4.6.1"
}
}
12 changes: 6 additions & 6 deletions package-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"npm-profile": "^7.0.1",
"npm-registry-fetch": "^14.0.2",
"npm-user-validate": "^1.0.1",
"npmlog": "^7.0.0",
"npmlog": "^7.0.1",
"opener": "^1.5.2",
"p-map": "^4.0.0",
"pacote": "^15.0.2",
Expand Down Expand Up @@ -8409,9 +8409,9 @@
"license": "BSD-2-Clause"
},
"node_modules/npmlog": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.0.tgz",
"integrity": "sha512-p+OVCIQx1Rehplt2DNgBERrKtE5Ej0/rqdcNz5PbohpKHDPprGAl142qQuozmzWUM9uNjvstEO+A92CwytJPcQ==",
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.1.tgz",
"integrity": "sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==",
"inBundle": true,
"dependencies": {
"are-we-there-yet": "^4.0.0",
Expand Down Expand Up @@ -14061,7 +14061,7 @@
"npm-package-arg": "^10.0.0",
"npm-pick-manifest": "^8.0.1",
"npm-registry-fetch": "^14.0.2",
"npmlog": "^7.0.0",
"npmlog": "^7.0.1",
"pacote": "^15.0.2",
"parse-conflict-json": "^3.0.0",
"proc-log": "^3.0.0",
Expand Down Expand Up @@ -14140,7 +14140,7 @@
"@npmcli/run-script": "^5.0.0",
"chalk": "^4.1.0",
"npm-package-arg": "^10.0.0",
"npmlog": "^7.0.0",
"npmlog": "^7.0.1",
"pacote": "^15.0.2",
"proc-log": "^3.0.0",
"read": "^1.0.7",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"npm-profile": "^7.0.1",
"npm-registry-fetch": "^14.0.2",
"npm-user-validate": "^1.0.1",
"npmlog": "^7.0.0",
"npmlog": "^7.0.1",
"opener": "^1.5.2",
"p-map": "^4.0.0",
"pacote": "^15.0.2",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/arborist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"npm-package-arg": "^10.0.0",
"npm-pick-manifest": "^8.0.1",
"npm-registry-fetch": "^14.0.2",
"npmlog": "^7.0.0",
"npmlog": "^7.0.1",
"pacote": "^15.0.2",
"parse-conflict-json": "^3.0.0",
"proc-log": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/libnpmexec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@npmcli/run-script": "^5.0.0",
"chalk": "^4.1.0",
"npm-package-arg": "^10.0.0",
"npmlog": "^7.0.0",
"npmlog": "^7.0.1",
"pacote": "^15.0.2",
"proc-log": "^3.0.0",
"read": "^1.0.7",
Expand Down

0 comments on commit 88137a3

Please sign in to comment.