release-it 16.2.0 → 17.0.0

package/README.md

@@ -295,10 +295,12 @@ Since v11, release-it can be extended in many, many ways. Here are some plugins:
 | [@release-it/conventional-changelog][25]  | Provides recommended bump, conventional-changelog, and updates `CHANGELOG.md` |
 | [@release-it/keep-a-changelog][38]        | Maintain CHANGELOG.md using the Keep a Changelog standards                    |
 | [@release-it-plugins/lerna-changelog][39] | Integrates lerna-changelog into the release-it pipeline                       |
+| [@jcamp-code/release-it-changelogen][72]  | Use [@unjs/changelogen][73] for versioning and changelog                      |
 | [@release-it-plugins/workspaces][40]      | Releases each of your projects configured workspaces                          |
 | [release-it-calver-plugin][26]            | Enables Calendar Versioning (calver) with release-it                          |
 | [@grupoboticario/news-fragments][41]      | An easy way to generate your changelog file                                   |
 | [@j-ulrich/release-it-regex-bumper][42]   | Regular expression based version read/write plugin for release-it             |
+| [@jcamp-code/release-it-dotnet][74]       | Use .csproj or .props file for versioning, automate NuGet publishing          |
 
 Internally, release-it uses its own plugin architecture (for Git, GitHub, GitLab, npm).
 
@@ -419,3 +421,6 @@ environments running Node.js v14. Also see [CHANGELOG.md][67].
 [69]: ./.github/CONTRIBUTING.md
 [70]: https://github.com/release-it/release-it/issues/new
 [71]: ./LICENSE
+[72]: https://github.com/jcamp-code/release-it-changelogen
+[73]: https://github.com/unjs/changelogen
+[74]: https://github.com/jcamp-code/release-it-dotnet

package/lib/cli.js

@@ -26,9 +26,11 @@ const helpText = `Release It! v${pkg.version}
 
 For more details, please see https://github.com/release-it/release-it`;
 
-export let version = () => log.log(`v${pkg.version}`);
+/** @internal */
+export const version = () => log.log(`v${pkg.version}`);
 
