Move to isExternalRegistry

sindresorhus · Jul 16, 2024 · ff7f87e · ff7f87e
1 parent 0673248
commit ff7f87e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/source/cli-implementation.js b/source/cli-implementation.js
@@ -127,12 +127,7 @@ async function getOptions() {
 
 	const packageManager = getPackageManagerConfig(rootDirectory, package_);
 
-	if (
-		packageManager.throwOnExternalRegistry
-		&& npm.isExternalRegistry(package_)
-		// NPM default registry https://github.com/npm/pneumatic-tubes/blob/1064fbb461464cc0fe18bd2790a176aa92bd63fd/index.js#L35
-		&& package_.publishConfig.registry !== 'https://registry.npmjs.org'
-	) {
+	if (packageManager.throwOnExternalRegistry && npm.isExternalRegistry(package_)) {
 		throw new Error(`External registry is not yet supported with ${packageManager.id}.`);
 	}
 

diff --git a/source/npm/util.js b/source/npm/util.js
@@ -43,7 +43,12 @@ export const username = async ({externalRegistry}) => {
 	}
 };
 
-export const isExternalRegistry = package_ => typeof package_.publishConfig?.registry === 'string';
+// NPM default registry https://github.com/npm/pneumatic-tubes/blob/1064fbb461464cc0fe18bd2790a176aa92bd63fd/index.js#L35
+const NPM_DEFAULT_REGISTRY = 'https://registry.npmjs.org';
+export const isExternalRegistry = package_ => {
+	const registry = package_.publishConfig?.registry;
+	return typeof registry === 'string' && registry !== NPM_DEFAULT_REGISTRY;
+};
 
 export const collaborators = async package_ => {
 	const packageName = package_.name;

diff --git a/test/npm/util/is-external-registry.js b/test/npm/util/is-external-registry.js
@@ -7,4 +7,5 @@ test('main', t => {
 	t.false(npm.isExternalRegistry({name: 'foo'}));
 	t.false(npm.isExternalRegistry({publishConfig: {registry: true}}));
 	t.false(npm.isExternalRegistry({publishConfig: 'not an object'}));
+	t.false(npm.isExternalRegistry({publishConfig: {registry: 'https://registry.npmjs.org'}}));
 });