From 88137a329c8ad418db265dd465768a7cf5ebccb1 Mon Sep 17 00:00:00 2001
From: Luke Karrys <luke@lukekarrys.com>
Date: Tue, 18 Oct 2022 23:00:50 -0700
Subject: [PATCH] deps: npmlog@7.0.1

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
---
 node_modules/npmlog/lib/log.js     |  6 +-----
 node_modules/npmlog/package.json   |  6 +++---
 package-lock.json                  | 12 ++++++------
 package.json                       |  2 +-
 workspaces/arborist/package.json   |  2 +-
 workspaces/libnpmexec/package.json |  2 +-
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/node_modules/npmlog/lib/log.js b/node_modules/npmlog/lib/log.js
index be650c6a42608..38106ea34ae08 100644
--- a/node_modules/npmlog/lib/log.js
+++ b/node_modules/npmlog/lib/log.js
@@ -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()
 }
 
diff --git a/node_modules/npmlog/package.json b/node_modules/npmlog/package.json
index fd0963ead5317..dbcc772d37ab7 100644
--- a/node_modules/npmlog/package.json
+++ b/node_modules/npmlog/package.json
@@ -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"
@@ -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",
@@ -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"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index c8c66317bd348..76fa3dd503293 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -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",
@@ -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",
@@ -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",
@@ -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",
diff --git a/package.json b/package.json
index ad795b8c9f963..c9e98cd255e8f 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json
index 89cbffce6da8a..370a43459e771 100644
--- a/workspaces/arborist/package.json
+++ b/workspaces/arborist/package.json
@@ -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",
diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json
index 2a1b5995fe493..1e0bf68c84459 100644
--- a/workspaces/libnpmexec/package.json
+++ b/workspaces/libnpmexec/package.json
@@ -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",