Remove publishConfig option

Note: SemVer Major breaking change

This removes the 'publishConfig' option, as it will no longer be used
once npm/cli#2066 lands.

PR-URL: #36
Credit: @isaacs
Close: #36
Reviewed-by: @nlf

Author: isaacs

index.js

@@ -29,7 +29,6 @@ function regFetch (uri, /* istanbul ignore next */ opts_ = {}) {
   }
   const registry = opts.registry = (
     (opts.spec && pickRegistry(opts.spec, opts)) ||
-    (opts.publishConfig && opts.publishConfig.registry) ||
     opts.registry ||
     /* istanbul ignore next */
     'https://registry.npmjs.org/'
@@ -151,9 +150,6 @@ function pickRegistry (spec, opts = {}) {
   if (!registry && opts.scope)
     registry = opts[opts.scope.replace(/^@?/, '@') + ':registry']
 
-  if (!registry && opts.publishConfig)
-    registry = opts.publishConfig.registry
-
   if (!registry)
     registry = opts.registry || 'https://registry.npmjs.org/'
 
@@ -163,7 +159,8 @@ function pickRegistry (spec, opts = {}) {
 function getCacheMode (opts) {
   return opts.offline ? 'only-if-cached'
     : opts.preferOffline ? 'force-cache'
-    : opts.preferOnline ? 'no-cache' : 'default'
+    : opts.preferOnline ? 'no-cache'
+    : 'default'
 }
 
 function getHeaders (registry, uri, opts) {

test/check-response.js

@@ -71,7 +71,7 @@ test('log the url fetched', async t => {
     log: Object.assign({}, silentLog, {
       http (header, msg) {
         t.equal(header, 'fetch')
-        t.equal(msg, 'GET 200 http://example.com/foo/bar/baz 0ms')
+        t.match(msg, /^GET 200 http:\/\/example.com\/foo\/bar\/baz [0-9]+m?s/)
       },
     }),
   })
@@ -92,7 +92,7 @@ test('redact password from log', async t => {
     log: Object.assign({}, silentLog, {
       http (header, msg) {
         t.equal(header, 'fetch')
-        t.equal(msg, 'GET 200 http://username:***@example.com/foo/bar/baz 0ms')
+        t.match(msg, /^GET 200 http:\/\/username:\*\*\*@example.com\/foo\/bar\/baz [0-9]+m?s/)
       },
     }),
   })

test/index.js

@@ -424,18 +424,6 @@ test('pickRegistry() utility', t => {
     'https://my.scoped.registry/here/',
     'scope @ is option@l'
   )
-  t.equal(
-    pick('[email protected]', {
-      registry: 'https://my.registry/here/',
-      scope: '@otherscope',
-      '@myscope:registry': 'https://my.scoped.registry/here/',
-      publishConfig: {
-        registry: 'https://my.package.registry',
-      },
-    }),
-    'https://my.package.registry',
-    'respects publishConfig setting'
-  )
   t.done()
 })
 
@@ -475,34 +463,6 @@ test('pickRegistry through opts.spec', t => {
   ))
 })
 
-test('pickRegistry through publishConfig', t => {
-  tnock(t, OPTS.registry)
-    .get('/pkg')
-    .reply(200, { source: OPTS.registry })
-  const publishRegistry = 'https://my.publish.registry'
-  tnock(t, publishRegistry)
-    .get('/pkg')
-    .reply(200, { source: publishRegistry })
-
-  return fetch.json('/pkg', {
-    ...OPTS,
-    publishConfig: {},
-  }).then(json => t.equal(
-    json.source,
-    OPTS.registry,
-    'request made to default registry when publishConfig specifies no registry'
-  )).then(() => fetch.json('/pkg', {
-    ...OPTS,
-    publishConfig: {
-      registry: publishRegistry,
-    },
-  }).then(json => t.equal(
-    json.source,
-    publishRegistry,
-    'request made to publishConfig.registry when one is specified'
-  )))
-})
-
 test('log warning header info', t => {
   tnock(t, OPTS.registry)
     .get('/hello')