release-it 20.0.0-1 → 20.0.1

package/lib/config.js

@@ -1,7 +1,7 @@
 import util from 'node:util';
 import assert from 'node:assert';
 import { isCI } from 'ci-info';
-import defaultsDeep from '@nodeutils/defaults-deep';
+import { createDefu } from 'defu';
 import { isObjectStrict } from '@phun-ky/typeof';
 import merge from 'lodash.merge';
 import { loadConfig as loadC12 } from 'c12';
@@ -10,6 +10,13 @@ import { get, getSystemInfo, readJSON } from './util.js';
 const debug = util.debug('release-it:config');
 const defaultConfig = readJSON(new URL('../config/release-it.json', import.meta.url));
 
+const defu = createDefu((obj, key, value) => {
+  if (Array.isArray(obj[key]) && Array.isArray(value)) {
+    obj[key] = value;
+    return true;
+  }
+});
+
 class Config {
   constructor(config = {}) {
     this.constructorConfig = config;
@@ -92,7 +99,7 @@ class Config {
 
 async function loadOptions(constructorConfig) {
   const localConfig = await loadLocalConfig(constructorConfig);
-  const merged = defaultsDeep(
+  const merged = defu(
     {},
     constructorConfig,
     {

package/lib/plugin/npm/npm.js

@@ -91,7 +91,7 @@ class npm extends Plugin {
       allowSameVersion && '--allow-same-version',
       ...fixArgs(versionArgs)
     ];
-    const task = () => this.exec(`npm version ${args.filter(Boolean).join(' ')}`, { options: getOptions() });
+    const task = () => this.exec(`npm version ${args.filter(Boolean).join(' ')}`, { options: { env: getNpmEnv() } });
     return this.spinner.show({ task, label: 'npm version' });
   }
 
@@ -232,9 +232,7 @@ class npm extends Plugin {
   async guessPreReleaseTag() {
     const distTags = await this.getRegistryDistTags();
     const latestVersion = this.getLatestVersion();
-    const match = Object.entries(distTags).find(
-      ([tag, version]) => tag !== DEFAULT_TAG && version === latestVersion
-    );
+    const match = Object.entries(distTags).find(([tag, version]) => tag !== DEFAULT_TAG && version === latestVersion);
     if (match) return match[0];
 
     const [tag] = Object.keys(distTags).filter(tag => tag !== DEFAULT_TAG);

package/lib/prompt.js

@@ -27,9 +27,7 @@ class Prompt {
     if ('validate' in prompt) options.validate = prompt.validate;
     if ('pageSize' in prompt) options.pageSize = prompt.pageSize;
 
-    const answer = await (this.createPrompt
-      ? this.createPrompt(prompt.type, options)
-      : types[prompt.type](options));
+    const answer = await (this.createPrompt ? this.createPrompt(prompt.type, options) : types[prompt.type](options));
 
     const doExecute = prompt.type === 'confirm' ? answer : true;
 

package/lib/util.js

@@ -95,7 +95,7 @@ export const parseGitUrl = remoteUrl => {
     .replace(/\\+/g, '/'); // Replace forward with backslashes
   const parsedUrl = gitUrlParse(normalizedUrl);
   const { resource: host, name: project, protocol, href: remote } = parsedUrl;
-  const owner = protocol === 'file' ? parsedUrl.owner.split('/').at(-1) : parsedUrl.owner; // Fix owner for file protocol
+  const owner = protocol === 'file' ? parsedUrl.owner.split('/').at(-1) : parsedUrl.owner?.replace(/^\/+/, ''); // Fix owner for file protocol
   const repository = `${owner}/${project}`;
   return { host, owner, project, protocol, remote, repository };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "20.0.0-1",
+  "version": "20.0.1",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -78,8 +78,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@inquirer/prompts": "8.3.2",
-    "@nodeutils/defaults-deep": "1.1.0",
+    "@inquirer/prompts": "8.4.2",
+    "defu": "^6.1.7",
     "@octokit/rest": "22.0.1",
     "@phun-ky/typeof": "2.0.3",
     "async-retry": "1.3.3",
@@ -110,7 +110,7 @@
     "eslint-plugin-import-x": "4.16.2",
     "globals": "17.4.0",
     "installed-check": "10.0.1",
-    "knip": "6.0.5",
+    "knip": "6.6.2",
     "mentoss": "0.13.0",
     "mock-stdio": "1.0.3",
     "prettier": "3.8.1",

package/test/config.js

@@ -65,6 +65,19 @@ describe('config', async () => {
     assert.equal(config.options.npm.publish, false);
   });
 
+  test('should replace (not concatenate) array options with user-provided arrays', async () => {
+    const config = new Config({ git: { pushArgs: ['--force'] }, npm: { publishArgs: ['--tag=next'] } });
+    await config.init();
+    assert.deepEqual(config.options.git.pushArgs, ['--force']);
+    assert.deepEqual(config.options.npm.publishArgs, ['--tag=next']);
+  });
+
+  test('should allow empty array to clear default array option', async () => {
+    const config = new Config({ git: { pushArgs: [] } });
+    await config.init();
+    assert.deepEqual(config.options.git.pushArgs, []);
+  });
+
   test('should read YAML config', async () => {
     const config = new Config({ configDir: './test/stub/config/yaml' });
     await config.init();

package/test/npm.js

@@ -52,7 +52,11 @@ describe('npm', async () => {
   test('should guess tag from registry for pre-release matching current version', async t => {
     const npmClient = await factory(npm);
     npmClient.setContext({ latestVersion: '1.0.0-0' });
-    t.mock.method(npmClient, 'getRegistryDistTags', () => ({ latest: '0.9.0', alpha: '1.0.0-alpha.1', next: '1.0.0-0' }));
+    t.mock.method(npmClient, 'getRegistryDistTags', () => ({
+      latest: '0.9.0',
+      alpha: '1.0.0-alpha.1',
+      next: '1.0.0-0'
+    }));
     const tag = await npmClient.resolveTag('1.0.0-1');
     assert.equal(tag, 'next');
   });
@@ -407,4 +411,16 @@ describe('npm', async () => {
     const versionArgs = getArgs(exec, 'npm version');
     assert.match(versionArgs[0], / --workspaces-update=false --allow-same-version/);
   });
+
+  test('should not bypass dry-run guard for `npm version`', async t => {
+    const options = { 'dry-run': true, npm: { skipChecks: true } };
+    const npmClient = await factory(npm, { options });
+    const exec = t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    await runTasks(npmClient);
+    const versionCall = exec.mock.calls.find(call =>
+      (typeof call.arguments[0] === 'string' ? call.arguments[0] : '').startsWith('npm version')
+    );
+    assert.ok(versionCall, 'expected `npm version` to be invoked');
+    assert.notEqual(versionCall.arguments[1]?.write, false);
+  });
 });

package/types/config.d.ts

@@ -99,7 +99,7 @@ export interface Config {
 
     /** @default 10 */
     timeout?: number;
-  };
+  } | false;
 
   github?: {
     /** @default false */