npm-registry-client: goodbye

lib/config/figgy-config.js

@@ -32,7 +32,7 @@ function mkConfig (...providers) {
       includeDeprecated: false,
       'npm-session': npmSession,
       'project-scope': npm.projectScope,
-      refer: npm.registry.refer,
+      refer: npm.refer,
       dmode: npm.modes.exec,
       fmode: npm.modes.file,
       umask: npm.modes.umask,

lib/config/pacote.js

@@ -40,7 +40,7 @@ function pacoteOpts (moreOpts) {
     projectScope: npm.projectScope,
     proxy: npm.config.get('https-proxy') || npm.config.get('proxy'),
     noProxy: npm.config.get('noproxy'),
-    refer: npm.registry.refer,
+    refer: npm.referer,
     registry: npm.config.get('registry'),
     retry: {
       retries: npm.config.get('fetch-retries'),

lib/npm.js

@@ -40,9 +40,7 @@
   var which = require('which')
   var glob = require('glob')
   var rimraf = require('rimraf')
-  var lazyProperty = require('lazy-property')
   var parseJSON = require('./utils/parse-json.js')
-  var clientConfig = require('./config/reg-client.js')
   var aliases = require('./config/cmd-list').aliases
   var cmdList = require('./config/cmd-list').cmdList
   var plumbing = require('./config/cmd-list').plumbing
@@ -106,7 +104,6 @@
   })
 
   var registryRefer
-  var registryLoaded
 
   Object.keys(abbrevs).concat(plumbing).forEach(function addCommand (c) {
     Object.defineProperty(npm.commands, c, { get: function () {
@@ -153,7 +150,7 @@
           }).filter(function (arg) {
             return arg && arg.match
           }).join(' ')
-          if (registryLoaded) npm.registry.refer = registryRefer
+          npm.referer = registryRefer
         }
 
         cmd.apply(npm, args)
@@ -357,17 +354,6 @@
         npm.projectScope = config.get('scope') ||
          scopeifyScope(getProjectScope(npm.prefix))
 
-        // at this point the configs are all set.
-        // go ahead and spin up the registry client.
-        lazyProperty(npm, 'registry', function () {
-          registryLoaded = true
-          var RegClient = require('npm-registry-client')
-          var registry = new RegClient(clientConfig(npm, log, npm.config))
-          registry.version = npm.version
-          registry.refer = registryRefer
-          return registry
-        })
-
         startMetrics()
 
         return cb(null, npm)

lib/org.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const BB = require('bluebird')
-
 const figgyPudding = require('figgy-pudding')
 const liborg = require('libnpm/org')
 const npmConfig = require('./config/figgy-config.js')

lib/utils/error-message.js

@@ -103,8 +103,7 @@ function errorMessage (er) {
 
     case 'EOTP':
     case 'E401':
-      // the E401 message checking is a hack till we replace npm-registry-client with something
-      // OTP aware.
+      // E401 is for places where we accidentally neglect OTP stuff
       if (er.code === 'EOTP' || /one-time pass/.test(er.message)) {
         short.push(['', 'This operation requires a one-time password from your authenticator.'])
         detail.push([