[v7] Update output of npm install command

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [6.x, 8.x, 10.x, 12.x]
+        node-version: [10.x, 12.x, 13.x]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}

.travis.yml

@@ -5,10 +5,9 @@ os:
   - windows
 
 node_js:
+  - 13
   - 12
   - 10
-  - 8
-  - 6
 
 env: "DEPLOY_VERSION=testing"
 

lib/access.js

@@ -1,18 +1,16 @@
 'use strict'
 /* eslint-disable standard/no-callback-literal */
 
-const BB = require('bluebird')
-
-const figgyPudding = require('figgy-pudding')
-const libaccess = require('libnpm/access')
-const npmConfig = require('./config/figgy-config.js')
+const libaccess = require('libnpmaccess')
+const npm = require('./npm.js')
 const output = require('./utils/output.js')
 const otplease = require('./utils/otplease.js')
 const path = require('path')
-const prefix = require('./npm.js').prefix
-const readPackageJson = BB.promisify(require('read-package-json'))
+const { prefix } = npm
+const { promisify } = require('util')
+const readPackageJson = promisify(require('read-package-json'))
 const usage = require('./utils/usage.js')
-const whoami = require('./whoami.js')
+const getIdentity = require('./utils/get-identity')
 
 module.exports = access
 
@@ -35,10 +33,6 @@ access.subcommands = [
   '2fa-required', '2fa-not-required'
 ]
 
