Skip to content

Commit ec9fcc1

Browse files
zkatzkat
committed
npm-registry-client: goodbye
1 parent b24ed5f commit ec9fcc1

9 files changed

Lines changed: 4 additions & 348 deletions

File tree

‎lib/config/figgy-config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function mkConfig (...providers) {
3232
includeDeprecated: false,
3333
'npm-session': npmSession,
3434
'project-scope': npm.projectScope,
35-
refer: npm.registry.refer,
35+
refer: npm.refer,
3636
dmode: npm.modes.exec,
3737
fmode: npm.modes.file,
3838
umask: npm.modes.umask,

‎lib/config/pacote.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function pacoteOpts (moreOpts) {
4040
projectScope: npm.projectScope,
4141
proxy: npm.config.get('https-proxy') || npm.config.get('proxy'),
4242
noProxy: npm.config.get('noproxy'),
43-
refer: npm.registry.refer,
43+
refer: npm.referer,
4444
registry: npm.config.get('registry'),
4545
retry: {
4646
retries: npm.config.get('fetch-retries'),

‎lib/config/reg-client.js‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎lib/npm.js‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
var which = require('which')
4141
var glob = require('glob')
4242
var rimraf = require('rimraf')
43-
var lazyProperty = require('lazy-property')
4443
var parseJSON = require('./utils/parse-json.js')
45-
var clientConfig = require('./config/reg-client.js')
4644
var aliases = require('./config/cmd-list').aliases
4745
var cmdList = require('./config/cmd-list').cmdList
4846
var plumbing = require('./config/cmd-list').plumbing
@@ -106,7 +104,6 @@
106104
})
107105

108106
var registryRefer
109-
var registryLoaded
110107

111108
Object.keys(abbrevs).concat(plumbing).forEach(function addCommand (c) {
112109
Object.defineProperty(npm.commands, c, { get: function () {
@@ -153,7 +150,7 @@
153150
}).filter(function (arg) {
154151
return arg && arg.match
155152
}).join(' ')
156-
if (registryLoaded) npm.registry.refer = registryRefer
153+
npm.referer = registryRefer
157154
}
158155

159156
cmd.apply(npm, args)
@@ -357,17 +354,6 @@
357354
npm.projectScope = config.get('scope') ||
358355
scopeifyScope(getProjectScope(npm.prefix))
359356

360-
// at this point the configs are all set.
361-
// go ahead and spin up the registry client.
362-
lazyProperty(npm, 'registry', function () {
363-
registryLoaded = true
364-
var RegClient = require('npm-registry-client')
365-
var registry = new RegClient(clientConfig(npm, log, npm.config))
366-
registry.version = npm.version
367-
registry.refer = registryRefer
368-
return registry
369-
})
370-
371357
startMetrics()
372358

373359
return cb(null, npm)

‎lib/org.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict'
22

3-
const BB = require('bluebird')
4-
53
const figgyPudding = require('figgy-pudding')
64
const liborg = require('libnpm/org')
75
const npmConfig = require('./config/figgy-config.js')

‎lib/utils/error-message.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ function errorMessage (er) {
103103

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

‎lib/utils/get-publish-config.js‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎lib/utils/map-to-registry.js‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)