diff options
Diffstat (limited to 'lib/commands/diff.js')
-rw-r--r-- | lib/commands/diff.js | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/commands/diff.js b/lib/commands/diff.js index 3134f502e..d737a58dc 100644 --- a/lib/commands/diff.js +++ b/lib/commands/diff.js @@ -1,13 +1,11 @@ const { resolve } = require('path') - const semver = require('semver') const libnpmdiff = require('libnpmdiff') const npa = require('npm-package-arg') const Arborist = require('@npmcli/arborist') -const npmlog = require('npmlog') const pacote = require('pacote') const pickManifest = require('npm-pick-manifest') - +const log = require('../utils/log-shim') const readPackageName = require('../utils/read-package-name.js') const BaseCommand = require('../base-command.js') @@ -57,7 +55,7 @@ class Diff extends BaseCommand { } const [a, b] = await this.retrieveSpecs(specs) - npmlog.info('diff', { src: a, dst: b }) + log.info('diff', { src: a, dst: b }) const res = await libnpmdiff([a, b], { ...this.npm.flatOptions, @@ -83,7 +81,7 @@ class Diff extends BaseCommand { try { name = await readPackageName(this.prefix) } catch (e) { - npmlog.verbose('diff', 'could not read project dir package.json') + log.verbose('diff', 'could not read project dir package.json') } if (!name) { @@ -116,7 +114,7 @@ class Diff extends BaseCommand { try { pkgName = await readPackageName(this.prefix) } catch (e) { - npmlog.verbose('diff', 'could not read project dir package.json') + log.verbose('diff', 'could not read project dir package.json') noPackageJson = true } @@ -154,7 +152,7 @@ class Diff extends BaseCommand { actualTree.inventory.query('name', spec.name) .values().next().value } catch (e) { - npmlog.verbose('diff', 'failed to load actual install tree') + log.verbose('diff', 'failed to load actual install tree') } if (!node || !node.name || !node.package || !node.package.version) { @@ -227,7 +225,7 @@ class Diff extends BaseCommand { try { pkgName = await readPackageName(this.prefix) } catch (e) { - npmlog.verbose('diff', 'could not read project dir package.json') + log.verbose('diff', 'could not read project dir package.json') } if (!pkgName) { @@ -261,7 +259,7 @@ class Diff extends BaseCommand { const arb = new Arborist(opts) actualTree = await arb.loadActual(opts) } catch (e) { - npmlog.verbose('diff', 'failed to load actual install tree') + log.verbose('diff', 'failed to load actual install tree') } return specs.map(i => { |