-const AccessConfig = figgyPudding({
-  json: {}
-})
-
 function UsageError (msg = '') {
   throw Object.assign(new Error(
     (msg ? `\nUsage: ${msg}\n\n` : '') +
@@ -75,12 +69,12 @@ access.completion = function (opts, cb) {
 }
 
 function access ([cmd, ...args], cb) {
-  return BB.try(() => {
+  return Promise.resolve().then(() => {
     const fn = access.subcommands.includes(cmd) && access[cmd]
     if (!cmd) { UsageError('Subcommand is required.') }
     if (!fn) { UsageError(`${cmd} is not a recognized subcommand.`) }
 
-    return fn(args, AccessConfig(npmConfig()))
+    return fn(args, { ...npm.flatOptions })
   }).then(
     x => cb(null, x),
     err => err.code === 'EUSAGE' ? cb(err.message) : cb(err)
@@ -96,7 +90,7 @@ access.restricted = ([pkg], opts) => {
 }
 
 access.grant = ([perms, scopeteam, pkg], opts) => {
-  return BB.try(() => {
+  return Promise.resolve().then(() => {
     if (!perms || (perms !== 'read-only' && perms !== 'read-write')) {
       UsageError('First argument must be either `read-only` or `read-write.`')
     }
@@ -117,7 +111,7 @@ access.grant = ([perms, scopeteam, pkg], opts) => {
 }
 
 access.revoke = ([scopeteam, pkg], opts) => {
-  return BB.try(() => {
+  return Promise.resolve().then(() => {
     if (!scopeteam) {
       UsageError('`<scope:team>` argument is required.')
     }
@@ -143,9 +137,11 @@ access['2fa-not-required'] = access.tfaNotRequired = ([pkg], opts) => {
 }
 
 access['ls-packages'] = access.lsPackages = ([owner], opts) => {
-  return (
-    owner ? BB.resolve(owner) : BB.fromNode(cb => whoami([], true, cb))
-  ).then(owner => {
+  const getOwnerPromise = (owner)
+    ? Promise.resolve(owner)
+    : getIdentity(opts)
+
+  return getOwnerPromise(owner).then(owner => {
     return libaccess.lsPackages(owner, opts)
   }).then(pkgs => {
     // TODO - print these out nicely (breaking change)
@@ -162,16 +158,15 @@ access['ls-collaborators'] = access.lsCollaborators = ([pkg, usr], opts) => {
   })
 }
 
-access['edit'] = () => BB.reject(new Error('edit subcommand is not implemented yet'))
+access['edit'] = () => Promise.reject(new Error('edit subcommand is not implemented yet'))
 
 function modifyPackage (pkg, opts, fn, requireScope = true) {
-  return getPackage(pkg, requireScope).then(pkgName =>
-    otplease(opts, opts => fn(pkgName, opts))
-  )
+  return getPackage(pkg, requireScope)
+    .then(pkgName => otplease(opts, opts => fn(pkgName, opts)))
 }
 
 function getPackage (name, requireScope = true) {
-  return BB.try(() => {
+  return Promise.resolve().then(() => {
     if (name && name.trim()) {
       return name.trim()
     } else {

lib/adduser.js

@@ -11,7 +11,7 @@ try {
 
 adduser.usage = usage(
   'adduser',
-  'npm adduser [--registry=url] [--scope=@orgname] [--auth-type=legacy] [--always-auth]'
+  'npm adduser [--registry=url] [--scope=@orgname] [--always-auth]'
 )
 
 function adduser (args, cb) {
@@ -21,9 +21,9 @@ function adduser (args, cb) {
     ))
   }
 
-  let registry = npm.config.get('registry')
-  const scope = npm.config.get('scope')
-  const creds = npm.config.getCredentialsByURI(npm.config.get('registry'))
+  let registry = npm.flatOptions.registry
+  const scope = npm.flatOptions.scope
+  const creds = npm.config.getCredentialsByURI(registry)
 
   if (scope) {
     const scopedRegistry = npm.config.get(scope + ':registry')
@@ -35,7 +35,7 @@ function adduser (args, cb) {
 
   let auth
   try {
-    auth = require('./auth/' + npm.config.get('auth-type'))
+    auth = require('./auth/' + npm.flatOptions.authType)
   } catch (e) {
     return cb(new Error('no such auth module'))
   }

lib/audit.js

@@ -8,7 +8,7 @@ const fs = require('graceful-fs')
 const Installer = require('./install.js').Installer
 const lockVerify = require('lock-verify')
 const log = require('npmlog')
-const npa = require('libnpm/parse-arg')
+const npa = require('npm-package-arg')
 const npm = require('./npm.js')
 const npmConfig = require('./config/figgy-config.js')
 const output = require('./utils/output.js')

lib/auth/legacy.js

@@ -1,10 +1,9 @@
 'use strict'
 
 const read = require('../utils/read-user-info.js')
-const profile = require('libnpm/profile')
+const profile = require('npm-profile')
 const log = require('npmlog')
-const figgyPudding = require('figgy-pudding')
-const npmConfig = require('../config/figgy-config.js')
+const npm = require('../npm.js')
 const output = require('../utils/output.js')
 const openUrl = require('../utils/open-url')
 
@@ -26,16 +25,13 @@ const loginPrompter = (creds) => {
   })
 }
 
-const LoginOpts = figgyPudding({
-  'always-auth': {},
-  creds: {},
-  log: {default: () => log},
-  registry: {},
-  scope: {}
-})
-
 module.exports.login = (creds = {}, registry, scope, cb) => {
-  const opts = LoginOpts(npmConfig()).concat({scope, registry, creds})
+  const opts = {
+    ...npm.flatOptions,
+    scope,
+    registry,
+    creds
+  }
   login(opts).then((newCreds) => cb(null, newCreds)).catch(cb)
 }
 
@@ -66,7 +62,7 @@ function login (opts) {
         newCreds.username = opts.creds.username
         newCreds.password = opts.creds.password
         newCreds.email = opts.creds.email
-        newCreds.alwaysAuth = opts['always-auth']
+        newCreds.alwaysAuth = opts.alwaysAuth
       }
 
       const usermsg = opts.creds.username ? ' user ' + opts.creds.username : ''

lib/auth/sso.js

@@ -1,25 +1,26 @@
 'use strict'
 
-const BB = require('bluebird')
+// XXX: To date, npm Enterprise Legacy is the only system that ever
+// implemented support for this type of login.  A better way to do
+// SSO is to use the WebLogin type of login supported by the npm-login
+// module.  This more forward-looking login style is, ironically,
+// supported by the '--auth-type=legacy' type of login.
+// When and if npm Enterprise Legacy is no longer supported by the npm
+// CLI, we can remove this, and fold the lib/auth/legacy.js back into
+// lib/adduser.js
 
-const figgyPudding = require('figgy-pudding')
 const log = require('npmlog')
-const npmConfig = require('../config/figgy-config.js')
+const npm = require('../npm.js')
 const npmFetch = require('npm-registry-fetch')
 const output = require('../utils/output.js')
-const openUrl = BB.promisify(require('../utils/open-url.js'))
+const { promisify } = require('util')
+const openUrl = promisify(require('../utils/open-url.js'))
 const otplease = require('../utils/otplease.js')
-const profile = require('libnpm/profile')
-
-const SsoOpts = figgyPudding({
-  ssoType: 'sso-type',
-  'sso-type': {},
-  ssoPollFrequency: 'sso-poll-frequency',
-  'sso-poll-frequency': {}
-})
+const profile = require('npm-profile')
 
 module.exports.login = function login (creds, registry, scope, cb) {
-  const opts = SsoOpts(npmConfig()).concat({creds, registry, scope})
+  log.warn('deprecated', 'SSO --auth-type is deprecated')
+  const opts = { ...npm.flatOptions, creds, registry, scope }
   const ssoType = opts.ssoType
   if (!ssoType) { return cb(new Error('Missing option: sso-type')) }
 
@@ -45,18 +46,18 @@ module.exports.login = function login (creds, registry, scope, cb) {
       output('Logged in as %s%s on %s.', username, scopeMessage, registry)
       return {token}
     })
-  }).nodeify(cb)
+  }).then(res => cb(null, res), cb)
 }
 
 function pollForSession (registry, token, opts) {
   log.info('adduser', 'Polling for validated SSO session')
   return npmFetch.json(
-    '/-/whoami', opts.concat({registry, forceAuth: {token}})
+    '/-/whoami', { ...opts, registry, forceAuth: { token } }
   ).then(
     ({username}) => username,
     err => {
       if (err.code === 'E401') {
-        return sleep(opts['sso-poll-frequency']).then(() => {
+        return sleep(opts.ssoPollFrequency).then(() => {
           return pollForSession(registry, token, opts)
         })
       } else {
@@ -67,7 +68,5 @@ function pollForSession (registry, token, opts) {
 }
 
 function sleep (time) {
-  return new BB((resolve) => {
-    setTimeout(resolve, time)
-  })
+  return new Promise((resolve) => setTimeout(resolve, time))
 }

lib/cache.js

@@ -1,20 +1,17 @@
 'use strict'
 /* eslint-disable standard/no-callback-literal */
 
-const BB = require('bluebird')
-
 const assert = require('assert')
 const cacache = require('cacache')
-const finished = BB.promisify(require('mississippi').finished)
+const { promisify } = require('util')
 const log = require('npmlog')
 const npa = require('npm-package-arg')
 const npm = require('./npm.js')
-const npmConfig = require('./config/figgy-config.js')
 const output = require('./utils/output.js')
 const pacote = require('pacote')
 const path = require('path')
-const rm = BB.promisify(require('./utils/gently-rm.js'))
-const unbuild = BB.promisify(npm.commands.unbuild)
+const rimraf = require('rimraf')
+const unbuild = promisify(npm.commands.unbuild)
 
 cache.usage = 'npm cache add <tarball file>' +
               '\nnpm cache add <folder>' +
@@ -65,14 +62,14 @@ cache.clean = clean
 function clean (args) {
   if (!args) args = []
   if (args.length) {
-    return BB.reject(new Error('npm cache clear does not accept arguments'))
+    return Promise.reject(new Error('npm cache clear does not accept arguments'))
   }
   const cachePath = path.join(npm.cache, '_cacache')
   if (!npm.config.get('force')) {
-    return BB.reject(new Error("As of npm@5, the npm cache self-heals from corruption issues and data extracted from the cache is guaranteed to be valid. If you want to make sure everything is consistent, use 'npm cache verify' instead. On the other hand, if you're debugging an issue with the installer, you can use `npm install --cache /tmp/empty-cache` to use a temporary cache instead of nuking the actual one.\n\nIf you're sure you want to delete the entire cache, rerun this command with --force."))
+    return Promise.reject(new Error("As of npm@5, the npm cache self-heals from corruption issues and data extracted from the cache is guaranteed to be valid. If you want to make sure everything is consistent, use 'npm cache verify' instead. On the other hand, if you're debugging an issue with the installer, you can use `npm install --cache /tmp/empty-cache` to use a temporary cache instead of nuking the actual one.\n\nIf you're sure you want to delete the entire cache, rerun this command with --force."))
   }
   // TODO - remove specific packages or package versions
-  return rm(cachePath)
+  return rimraf(cachePath)
 }
 
 // npm cache add <tarball-url>
@@ -105,9 +102,13 @@ function add (args, where) {
     spec = args[0]
   }
   log.verbose('cache add', 'spec', spec)
-  if (!spec) return BB.reject(new Error(usage))
+  if (!spec) return Promise.reject(new Error(usage))
   log.silly('cache add', 'parsed spec', spec)
-  return finished(pacote.tarball.stream(spec, npmConfig({where})).resume())
+  const opts = { ...npm.flatOptions, where }
+  return pacote.tarball.stream(spec, stream => {
+    stream.resume()
+    return stream.promise()
+  }, opts)
 }
 
 cache.verify = verify
@@ -128,10 +129,18 @@ function verify () {
   })
 }
 
+// XXX is this used anywhere?  can it be removed?
 cache.unpack = unpack
 function unpack (pkg, ver, unpackTarget, dmode, fmode, uid, gid) {
   return unbuild([unpackTarget], true).then(() => {
-    const opts = npmConfig({dmode, fmode, uid, gid, offline: true})
+    const opts = {
+      ...npm.flatOptions,
+      dmode,
+      fmode,
+      uid,
+      gid,
+      offline: true
+    }
     return pacote.extract(npa.resolve(pkg, ver), unpackTarget, opts)
   })
 }

lib/config/defaults.js

@@ -162,6 +162,8 @@ Object.defineProperty(exports, 'defaults', {get: function () {
     'ham-it-up': false,
     heading: 'npm',
     'if-present': false,
+    include: [],
+    'include-staged': false,
     'ignore-prepublish': false,
     'ignore-scripts': false,
     'init-module': path.resolve(home, '.npm-init.js'),
@@ -185,6 +187,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
     'node-options': null,
     'node-version': process.version,
     'offline': false,
+    omit: [],
     'onload-script': false,
     only: null,
     optional: true,
@@ -304,6 +307,8 @@ exports.types = {
   'ham-it-up': Boolean,
   'heading': String,
   'if-present': Boolean,
+  include: [Array, 'dev', 'optional', 'peer'],
+  'include-staged': Boolean,
   'ignore-prepublish': Boolean,
   'ignore-scripts': Boolean,
   'init-module': path,
@@ -328,6 +333,7 @@ exports.types = {
   'node-version': [null, semver],
   'noproxy': [null, String, Array],
   offline: Boolean,
+  omit: [Array, 'dev', 'optional', 'peer'],
   'onload-script': [null, String],
   only: [null, 'dev', 'development', 'prod', 'production'],
   optional: Boolean,