release-it 19.2.4 → 20.0.0-0

package/lib/log.js

@@ -24,7 +24,7 @@ class Logger {
   }
 
   info(...args) {
-    console.error(styleText('grey', args.join(' ')));
+    console.error(styleText('gray', args.join(' ')));
   }
 
   warn(...args) {

package/lib/plugin/factory.js

@@ -22,7 +22,7 @@ const plugins = {
 };
 
 const load = async pluginName => {
-  let plugin = null;
+  let plugin;
   try {
     const module = await import(pluginName);
     plugin = module.default;

package/lib/plugin/git/Git.js

@@ -209,6 +209,13 @@ class Git extends GitBase {
       this.disableRollback();
       return push;
     } catch (error) {
+      if (this.config.getContext('isReleased')) {
+        this.disableRollback();
+        this.log.error(error.message || error);
+        this.log.warn('The package might have been released, but git push failed.');
+        return;
+      }
+
       try {
         await this.rollbackTagPush();
       } catch (tagError) {

package/lib/plugin/github/GitHub.js

@@ -453,7 +453,7 @@ class GitHub extends Release {
     const { commit: template, excludeMatches = [] } = releaseNotes;
     const commits = await this.getCommits();
 
-    if (this.options.commit) commits.pop();
+    if (this.options.commit || !this.config.isIncrement) commits.pop();
 
     return commits
       .map(commit => {

package/lib/plugin/npm/npm.js

@@ -273,6 +273,7 @@ class npm extends Plugin {
     })
       .then(() => {
         this.setContext({ isReleased: true });
+        this.config.setContext({ isReleased: true });
       })
       .catch(err => {
         this.debug(err);

package/lib/prompt.js

@@ -1,8 +1,10 @@
-import inquirer from 'inquirer';
+import { confirm, input, select } from '@inquirer/prompts';
+
+const types = { confirm, input, list: select };
 
 class Prompt {
   constructor({ container }) {
-    this.createPrompt = (container.inquirer || inquirer).prompt;
+    this.createPrompt = container.createPrompt;
     this.prompts = {};
   }
 
@@ -15,18 +17,23 @@ class Prompt {
     if (!enabled) return false;
 
     const prompt = this.prompts[namespace][promptName];
-    const options = Object.assign({}, prompt, {
-      name: promptName,
-      message: prompt.message(context),
-      choices: 'choices' in prompt && prompt.choices(context),
-      transformer: 'transformer' in prompt ? prompt.transformer(context) : undefined
-    });
+    const options = {
+      message: prompt.message(context)
+    };
+
+    if ('default' in prompt) options.default = prompt.default;
+    if ('choices' in prompt) options.choices = prompt.choices(context);
+    if ('transformer' in prompt) options.transformer = prompt.transformer(context);
+    if ('validate' in prompt) options.validate = prompt.validate;
+    if ('pageSize' in prompt) options.pageSize = prompt.pageSize;
 
-    const answers = await this.createPrompt([options]);
+    const answer = await (this.createPrompt
+      ? this.createPrompt(prompt.type, options)
+      : types[prompt.type](options));
 
-    const doExecute = prompt.type === 'confirm' ? answers[promptName] : true;
+    const doExecute = prompt.type === 'confirm' ? answer : true;
 
-    return doExecute && task ? await task(answers[promptName]) : false;
+    return doExecute && task ? await task(answer) : false;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "19.2.4",
+  "version": "20.0.0-0",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -78,46 +78,46 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@inquirer/prompts": "8.3.2",
     "@nodeutils/defaults-deep": "1.1.0",
     "@octokit/rest": "22.0.1",
     "@phun-ky/typeof": "2.0.3",
     "async-retry": "1.3.3",
     "c12": "3.3.3",
-    "ci-info": "^4.3.1",
-    "eta": "4.5.0",
+    "ci-info": "^4.4.0",
+    "eta": "4.5.1",
     "git-url-parse": "16.1.0",
-    "inquirer": "12.11.1",
     "issue-parser": "7.0.1",
     "lodash.merge": "4.6.2",
     "mime-types": "3.0.2",
     "new-github-release-url": "2.0.0",
-    "open": "10.2.0",
-    "ora": "9.0.0",
-    "os-name": "6.1.0",
-    "proxy-agent": "6.5.0",
-    "semver": "7.7.3",
+    "open": "11.0.0",
+    "ora": "9.3.0",
+    "os-name": "7.0.0",
+    "proxy-agent": "7.0.0",
+    "semver": "7.7.4",
     "tinyglobby": "0.2.15",
-    "undici": "6.23.0",
+    "undici": "7.24.5",
     "url-join": "5.0.0",
     "wildcard-match": "5.1.4",
-    "yargs-parser": "21.1.1"
+    "yargs-parser": "22.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "9.39.2",
+    "@eslint/js": "10.0.1",
     "@octokit/request-error": "7.1.0",
     "@types/node": "24.10.9",
-    "eslint": "9.39.2",
-    "eslint-plugin-import-x": "4.16.1",
-    "globals": "16.5.0",
-    "installed-check": "9.3.0",
-    "knip": "5.82.1",
+    "eslint": "10.1.0",
+    "eslint-plugin-import-x": "4.16.2",
+    "globals": "17.4.0",
+    "installed-check": "10.0.1",
+    "knip": "6.0.5",
     "mentoss": "0.13.0",
     "mock-stdio": "1.0.3",
-    "prettier": "3.8.0",
+    "prettier": "3.8.1",
     "remark-cli": "12.0.1",
-    "remark-preset-webpro": "2.1.0",
-    "tar": "7.5.4",
-    "typescript": "5.9.3"
+    "remark-preset-webpro": "2.1.1",
+    "tar": "7.5.13",
+    "typescript": "6.0.2"
   },
   "overrides": {
     "pac-resolver": "7.0.1",
@@ -125,7 +125,7 @@
     "glob": "13.0.0"
   },
   "engines": {
-    "node": "^20.12.0 || >=22.0.0"
+    "node": "^20.19.0 || ^22.13.0 || >=24.0.0"
   },
   "remarkConfig": {
     "plugins": [

package/test/git.js

@@ -348,6 +348,39 @@ describe('git', () => {
     assert.equal(exec.mock.calls[15].arguments[0], 'git push origin --delete v1.2.4');
   });
 
+  test('should skip rollback when push fails but package is already published', async t => {
+    childProcess.execSync('git init', execOpts);
+    childProcess.execSync(`git remote add origin file://foo`, execOpts);
+    sh.exec(`git remote update`, execOpts);
+    const version = '1.2.3';
+    gitAdd(`{"version":"${version}"}`, 'package.json', 'Add package.json');
+    const options = { git: { requireCleanWorkingDir: true, commit: true, tag: true, tagName: 'v${version}' } };
+    const gitClient = await factory(Git, { options });
+    const exec = t.mock.method(gitClient.shell, 'execFormattedCommand');
+    const warn = t.mock.method(gitClient.log, 'warn');
+    sh.exec(`git push`, execOpts);
+    sh.exec(`git checkout HEAD~1`, execOpts);
+    gitAdd('line', 'file', 'Add file');
+
+    await gitClient.init();
+
+    childProcess.execSync('npm --no-git-tag-version version patch', execOpts);
+
+    gitClient.bump('1.2.4');
+    await gitClient.beforeRelease();
+    await gitClient.stage('package.json');
+    await gitClient.commit({ message: 'Add this' });
+    await gitClient.tag();
+
+    gitClient.config.setContext({ isReleased: true });
+
+    await gitClient.push();
+
+    const execCalls = exec.mock.calls.map(c => c.arguments[0]);
+    assert.equal(execCalls.includes('git push origin --delete v1.2.4'), false);
+    assert(warn.mock.calls.some(c => /git push failed/.test(c.arguments[0])));
+  });
+
   test('should not touch existing history when rolling back', async t => {
     childProcess.execSync('git init', execOpts);
     const version = '1.2.3';

package/test/log.js

@@ -24,6 +24,14 @@ describe('log', () => {
     assert.equal(stripVTControlCharacters(stderr), 'ERROR foo\n');
   });
 
+  test('should print info', () => {
+    const log = new Log();
+    mockStdIo.start();
+    log.info('foo');
+    const { stderr } = mockStdIo.end();
+    assert.equal(stripVTControlCharacters(stderr), 'foo\n');
+  });
+
   test('should print a warning', () => {
     const log = new Log();
     mockStdIo.start();

package/test/prompt.js

@@ -10,33 +10,28 @@ import { factory } from './util/index.js';
 
 const prompts = { git, github, gitlab, npm };
 
-const yes = ([options]) => Promise.resolve({ [options.name]: true });
-const no = ([options]) => Promise.resolve({ [options.name]: false });
+const yes = () => Promise.resolve(true);
+const no = () => Promise.resolve(false);
 
 test('should not create prompt if disabled', async t => {
   const task = t.mock.fn();
-  const promptMock = t.mock.fn(yes);
-  const inquirer = { prompt: promptMock };
-  const prompt = await factory(Prompt, { container: { inquirer } });
+  const createPrompt = t.mock.fn(yes);
+  const prompt = await factory(Prompt, { container: { createPrompt } });
   prompt.register(prompts.git);
   await prompt.show({ enabled: false, prompt: 'push', task });
-  assert.equal(promptMock.mock.callCount(), 0);
+  assert.equal(createPrompt.mock.callCount(), 0);
   assert.equal(task.mock.callCount(), 0);
 });
 
 test('should create prompt', async t => {
-  const promptMock = t.mock.fn(yes);
-  const inquirer = { prompt: promptMock };
-  const prompt = await factory(Prompt, { container: { inquirer } });
+  const createPrompt = t.mock.fn(yes);
+  const prompt = await factory(Prompt, { container: { createPrompt } });
   prompt.register(prompts.git);
   await prompt.show({ prompt: 'push' });
-  assert.equal(promptMock.mock.callCount(), 1);
-  assert.deepEqual(promptMock.mock.calls[0].arguments[0][0], {
-    type: 'confirm',
+  assert.equal(createPrompt.mock.callCount(), 1);
+  assert.equal(createPrompt.mock.calls[0].arguments[0], 'confirm');
+  assert.deepEqual(createPrompt.mock.calls[0].arguments[1], {
     message: 'Push?',
-    name: 'push',
-    choices: false,
-    transformer: undefined,
     default: true
   });
 });
@@ -51,7 +46,7 @@ test('should create prompt', async t => {
   ['npm', 'otp', 'Please enter OTP for npm:']
 ].map(async ([namespace, prompt, message]) => {
   test(`should create prompt and render template message (${namespace}.${prompt})`, async t => {
-    const promptMock = t.mock.fn(yes);
+    const createPrompt = t.mock.fn(yes);
     const config = new Config({
       isPreRelease: true,
       git: { tagName: 'v${version}' },
@@ -59,34 +54,31 @@ test('should create prompt', async t => {
     });
     await config.init();
     config.setContext({ version: '1.0.0', tagName: '1.0.0' });
-    const inquirer = { prompt: promptMock };
-    const p = await factory(Prompt, { container: { inquirer } });
+    const p = await factory(Prompt, { container: { createPrompt } });
     p.register(prompts[namespace], namespace);
     await p.show({ namespace, prompt, context: config.getContext() });
-    assert.equal(promptMock.mock.callCount(), 1);
-    assert.equal(promptMock.mock.calls[0].arguments[0][0].message, message);
+    assert.equal(createPrompt.mock.callCount(), 1);
+    assert.equal(createPrompt.mock.calls[0].arguments[1].message, message);
   });
 });
 
 test('should execute task after positive answer', async t => {
   const task = t.mock.fn();
-  const promptMock = t.mock.fn(yes);
-  const inquirer = { prompt: promptMock };
-  const prompt = await factory(Prompt, { container: { inquirer } });
+  const createPrompt = t.mock.fn(yes);
+  const prompt = await factory(Prompt, { container: { createPrompt } });
   prompt.register(prompts.git);
   await prompt.show({ prompt: 'push', task });
-  assert.equal(promptMock.mock.callCount(), 1);
+  assert.equal(createPrompt.mock.callCount(), 1);
   assert.equal(task.mock.callCount(), 1);
   assert.equal(task.mock.calls[0].arguments[0], true);
 });
 
 test('should not execute task after negative answer', async t => {
   const task = t.mock.fn();
-  const promptMock = t.mock.fn(no);
-  const inquirer = { prompt: promptMock };
-  const prompt = await factory(Prompt, { container: { inquirer } });
+  const createPrompt = t.mock.fn(no);
+  const prompt = await factory(Prompt, { container: { createPrompt } });
   prompt.register(prompts.git);
   await prompt.show({ prompt: 'push', task });
-  assert.equal(promptMock.mock.callCount(), 1);
+  assert.equal(createPrompt.mock.callCount(), 1);
   assert.equal(task.mock.callCount(), 0);
 });

package/test/tasks.interactive.js

@@ -25,7 +25,7 @@ describe('tasks.interactive', () => {
 
   afterEach(() => {
     mocker.clearAll();
-    prompt.mock.resetCalls();
+    createPrompt.mock.resetCalls();
     log.resetCalls();
   });
 
@@ -54,17 +54,18 @@ describe('tasks.interactive', () => {
   const log = new LogStub();
   const spinner = new SpinnerStub();
 
-  const prompt = mock.fn(([options]) => {
-    const answer = options.type === 'list' ? options.choices[0].value : options.name === 'version' ? '0.0.1' : true;
-    return { [options.name]: answer };
+  const createPrompt = mock.fn((type, options) => {
+    if (type === 'list') return options.choices[0].value;
+    if (type === 'input') return '0.0.1';
+    return true;
   });
 
-  const defaultInquirer = { prompt };
+  const defaultCreatePrompt = createPrompt;
 
-  const getContainer = (options, inquirer = defaultInquirer) => {
+  const getContainer = (options, promptFn = defaultCreatePrompt) => {
     const config = new Config(Object.assign({}, testConfig, options));
     const shell = new ShellStub({ container: { log, config } });
-    const prompt = new Prompt({ container: { inquirer } });
+    const prompt = new Prompt({ container: { createPrompt: promptFn } });
     return { log, spinner, config, shell, prompt };
   };
 
@@ -181,8 +182,7 @@ describe('tasks.interactive', () => {
     childProcess.execSync('git tag 1.0.0', execOpts);
 
     const hooks = getHooks(['version', 'git', 'github', 'gitlab', 'npm']);
-    const prompt = mock.fn(([options]) => ({ [options.name]: false }));
-    const inquirer = { prompt };
+    const rejectAll = mock.fn(() => false);
 
     const container = getContainer(
       {
@@ -192,7 +192,7 @@ describe('tasks.interactive', () => {
         gitlab: { release: true, skipChecks: true },
         npm: { publish: true, skipChecks: true }
       },
-      inquirer
+      rejectAll
     );
 
     const exec = t.mock.method(container.shell, 'execFormattedCommand');
@@ -268,7 +268,7 @@ describe('tasks.interactive', () => {
   test('should show only version prompt', async () => {
     const config = { ci: false, 'only-version': true };
     await runTasks({}, getContainer(config));
-    assert.equal(prompt.mock.callCount(), 1);
-    assert.equal(prompt.mock.calls[0].arguments[0][0].name, 'incrementList');
+    assert.equal(createPrompt.mock.callCount(), 1);
+    assert.equal(createPrompt.mock.calls[0].arguments[0], 'list');
   });
 });

package/test/tasks.js

@@ -34,7 +34,7 @@ describe('tasks', () => {
     'https://gitlab.com/api/v4'
   ]);
 
-  const npmMajorVersion = semver.major(process.env.npm_config_user_agent.match(/npm\/([^ ]+)/)[1]);
+  const npmMajorVersion = semver.major(process.env.npm_config_user_agent?.match(/npm\/([^ ]+)/)?.[1] ?? '10.0.0');
 
   const testConfig = {
     ci: true,