chore(arborist): remove log option

BREAKING CHANGE: this drops support for the `log` property

13 files changed, 80 insertions, 99 deletions

diff --git a/workspaces/arborist/lib/add-rm-pkg-deps.js b/workspaces/arborist/lib/add-rm-pkg-deps.js
index ae813186f..f59df359e 100644
--- a/workspaces/arborist/lib/add-rm-pkg-deps.js
+++ b/workspaces/arborist/lib/add-rm-pkg-deps.js
@@ -1,10 +1,11 @@
 // add and remove dependency specs to/from pkg manifest
 
+const log = require('proc-log')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 
-const add = ({ pkg, add, saveBundle, saveType, log }) => {
+const add = ({ pkg, add, saveBundle, saveType }) => {
   for (const spec of add) {
-    addSingle({ pkg, spec, saveBundle, saveType, log })
+    addSingle({ pkg, spec, saveBundle, saveType })
   }
 
   return pkg
@@ -20,7 +21,7 @@ const saveTypeMap = new Map([
   ['peer', 'peerDependencies'],
 ])
 
-const addSingle = ({ pkg, spec, saveBundle, saveType, log }) => {
+const addSingle = ({ pkg, spec, saveBundle, saveType }) => {
   const { name, rawSpec } = spec
 
   // if the user does not give us a type, we infer which type(s)
@@ -34,19 +35,19 @@ const addSingle = ({ pkg, spec, saveBundle, saveType, log }) => {
   if (saveType === 'prod') {
     // a production dependency can only exist as production (rpj ensures it
     // doesn't coexist w/ optional)
-    deleteSubKey(pkg, 'devDependencies', name, 'dependencies', log)
-    deleteSubKey(pkg, 'peerDependencies', name, 'dependencies', log)
+    deleteSubKey(pkg, 'devDependencies', name, 'dependencies')
+    deleteSubKey(pkg, 'peerDependencies', name, 'dependencies')
   } else if (saveType === 'dev') {
     // a dev dependency may co-exist as peer, or optional, but not production
-    deleteSubKey(pkg, 'dependencies', name, 'devDependencies', log)
+    deleteSubKey(pkg, 'dependencies', name, 'devDependencies')
   } else if (saveType === 'optional') {
     // an optional dependency may co-exist as dev (rpj ensures it doesn't
     // coexist w/ prod)
-    deleteSubKey(pkg, 'peerDependencies', name, 'optionalDependencies', log)
+    deleteSubKey(pkg, 'peerDependencies', name, 'optionalDependencies')
   } else { // peer or peerOptional is all that's left
     // a peer dependency may coexist as dev
-    deleteSubKey(pkg, 'dependencies', name, 'peerDependencies', log)
-    deleteSubKey(pkg, 'optionalDependencies', name, 'peerDependencies', log)
+    deleteSubKey(pkg, 'dependencies', name, 'peerDependencies')
+    deleteSubKey(pkg, 'optionalDependencies', name, 'peerDependencies')
   }
 
   const depType = saveTypeMap.get(saveType)
@@ -108,9 +109,9 @@ const hasSubKey = (pkg, depType, name) => {
 }
 
 // Removes a subkey and warns about it if it's being replaced
-const deleteSubKey = (pkg, depType, name, replacedBy, log) => {
+const deleteSubKey = (pkg, depType, name, replacedBy) => {
   if (hasSubKey(pkg, depType, name)) {
-    if (replacedBy && log) {
+    if (replacedBy) {
       log.warn('idealTree', `Removing ${depType}.${name} in favor of ${replacedBy}.${name}`)
     }
     delete pkg[depType][name]
diff --git a/workspaces/arborist/lib/arborist/build-ideal-tree.js b/workspaces/arborist/lib/arborist/build-ideal-tree.js
index 3fedd972f..3f001f9e9 100644
--- a/workspaces/arborist/lib/arborist/build-ideal-tree.js
+++ b/workspaces/arborist/lib/arborist/build-ideal-tree.js
@@ -14,6 +14,7 @@ const fs = require('fs')
 const lstat = promisify(fs.lstat)
 const readlink = promisify(fs.readlink)
 const { depth } = require('treeverse')
+const log = require('proc-log')
 
 const {
   OK,
@@ -248,7 +249,7 @@ module.exports = cls => class IdealTreeBuilder extends cls {
       try {
         c()
       } catch (er) {
-        this.log.warn(er.code, er.message, {
+        log.warn(er.code, er.message, {
           package: er.pkgid,
           required: er.required,
           current: er.current,
@@ -532,7 +533,6 @@ Try using the package name instead, e.g:
         saveBundle,
         saveType,
         path: this.path,
-        log: this.log,
       })
     })
   }
@@ -602,7 +602,7 @@ Try using the package name instead, e.g:
         // be printed by npm-audit-report as if they can be fixed, because
         // they can't.
         if (bundler) {
-          this.log.warn(`audit fix ${node.name}@${node.version}`,
+          log.warn(`audit fix ${node.name}@${node.version}`,
             `${node.location}\nis a bundled dependency of\n${
             bundler.name}@${bundler.version} at ${bundler.location}\n` +
             'It cannot be fixed automatically.\n' +
@@ -637,14 +637,14 @@ Try using the package name instead, e.g:
           if (!node.isProjectRoot && !node.isWorkspace) {
             // not something we're going to fix, sorry.  have to cd into
             // that directory and fix it yourself.
-            this.log.warn('audit', 'Manual fix required in linked project ' +
+            log.warn('audit', 'Manual fix required in linked project ' +
               `at ./${node.location} for ${name}@${simpleRange}.\n` +
               `'cd ./${node.location}' and run 'npm audit' for details.`)
             continue
           }
 
           if (!fixAvailable) {
-            this.log.warn('audit', `No fix available for ${name}@${simpleRange}`)
+            log.warn('audit', `No fix available for ${name}@${simpleRange}`)
             continue
           }
 
@@ -652,7 +652,7 @@ Try using the package name instead, e.g:
           const breakingMessage = isSemVerMajor
             ? 'a SemVer major change'
             : 'outside your stated dependency range'
-          this.log.warn('audit', `Updating ${name} to ${version},` +
+          log.warn('audit', `Updating ${name} to ${version},` +
             `which is ${breakingMessage}.`)
 
           await this[_add](node, { add: [`${name}@${version}`] })
@@ -727,7 +727,7 @@ Try using the package name instead, e.g:
     const heading = ancient ? 'ancient lockfile' : 'old lockfile'
     if (ancient || !this.options.lockfileVersion ||
         this.options.lockfileVersion >= defaultLockfileVersion) {
-      this.log.warn(heading,
+      log.warn(heading,
         `
 The ${meta.type} file was created with an old version of npm,
 so supplemental metadata must be fetched from the registry.
@@ -744,7 +744,7 @@ This is a one-time fix-up, please be patient...
       }
 
       queue.push(async () => {
-        this.log.silly('inflate', node.location)
+        log.silly('inflate', node.location)
         const { resolved, version, path, name, location, integrity } = node
         // don't try to hit the registry for linked deps
         const useResolved = resolved && (
@@ -764,7 +764,7 @@ This is a one-time fix-up, please be patient...
           node.package = { ...mani, _id: `${mani.name}@${mani.version}` }
         }).catch((er) => {
           const warning = `Could not fetch metadata for ${name}@${id}`
-          this.log.warn(heading, warning, er)
+          log.warn(heading, warning, er)
         })
         this.finishTracker(t)
       })
@@ -793,7 +793,7 @@ This is a one-time fix-up, please be patient...
     this[_depsQueue].push(tree)
     // XXX also push anything that depends on a node with a name
     // in the override list
-    this.log.silly('idealTree', 'buildDeps')
+    log.silly('idealTree', 'buildDeps')
     this.addTracker('idealTree', tree.name, '')
     return this[_buildDepStep]()
       .then(() => process.emit('timeEnd', 'idealTree:buildDeps'))
@@ -1232,7 +1232,7 @@ This is a one-time fix-up, please be patient...
     if (this[_manifests].has(spec.raw)) {
       return this[_manifests].get(spec.raw)
     } else {
-      this.log.silly('fetch manifest', spec.raw)
+      log.silly('fetch manifest', spec.raw)
       const p = pacote.manifest(spec, options)
         .then(mani => {
           this[_manifests].set(spec.raw, mani)
diff --git a/workspaces/arborist/lib/arborist/index.js b/workspaces/arborist/lib/arborist/index.js
index de625e9b7..cb6ef1e0c 100644
--- a/workspaces/arborist/lib/arborist/index.js
+++ b/workspaces/arborist/lib/arborist/index.js
@@ -28,7 +28,6 @@
 
 const { resolve } = require('path')
 const { homedir } = require('os')
-const procLog = require('proc-log')
 const { depth } = require('treeverse')
 const { saveTypeMap } = require('../add-rm-pkg-deps.js')
 
@@ -74,7 +73,6 @@ class Arborist extends Base {
       path: options.path || '.',
       cache: options.cache || `${homedir()}/.npm/_cacache`,
       packumentCache: options.packumentCache || new Map(),
-      log: options.log || procLog,
       workspacesEnabled: options.workspacesEnabled !== false,
       lockfileVersion: lockfileVersion(options.lockfileVersion),
     }
@@ -94,7 +92,7 @@ class Arborist extends Base {
 
   // returns an array of the actual nodes for all the workspaces
   workspaceNodes (tree, workspaces) {
-    return getWorkspaceNodes(tree, workspaces, this.log)
+    return getWorkspaceNodes(tree, workspaces)
   }
 
   // returns a set of workspace nodes and all their deps
diff --git a/workspaces/arborist/lib/arborist/rebuild.js b/workspaces/arborist/lib/arborist/rebuild.js
index 1a05e5273..09b4419f5 100644
--- a/workspaces/arborist/lib/arborist/rebuild.js
+++ b/workspaces/arborist/lib/arborist/rebuild.js
@@ -13,6 +13,7 @@ const {
   isNodeGypPackage,
   defaultGypInstallScript,
 } = require('@npmcli/node-gyp')
+const log = require('proc-log')
 
 const boolEnv = b => b ? '1' : ''
 const sortNodes = (a, b) =>
@@ -297,7 +298,7 @@ module.exports = cls => class Builder extends cls {
 
       const timer = `build:run:${event}:${location}`
       process.emit('time', timer)
-      this.log.info('run', pkg._id, event, location, pkg.scripts[event])
+      log.info('run', pkg._id, event, location, pkg.scripts[event])
       const env = {
         npm_package_resolved: resolved,
         npm_package_integrity: integrity,
@@ -319,7 +320,7 @@ module.exports = cls => class Builder extends cls {
       }
       const p = runScript(runOpts).catch(er => {
         const { code, signal } = er
-        this.log.info('run', pkg._id, event, { code, signal })
+        log.info('run', pkg._id, event, { code, signal })
         throw er
       }).then(({ args, code, signal, stdout, stderr }) => {
         this.scriptsRun.add({
@@ -333,7 +334,7 @@ module.exports = cls => class Builder extends cls {
           stdout,
           stderr,
         })
-        this.log.info('run', pkg._id, event, { code, signal })
+        log.info('run', pkg._id, event, { code, signal })
       })
 
       await (this[_doHandleOptionalFailure]
diff --git a/workspaces/arborist/lib/arborist/reify.js b/workspaces/arborist/lib/arborist/reify.js
index 92e2b6960..4bc1c7ee4 100644
--- a/workspaces/arborist/lib/arborist/reify.js
+++ b/workspaces/arborist/lib/arborist/reify.js
@@ -8,6 +8,7 @@ const npa = require('npm-package-arg')
 const semver = require('semver')
 const debug = require('../debug.js')
 const walkUp = require('walk-up-path')
+const log = require('proc-log')
 
 const { dirname, resolve, relative } = require('path')
 const { depth: dfwalk } = require('treeverse')
@@ -390,7 +391,7 @@ module.exports = cls => class Reifier extends cls {
   [_addNodeToTrashList] (node, retire = false) {
     const paths = [node.path, ...node.binPaths]
     const moves = this[_retiredPaths]
-    this.log.silly('reify', 'mark', retire ? 'retired' : 'deleted', paths)
+    log.silly('reify', 'mark', retire ? 'retired' : 'deleted', paths)
     for (const path of paths) {
       if (retire) {
         const retired = retirePath(path)
@@ -413,7 +414,7 @@ module.exports = cls => class Reifier extends cls {
         this[_addNodeToTrashList](diff.actual, true)
       }
     }
-    this.log.silly('reify', 'moves', moves)
+    log.silly('reify', 'moves', moves)
     const movePromises = Object.entries(moves)
       .map(([from, to]) => this[_renamePath](from, to))
     return promiseAllRejectLate(movePromises)
@@ -532,7 +533,7 @@ module.exports = cls => class Reifier extends cls {
     return promiseAllRejectLate(unlinks)
       .then(() => {
         if (failures.length) {
-          this.log.warn('cleanup', 'Failed to remove some directories', failures)
+          log.warn('cleanup', 'Failed to remove some directories', failures)
         }
       })
       .then(() => process.emit('timeEnd', 'reify:rollback:createSparse'))
@@ -624,7 +625,7 @@ module.exports = cls => class Reifier extends cls {
       this[_nmValidated].add(nm)
       return
     }
-    this.log.warn('reify', 'Removing non-directory', nm)
+    log.warn('reify', 'Removing non-directory', nm)
     await rimraf(nm)
   }
 
@@ -647,8 +648,8 @@ module.exports = cls => class Reifier extends cls {
         'please re-try this operation once it completes\n' +
         'so that the damage can be corrected, or perform\n' +
         'a fresh install with no lockfile if the problem persists.'
-      this.log.warn('reify', warning)
-      this.log.verbose('reify', 'unrecognized node in tree', node.path)
+      log.warn('reify', warning)
+      log.verbose('reify', 'unrecognized node in tree', node.path)
       node.parent = null
       node.fsParent = null
       this[_addNodeToTrashList](node)
@@ -691,7 +692,7 @@ module.exports = cls => class Reifier extends cls {
   [_warnDeprecated] (node) {
     const { _id, deprecated } = node.package
     if (deprecated) {
-      this.log.warn('deprecated', `${_id}: ${deprecated}`)
+      log.warn('deprecated', `${_id}: ${deprecated}`)
     }
   }
 
@@ -701,7 +702,7 @@ module.exports = cls => class Reifier extends cls {
     return (node.optional ? p.catch(er => {
       const set = optionalSet(node)
       for (node of set) {
-        this.log.verbose('reify', 'failed optional dependency', node.path)
+        log.verbose('reify', 'failed optional dependency', node.path)
         this[_addNodeToTrashList](node)
       }
     }) : p).then(() => node)
@@ -1129,7 +1130,7 @@ module.exports = cls => class Reifier extends cls {
 
     return promiseAllRejectLate(promises).then(() => {
       if (failures.length) {
-        this.log.warn('cleanup', 'Failed to remove some directories', failures)
+        log.warn('cleanup', 'Failed to remove some directories', failures)
       }
     })
       .then(() => process.emit('timeEnd', 'reify:trash'))
diff --git a/workspaces/arborist/lib/audit-report.js b/workspaces/arborist/lib/audit-report.js
index b7d8249b1..4dc6dd177 100644
--- a/workspaces/arborist/lib/audit-report.js
+++ b/workspaces/arborist/lib/audit-report.js
@@ -13,7 +13,7 @@ const _fixAvailable = Symbol('fixAvailable')
 const _checkTopNode = Symbol('checkTopNode')
 const _init = Symbol('init')
 const _omit = Symbol('omit')
-const procLog = require('proc-log')
+const log = require('proc-log')
 
 const fetch = require('npm-registry-fetch')
 
@@ -98,14 +98,13 @@ class AuditReport extends Map {
     this.calculator = new Calculator(opts)
     this.error = null
     this.options = opts
-    this.log = opts.log || procLog
     this.tree = tree
     this.filterSet = opts.filterSet
   }
 
   async run () {
     this.report = await this[_getReport]()
-    this.log.silly('audit report', this.report)
+    log.silly('audit report', this.report)
     if (this.report) {
       await this[_init]()
     }
@@ -313,7 +312,7 @@ class AuditReport extends Map {
       try {
         // first try the super fast bulk advisory listing
         const body = prepareBulkData(this.tree, this[_omit], this.filterSet)
-        this.log.silly('audit', 'bulk request', body)
+        log.silly('audit', 'bulk request', body)
 
         // no sense asking if we don't have anything to audit,
         // we know it'll be empty
@@ -331,7 +330,7 @@ class AuditReport extends Map {
 
         return await res.json()
       } catch (er) {
-        this.log.silly('audit', 'bulk request failed', String(er.body))
+        log.silly('audit', 'bulk request failed', String(er.body))
         // that failed, try the quick audit endpoint
         const body = prepareData(this.tree, this.options)
         const res = await fetch('/-/npm/v1/security/audits/quick', {
@@ -344,8 +343,8 @@ class AuditReport extends Map {
         return AuditReport.auditToBulk(await res.json())
       }
     } catch (er) {
-      this.log.verbose('audit error', er)
-      this.log.silly('audit error', String(er.body))
+      log.verbose('audit error', er)
+      log.silly('audit error', String(er.body))
       this.error = er
       return null
     } finally {
diff --git a/workspaces/arborist/lib/get-workspace-nodes.js b/workspaces/arborist/lib/get-workspace-nodes.js
index 6db489f69..91002dab5 100644
--- a/workspaces/arborist/lib/get-workspace-nodes.js
+++ b/workspaces/arborist/lib/get-workspace-nodes.js
@@ -1,7 +1,10 @@
 // Get the actual nodes corresponding to a root node's child workspaces,
 // given a list of workspace names.
+
+const log = require('proc-log')
 const relpath = require('./relpath.js')
-const getWorkspaceNodes = (tree, workspaces, log) => {
+
+const getWorkspaceNodes = (tree, workspaces) => {
   const wsMap = tree.workspaces
   if (!wsMap) {
     log.warn('workspaces', 'filter set, but no workspaces present')
diff --git a/workspaces/arborist/lib/shrinkwrap.js b/workspaces/arborist/lib/shrinkwrap.js
index f4af71f47..ead9aed36 100644
--- a/workspaces/arborist/lib/shrinkwrap.js
+++ b/workspaces/arborist/lib/shrinkwrap.js
@@ -33,7 +33,7 @@ const mismatch = (a, b) => a && b && a !== b
 // After calling this.commit(), any nodes not present in the tree will have
 // been removed from the shrinkwrap data as well.
 
-const procLog = require('proc-log')
+const log = require('proc-log')
 const YarnLock = require('./yarn-lock.js')
 const { promisify } = require('util')
 const rimraf = promisify(require('rimraf'))
@@ -329,14 +329,12 @@ class Shrinkwrap {
       newline = '\n',
       shrinkwrapOnly = false,
       hiddenLockfile = false,
-      log = procLog,
       lockfileVersion,
     } = options
 
     this.lockfileVersion = hiddenLockfile ? 3
       : lockfileVersion ? parseInt(lockfileVersion, 10)
       : null
-    this.log = log
     this[_awaitingUpdate] = new Map()
     this.tree = null
     this.path = resolve(path || '.')
@@ -479,9 +477,9 @@ class Shrinkwrap {
       /* istanbul ignore else */
       if (typeof this.filename === 'string') {
         const rel = relpath(this.path, this.filename)
-        this.log.verbose('shrinkwrap', `failed to load ${rel}`, er)
+        log.verbose('shrinkwrap', `failed to load ${rel}`, er)
       } else {
-        this.log.verbose('shrinkwrap', `failed to load ${this.path}`, er)
+        log.verbose('shrinkwrap', `failed to load ${this.path}`, er)
       }
       this.loadingError = er
       this.loadedFromDisk = false
diff --git a/workspaces/arborist/lib/tracker.js b/workspaces/arborist/lib/tracker.js
index b50f06eaa..c2a456e48 100644
--- a/workspaces/arborist/lib/tracker.js
+++ b/workspaces/arborist/lib/tracker.js
@@ -1,20 +1,14 @@
 const _progress = Symbol('_progress')
 const _onError = Symbol('_onError')
-const procLog = require('proc-log')
+const npmlog = require('npmlog')
 
 module.exports = cls => class Tracker extends cls {
   constructor (options = {}) {
     super(options)
-    this.log = options.log || procLog
     this[_progress] = new Map()
   }
 
   addTracker (section, subsection = null, key = null) {
-    // TrackerGroup type object not found
-    if (!this.log.newGroup) {
-      return
-    }
-
     if (section === null || section === undefined) {
       this[_onError](`Tracker can't be null or undefined`)
     }
@@ -31,13 +25,13 @@ module.exports = cls => class Tracker extends cls {
       this[_onError](`Tracker "${section}" already exists`)
     } else if (!hasTracker && subsection === null) {
       // 1. no existing tracker, no subsection
-      // Create a new tracker from this.log
+      // Create a new tracker from npmlog
       // starts progress bar
       if (this[_progress].size === 0) {
-        this.log.enableProgress()
+        npmlog.enableProgress()
       }
 
-      this[_progress].set(section, this.log.newGroup(section))
+      this[_progress].set(section, npmlog.newGroup(section))
     } else if (!hasTracker && subsection !== null) {
       // 2. no parent tracker and subsection
       this[_onError](`Parent tracker "${section}" does not exist`)
@@ -53,11 +47,6 @@ module.exports = cls => class Tracker extends cls {
   }
 
   finishTracker (section, subsection = null, key = null) {
-    // TrackerGroup type object not found
-    if (!this.log.newGroup) {
-      return
-    }
-
     if (section === null || section === undefined) {
       this[_onError](`Tracker can't be null or undefined`)
     }
@@ -88,7 +77,7 @@ module.exports = cls => class Tracker extends cls {
       // remove progress bar if all
       // trackers are finished
       if (this[_progress].size === 0) {
-        this.log.disableProgress()
+        npmlog.disableProgress()
       }
     } else if (!hasTracker && subsection === null) {
       // 1. no existing parent tracker, no subsection
@@ -103,7 +92,7 @@ module.exports = cls => class Tracker extends cls {
   }
 
   [_onError] (msg) {
-    this.log.disableProgress()
+    npmlog.disableProgress()
     throw new Error(msg)
   }
 }
diff --git a/workspaces/arborist/test/add-rm-pkg-deps.js b/workspaces/arborist/test/add-rm-pkg-deps.js
index 54485f7bc..77ea2bd61 100644
--- a/workspaces/arborist/test/add-rm-pkg-deps.js
+++ b/workspaces/arborist/test/add-rm-pkg-deps.js
@@ -10,13 +10,14 @@ t.test('add', t => {
   const file = npa('file@file:/some/path/foo.tgz', '/')
 
   const logs = []
-  const log = {
-    warn: function (...args) {
+  const log = (l, ...args) => {
+    if (l === 'warn') {
       logs.push(args)
-    },
+    }
   }
+  process.on('log', log)
+  t.teardown(() => process.off('log', log))
   t.strictSame(add({
-    log,
     pkg: {
       dependencies: { bar: '1' },
       devDependencies: { foo: '2' },
diff --git a/workspaces/arborist/test/arborist/reify.js b/workspaces/arborist/test/arborist/reify.js
index db4b64c9b..f69547db4 100644
--- a/workspaces/arborist/test/arborist/reify.js
+++ b/workspaces/arborist/test/arborist/reify.js
@@ -1076,6 +1076,7 @@ t.test('scoped registries', async t => {
     registry,
   })
   const kReify = Symbol.for('reifyNode')
+  a.addTracker('reify')
   a.idealTree = new Node({ path })
 
   const node = new Node({
diff --git a/workspaces/arborist/test/get-workspace-nodes.js b/workspaces/arborist/test/get-workspace-nodes.js
index fa259a8fe..3de4d73da 100644
--- a/workspaces/arborist/test/get-workspace-nodes.js
+++ b/workspaces/arborist/test/get-workspace-nodes.js
@@ -4,8 +4,6 @@ const Arborist = require('../lib/arborist/index.js')
 const { resolve } = require('path')
 const path = resolve(__dirname, './fixtures/workspaces-shared-deps-virtual')
 
-const log = require('proc-log')
-
 const warningTracker = () => {
   const list = []
   const onlog = (...msg) => msg[0] === 'warn' && list.push(msg)
@@ -23,7 +21,7 @@ t.before(async () => {
 
 t.test('basic behavior', t => {
   const getLogs = warningTracker()
-  const wsNodes = getWorkspaceNodes(tree, ['a'], log)
+  const wsNodes = getWorkspaceNodes(tree, ['a'])
   t.equal(wsNodes.length, 1)
   t.equal(wsNodes[0], tree.children.get('a').target)
   t.same(getLogs(), [])
@@ -32,7 +30,7 @@ t.test('basic behavior', t => {
 
 t.test('filter set, but no workspaces present', t => {
   const getLogs = warningTracker()
-  const wsNodes = getWorkspaceNodes(tree.children.get('b').target, ['xyz'], log)
+  const wsNodes = getWorkspaceNodes(tree.children.get('b').target, ['xyz'])
   t.same(wsNodes, [])
   t.same(getLogs(), [
     ['warn', 'workspaces', 'filter set, but no workspaces present'],
@@ -42,7 +40,7 @@ t.test('filter set, but no workspaces present', t => {
 
 t.test('name in filter set, but not in workspaces', t => {
   const getLogs = warningTracker()
-  const wsNodes = getWorkspaceNodes(tree, ['xyz'], log)
+  const wsNodes = getWorkspaceNodes(tree, ['xyz'])
   t.same(wsNodes, [])
   t.same(getLogs(), [
     ['warn', 'workspaces', 'xyz in filter set, but not in workspaces'],
@@ -57,7 +55,7 @@ t.test('name in filter set, but no workspace folder present', t => {
   // but if we start moving things around and make a mistake, it's
   // possible to get there.
   tree.children.get('c').target.root = null
-  const wsNodes = getWorkspaceNodes(tree, ['c'], log)
+  const wsNodes = getWorkspaceNodes(tree, ['c'])
   t.same(wsNodes, [])
   t.same(getLogs(), [
     ['warn', 'workspaces', 'c in filter set, but no workspace folder present'],
diff --git a/workspaces/arborist/test/tracker.js b/workspaces/arborist/test/tracker.js
index 03ece91a3..0c2fbb729 100644
--- a/workspaces/arborist/test/tracker.js
+++ b/workspaces/arborist/test/tracker.js
@@ -1,15 +1,6 @@
 const Tracker = require('../lib/tracker.js')(class {})
 const t = require('tap')
 
-const npmlog = {
-  newGroup: () => ({
-    newGroup: () => ({ finish: () => {} }),
-    finish: () => {},
-  }),
-  enableProgress: () => {},
-  disableProgress: () => {},
-}
-
 t.test('no npmlog', t => {
   const tr = new Tracker()
   t.doesNotThrow(() => {
@@ -24,27 +15,27 @@ t.test('no npmlog', t => {
 
 t.test('adds tracker', t => {
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
   })
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.addTracker('testTracker', 'subTracker')
   })
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.addTracker('testTracker', 'subTracker')
     tr.addTracker('testTracker', 'subTracker')
   })
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.addTracker('testTracker', 'subTracker.name', 'subTracker.key')
   })
 
-  const tr = new Tracker({ log: npmlog })
+  const tr = new Tracker()
   t.throws(() => {
     tr.addTracker()
   }, Error, `Tracker can't be null or undefined`)
@@ -70,19 +61,19 @@ t.test('adds tracker', t => {
 
 t.test('finishes tracker', t => {
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.finishTracker('testTracker')
   })
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.addTracker('testTracker', 'subTracker')
     tr.finishTracker('testTracker', 'subTracker')
     tr.finishTracker('testTracker')
   })
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.addTracker('testTracker', 'subTracker.name', 'subTracker.key')
     tr.finishTracker('testTracker', 'subTracker.name', 'subTracker.key')
@@ -90,14 +81,14 @@ t.test('finishes tracker', t => {
   })
 
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('firstTracker')
     tr.addTracker('secondTracker')
     tr.finishTracker('firstTracker')
     tr.finishTracker('secondTracker')
   })
 
-  const tr = new Tracker({ log: npmlog })
+  const tr = new Tracker()
   t.throws(() => {
     tr.finishTracker()
   }, Error, `Tracker can't be null or undefined`)
@@ -109,19 +100,19 @@ t.test('finishes tracker', t => {
   }, Error, `Tracker can't be null or undefined`)
 
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.addTracker('testTracker', 'testChild')
     tr.finishTracker('testTracker')
   })
 
   t.throws(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.finishTracker('testTracker')
   }, Error, 'Tracker "testTracker" does not exist')
 
   t.doesNotThrow(() => {
-    const tr = new Tracker({ log: npmlog })
+    const tr = new Tracker()
     tr.addTracker('testTracker')
     tr.finishTracker('testTracker', 'nonExistentSubTracker')
   })