feat(publishable): consider the publish registry for the registry referenced by the version badge

Author: travi

src/project-type/publishable/registry-resolver.js

@@ -3,6 +3,8 @@ function isScope(firstPart) {
 }
 
 export default function resolveRegistry(packageName, registries = {}) {
+  if (registries.publish) return registries.publish;
+
   const [firstPart] = packageName.split('/');
   if (isScope(firstPart)) {
     const scopedRegistry = registries[firstPart.slice(1)];

src/project-type/publishable/registry-resolver.test.js

@@ -16,6 +16,25 @@ describe('registry resolver', () => {
     expect(resolveRegistry(any.word(), {registry})).toEqual(registry);
   });
 
+  it('should return the publish registry when defined', () => {
+    const publishRegistry = any.url();
+
+    expect(resolveRegistry(any.word(), {publish: publishRegistry})).toEqual(publishRegistry);
+  });
+
+  it('should prefer the publish registry over the main registry override', () => {
+    const publishRegistry = any.url();
+
+    expect(resolveRegistry(any.word(), {registry, publish: publishRegistry})).toEqual(publishRegistry);
+  });
+
+  it('should prefer the publish registry over the scoped registry', () => {
+    const publishRegistry = any.url();
+
+    expect(resolveRegistry(`@${scope}/${any.word()}`, {[scope]: scopedRegistry, publish: publishRegistry}))
+      .toEqual(publishRegistry);
+  });
+
   it('should return the scoped registry when the package is under a scope with a defined registry', () => {
     expect(resolveRegistry(`@${scope}/${any.word()}`, {[scope]: scopedRegistry})).toEqual(scopedRegistry);
   });

test/integration/features/lift/registries.feature

@@ -32,6 +32,19 @@ Feature: Lift Registries
     And the lockfile-lint config allows the "npm" registry
     And the lockfile-lint config allows the scoped registries
 
+  Scenario: npmrc exists, no registry defined, alternative publish registry provided
+    Given the npmrc does not define registry
+    And an "npm" lockfile exists
+    And lockfile-lint is configured
+    And the project is of type "Package"
+    And husky v5 is installed
+    And an alternative registry is defined for publishing
+    When the scaffolder results are processed
+    Then registry is defined as the official registry
+    And the lockfile-lint config allows the "npm" registry
+    And the registry configuration is defined
+    And the version badge references the custom registry
+
   Scenario: npmrc exists, no registry defined, registry defined for the package's scope
     Given the npmrc does not define registry
     And an "npm" lockfile exists

test/integration/features/step_definitions/registries-steps.js

@@ -23,7 +23,9 @@ Given('an override is defined for the official registry', async function () {
 });
 
 Given('an alternative registry is defined for publishing', async function () {
-  this.registries = {...this.registries, publish: any.url()};
+  const registry = any.url();
+  this.registries = {...this.registries, publish: registry};
+  this.publishRegistry = registry;
 });
 
 Given('a registry is defined for the package\'s scope', async function () {