Fixes publishing scoped packages to third-party registries (#439)

* Allows explicitly pass both the registry and the ident

* Bumps the versions

Author: arcanis

packages/plugin-npm-cli/package.json

@@ -14,6 +14,10 @@
     "yup": "^0.27.0"
   },
   "version": "2.0.0-rc.1",
+  "nextVersion": {
+    "semver": "2.0.0-rc.2",
+    "nonce": "2965736026974261"
+  },
   "repository": {
     "type": "git",
     "url": "ssh://git@github.com/yarnpkg/berry.git"

packages/plugin-npm-cli/sources/commands/npm/publish.ts

@@ -63,6 +63,7 @@ export default class NpmPublishCommand extends BaseCommand {
           const registryData = await npmHttpUtils.get(npmHttpUtils.getIdentUrl(ident), {
             configuration,
             registry,
+            ident,
             json: true,
           });
 

packages/plugin-npm/package.json

@@ -9,6 +9,10 @@
     "semver": "^5.6.0"
   },
   "version": "2.0.0-rc.1",
+  "nextVersion": {
+    "semver": "2.0.0-rc.2",
+    "nonce": "5986557666077751"
+  },
   "repository": {
     "type": "git",
     "url": "ssh://git@github.com/yarnpkg/berry.git"

packages/plugin-npm/sources/npmHttpUtils.ts

@@ -18,7 +18,7 @@ type AuthOptions = {
 
 type RegistryOptions = {
   ident: Ident,
-  registry?: void,
+  registry?: string,
 } | {
   ident?: void,
   registry: string;
@@ -35,7 +35,7 @@ export function getIdentUrl(ident: Ident) {
 }
 
 export async function get(path: string, {configuration, headers, ident, authType, registry, ...rest}: Options) {
-  if (ident)
+  if (ident && typeof registry === `undefined`)
     registry = npmConfigUtils.getScopeRegistry(ident.scope, {configuration});
   if (ident && ident.scope && typeof authType === `undefined`)
     authType = AuthType.BEST_EFFORT;
@@ -51,7 +51,7 @@ export async function get(path: string, {configuration, headers, ident, authType
 }
 
 export async function put(path: string, body: httpUtils.Body, {configuration, headers, ident, authType = AuthType.ALWAYS_AUTH, registry, ...rest}: Options) {
-  if (ident)
+  if (ident && typeof registry === `undefined`)
     registry = npmConfigUtils.getScopeRegistry(ident.scope, {configuration});
 
   if (typeof registry !== `string`)

packages/yarnpkg-cli/package.json

@@ -3,7 +3,7 @@
   "version": "2.0.0-rc.3",
   "nextVersion": {
     "semver": "2.0.0-rc.4",
-    "nonce": "6374202412274785"
+    "nonce": "1053386781220579"
   },
   "main": "./sources/index.ts",
   "bin": {