fixes and tests

sindresorhus · Dec 5, 2023 · 0f9184e · 0f9184e
1 parent 145cdda
commit 0f9184e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/source/cli-implementation.js b/source/cli-implementation.js
@@ -132,7 +132,7 @@ try {
 
 	const branch = flags.branch ?? await git.defaultBranch();
 
-	const isYarnBerry = flags.yarn && await checkIfYarnBerry(pkg);
+	const isYarnBerry = flags.yarn && checkIfYarnBerry(pkg);
 
 	const options = await ui({
 		...flags,

diff --git a/source/index.js b/source/index.js
@@ -102,6 +102,7 @@ const np = async (input = 'patch', options, {pkg, rootDir, isYarnBerry}) => {
 
 	// Yarn berry doesn't support git commiting/tagging, so use npm
 	const shouldUseYarnForVersioning = options.yarn === true && !isYarnBerry;
+	const shouldUseNpmForVersioning = options.yarn === false || isYarnBerry;
 
 	// To prevent the process from hanging due to watch mode (e.g. when running `vitest`)
 	const ciEnvOptions = {env: {CI: 'true'}};
@@ -197,7 +198,7 @@ const np = async (input = 'patch', options, {pkg, rootDir, isYarnBerry}) => {
 		},
 		{
 			title: 'Bumping version using npm',
-			enabled: () => !shouldUseYarnForVersioning,
+			enabled: () => shouldUseNpmForVersioning,
 			skip() {
 				if (options.preview) {
 					let previewText = `[Preview] Command not executed: npm version ${input}`;

diff --git a/source/npm/util.js b/source/npm/util.js
@@ -147,7 +147,7 @@ export const getFilesToBePacked = async rootDir => {
 
 export const getRegistryUrl = async (pkgManager, pkg) => {
 	if (pkgManager === 'yarn-berry') {
-		const {stdout} = await execa('yarn', 'config', 'get', 'npmRegistryServer');
+		const {stdout} = await execa('yarn', ['config', 'get', 'npmRegistryServer']);
 		return stdout;
 	}
 

diff --git a/source/yarn.js b/source/yarn.js
@@ -1,6 +1,6 @@
 import semver from 'semver';
 
-export async function checkIfYarnBerry(pkg) {
+export function checkIfYarnBerry(pkg) {
 	if (typeof pkg.packageManager !== 'string') {
 		return false;
 	}

diff --git a/test/npm/util/get-registry-url.js b/test/npm/util/get-registry-url.js
@@ -24,6 +24,16 @@ test('yarn', createFixture, [{
 	);
 });
 
+test('yarn-berry', createFixture, [{
+	command: 'yarn config get npmRegistryServer',
+	stdout: 'https://registry.yarnpkg.com',
+}], async ({t, testedModule: npm}) => {
+	t.is(
+		await npm.getRegistryUrl('yarn-berry', {}),
+		'https://registry.yarnpkg.com',
+	);
+});
+
 test('external', createFixture, [{
 	command: 'npm config get registry --registry http://my-internal-registry.local',
 	stdout: 'http://my-internal-registry.local',

diff --git a/test/util/yarn.js b/test/util/yarn.js
@@ -0,0 +1,15 @@
+import test from 'ava';
+import {checkIfYarnBerry} from '../../source/yarn.js';
+
+test('checkIfYarnBerry', t => {
+	t.is(checkIfYarnBerry({}), false);
+	t.is(checkIfYarnBerry({
+		packageManager: 'npm',
+	}), false);
+	t.is(checkIfYarnBerry({
+		packageManager: '[email protected]',
+	}), false);
+	t.is(checkIfYarnBerry({
+		packageManager: '[email protected]',
+	}), true);
+});