-export let help = () => log.log(helpText);
+/** @internal */
+export const help = () => log.log(helpText);
 
 export default async options => {
   if (options.version) {

package/lib/index.js

@@ -70,9 +70,9 @@ const runTasks = async (opts, di) => {
     const incrementBase = { latestVersion, increment, isPreRelease, preReleaseId };
 
     const { snapshot } = config.options;
-    if (snapshot && !incrementBase.latestVersion.startsWith('0.0.0')) {
+    if (snapshot && (!incrementBase.latestVersion.startsWith('0.0.0') || incrementBase.latestVersion === '0.0.0')) {
       // Reading the latest version first allows to increment the final counter, fake it if it's not a snapshot:
-      incrementBase.latestVersion = `0.0.0-${snapshot}.-1`;
+      incrementBase.latestVersion = `0.0.0-0`;
     }
 
     let version;
@@ -145,8 +145,6 @@ const runTasks = async (opts, di) => {
 
 export default runTasks;
 
-/** @public  */
 export { default as Config } from './config.js';
 
-/** @public  */
 export { default as Plugin } from './plugin/Plugin.js';

package/lib/plugin/factory.js

@@ -40,6 +40,7 @@ const load = async pluginName => {
   return [getPluginName(pluginName), plugin];
 };
 
+/** @internal */
 export const getPluginName = pluginName => {
   if (pluginName.startsWith('.')) {
     return path.parse(pluginName).name;

package/lib/plugin/git/Git.js

@@ -56,8 +56,11 @@ class Git extends GitBase {
     const { tagName } = this.config.getContext();
     const { isCommitted, isTagged } = this.getContext();
     if (isTagged) {
+      this.log.info(`Deleting local tag ${tagName}`);
       this.exec(`git tag --delete ${tagName}`);
     }
+
+    this.log.info(`Resetting local changes made`);
     this.exec(`git reset --hard HEAD${isCommitted ? '~1' : ''}`);
   }
 
@@ -207,9 +210,23 @@ class Git extends GitBase {
   async push({ args = this.options.pushArgs } = {}) {
     const { pushRepo } = this.options;
     const upstreamArgs = await this.getUpstreamArgs(pushRepo);
-    const push = await this.exec(['git', 'push', ...fixArgs(args), ...upstreamArgs]);
-    this.disableRollback();
-    return push;
+    try {
+      const push = await this.exec(['git', 'push', ...fixArgs(args), ...upstreamArgs]);
+      this.disableRollback();
+      return push;
+    } catch (error) {
+      await this.rollbackTagPush();
+      throw error;
+    }
+  }
+
+  async rollbackTagPush() {
+    const { isTagged } = this.getContext();
+    if (isTagged) {
+      const { tagName } = this.config.getContext();
+      this.log.info(`Rolling back remote tag push ${tagName}`);
+      await this.exec(`git push origin --delete ${tagName}`);
+    }
   }
 
   afterRelease() {

package/lib/plugin/version/Version.js

@@ -10,7 +10,7 @@ const CONTINUATION_TYPES = ['prerelease', 'pre'];
 const ALL_RELEASE_TYPES = [...RELEASE_TYPES, ...PRERELEASE_TYPES, ...CONTINUATION_TYPES];
 
 const CHOICES = {
-  latestIsPreRelease: [...RELEASE_TYPES, CONTINUATION_TYPES[0]],
+  latestIsPreRelease: [CONTINUATION_TYPES[0], ...RELEASE_TYPES],
   preRelease: PRERELEASE_TYPES,
   default: [...RELEASE_TYPES, ...PRERELEASE_TYPES]
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "16.2.0",
+  "version": "17.0.0",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -62,15 +62,15 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@octokit/rest": "19.0.13",
+    "@octokit/rest": "20.0.2",
     "async-retry": "1.3.3",
     "chalk": "5.3.0",
     "cosmiconfig": "8.3.6",
-    "execa": "7.2.0",
-    "git-url-parse": "13.1.0",
-    "globby": "13.2.2",
+    "execa": "8.0.1",
+    "git-url-parse": "13.1.1",
+    "globby": "14.0.0",
     "got": "13.0.0",
-    "inquirer": "9.2.11",
+    "inquirer": "9.2.12",
     "is-ci": "3.0.1",
     "issue-parser": "6.0.0",
     "lodash": "4.17.21",
@@ -84,35 +84,32 @@
     "proxy-agent": "6.3.1",
     "semver": "7.5.4",
     "shelljs": "0.8.5",
-    "update-notifier": "6.0.2",
+    "update-notifier": "7.0.0",
     "url-join": "5.0.0",
     "wildcard-match": "5.1.2",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@octokit/request-error": "3.0.3",
+    "@octokit/request-error": "5.0.1",
     "ava": "5.3.1",
-    "eslint": "8.50.0",
+    "eslint": "8.53.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-ava": "14.0.0",
-    "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-prettier": "5.0.0",
-    "fs-monkey": "1.0.4",
-    "knip": "2.19.1",
-    "memfs": "4.4.0",
+    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-prettier": "5.0.1",
+    "fs-monkey": "1.0.5",
+    "knip": "2.41.0",
+    "memfs": "4.6.0",
     "mock-stdio": "1.0.3",
-    "nock": "13.3.3",
+    "nock": "13.3.8",
     "prettier": "3.0.3",
-    "remark-cli": "11.0.0",
-    "remark-preset-webpro": "0.0.3",
-    "sinon": "15.2.0",
+    "remark-cli": "12.0.0",
+    "remark-preset-webpro": "1.0.0",
+    "sinon": "17.0.1",
     "strip-ansi": "7.1.0"
   },
-  "overrides": {
-    "@octokit/plugin-rest-endpoint-methods": "7.2.2"
-  },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "remarkConfig": {
     "plugins": [

package/test/git.js

@@ -298,6 +298,35 @@ test.serial('should roll back when cancelled', async t => {
   t.is(exec.args[12][0], 'git reset --hard HEAD~1');
 });
 
+test.serial('should remove remote tag when push to branch failed', async t => {
+  sh.exec('git init');
+  sh.exec(`git remote add origin file://foo`);
+  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 = factory(Git, { options });
+  const exec = sinon.spy(gitClient.shell, 'execFormattedCommand');
+  sh.exec(`git push`);
+  sh.exec(`git checkout HEAD~1`);
+  gitAdd('line', 'file', 'Add file');
+
+  await gitClient.init();
+
+  sh.exec('npm --no-git-tag-version version patch');
+
+  gitClient.bump('1.2.4');
+  await gitClient.beforeRelease();
+  await gitClient.stage('package.json');
+  await gitClient.commit({ message: 'Add this' });
+  await gitClient.tag();
+  try {
+    await gitClient.push();
+  } catch (e) {
+    // push would fail with an error since HEAD is behind origin
+  }
+  t.is(exec.args[15][0], 'git push origin --delete v1.2.4');
+});
+
 test.serial('should not touch existing history when rolling back', async t => {
   sh.exec('git init');
   const version = '1.2.3';