From fd05f0dd047670104ea8d9332bc0ca1ecec8e0e6 Mon Sep 17 00:00:00 2001 From: nlf Date: Mon, 12 Oct 2020 10:30:48 -0700 Subject: [PATCH 1/2] fix: make sure publishConfig is passed through --- lib/publish.js | 3 ++- test/lib/publish.js | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/publish.js b/lib/publish.js index 602d213b68393..1ff7366255a2d 100644 --- a/lib/publish.js +++ b/lib/publish.js @@ -69,7 +69,8 @@ const publish_ = async (arg, opts) => { // The purpose of re-reading the manifest is in case it changed, // so that we send the latest and greatest thing to the registry manifest = await readJson(`${arg}/package.json`) - await otplease(opts, opts => libpub(arg, manifest, opts)) + const { publishConfig } = manifest + await otplease(opts, opts => libpub(arg, manifest, { ...opts, publishConfig })) } // publish diff --git a/test/lib/publish.js b/test/lib/publish.js index 627cb71f8588d..e5e412e396c1a 100644 --- a/test/lib/publish.js +++ b/test/lib/publish.js @@ -2,10 +2,12 @@ const { test, cleanSnapshot } = require('tap') const requireInject = require('require-inject') test('should publish with libnpmpublish', (t) => { + const publishConfig = { registry: 'https://some.registry' } const testDir = t.testdir({ 'package.json': JSON.stringify({ name: 'my-cool-pkg', - version: '1.0.0' + version: '1.0.0', + publishConfig }, null, 2) }) @@ -32,6 +34,7 @@ test('should publish with libnpmpublish', (t) => { t.ok(arg, 'gets path') t.ok(manifest, 'gets manifest') t.ok(opts, 'gets opts object') + t.same(opts.publishConfig, publishConfig, 'publishConfig is passed through') t.ok(true, 'libnpmpublish is called') } }, From 29157fe404619ad5a783f02f534d1018513cbe02 Mon Sep 17 00:00:00 2001 From: nlf Date: Mon, 12 Oct 2020 10:31:46 -0700 Subject: [PATCH 2/2] npm-registry-fetch@8.1.5 --- node_modules/npm-registry-fetch/CHANGELOG.md | 7 +++++++ node_modules/npm-registry-fetch/index.js | 5 +++++ node_modules/npm-registry-fetch/package.json | 2 +- package-lock.json | 12 ++++++------ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/node_modules/npm-registry-fetch/CHANGELOG.md b/node_modules/npm-registry-fetch/CHANGELOG.md index c121079bd445b..fc26ee1bda4ba 100644 --- a/node_modules/npm-registry-fetch/CHANGELOG.md +++ b/node_modules/npm-registry-fetch/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [8.1.5](https://github.com/npm/registry-fetch/compare/v8.1.4...v8.1.5) (2020-10-12) + + +### Bug Fixes + +* respect publishConfig.registry when specified ([32e36ef](https://github.com/npm/registry-fetch/commit/32e36efe86302ed319973cd5b1e6ccc3f62e557e)), closes [#35](https://github.com/npm/registry-fetch/issues/35) + ### [8.1.4](https://github.com/npm/registry-fetch/compare/v8.1.3...v8.1.4) (2020-08-17) diff --git a/node_modules/npm-registry-fetch/index.js b/node_modules/npm-registry-fetch/index.js index eb48ba6c052b0..2324e7fbfd00b 100644 --- a/node_modules/npm-registry-fetch/index.js +++ b/node_modules/npm-registry-fetch/index.js @@ -29,6 +29,7 @@ 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/' @@ -155,6 +156,10 @@ function pickRegistry (spec, opts = {}) { registry = opts[opts.scope.replace(/^@?/, '@') + ':registry'] } + if (!registry && opts.publishConfig) { + registry = opts.publishConfig.registry + } + if (!registry) { registry = opts.registry || 'https://registry.npmjs.org/' } diff --git a/node_modules/npm-registry-fetch/package.json b/node_modules/npm-registry-fetch/package.json index c68a42286a451..5aeddc5b39102 100644 --- a/node_modules/npm-registry-fetch/package.json +++ b/node_modules/npm-registry-fetch/package.json @@ -1,6 +1,6 @@ { "name": "npm-registry-fetch", - "version": "8.1.4", + "version": "8.1.5", "description": "Fetch-based http client for use with npm registry APIs", "main": "index.js", "files": [ diff --git a/package-lock.json b/package-lock.json index 109d5d57651b7..20957a09dc79f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4121,9 +4121,9 @@ } }, "node_modules/npm-registry-fetch": { - "version": "8.1.4", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.4.tgz", - "integrity": "sha512-UaLGFQP7VCuyBsb7S5P5od3av/Zy9JW6K5gbMigjZCYnEpIkWWRiLQTKVpxM4QocfPcsjm+xtyrDNm4jdqwNEg==", + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.5.tgz", + "integrity": "sha512-yZPNoJK9clx1jhSXU54kU6Aj1SV2p7mXUs1W/6OjQvek3wb1RrjDCrt4iY1+VX9eBQvvSGEpzNmYkRUaTL8rqg==", "inBundle": true, "dependencies": { "@npmcli/ci-detect": "^1.0.0", @@ -11329,9 +11329,9 @@ } }, "npm-registry-fetch": { - "version": "8.1.4", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.4.tgz", - "integrity": "sha512-UaLGFQP7VCuyBsb7S5P5od3av/Zy9JW6K5gbMigjZCYnEpIkWWRiLQTKVpxM4QocfPcsjm+xtyrDNm4jdqwNEg==", + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.5.tgz", + "integrity": "sha512-yZPNoJK9clx1jhSXU54kU6Aj1SV2p7mXUs1W/6OjQvek3wb1RrjDCrt4iY1+VX9eBQvvSGEpzNmYkRUaTL8rqg==", "requires": { "@npmcli/ci-detect": "^1.0.0", "lru-cache": "^6.0.0",