release-it 16.0.0 → 16.1.1

package/README.md

@@ -334,8 +334,8 @@ release-it programmatically][45] for example code.
 
 ## Legacy Node.js
 
-The latest major version is v15, supporting Node.js 14 and up (as Node.js v12 is EOL). Use release-it v14 for
-environments running Node.js v10 and v12. Also see [CHANGELOG.md][67].
+The latest major version is v16, supporting Node.js 16 and up (as Node.js v14 is EOL). Use release-it v15 for
+environments running Node.js v14. Also see [CHANGELOG.md][67].
 
 ## Links
 

package/config/release-it.json

@@ -16,6 +16,7 @@
     "tagExclude": null,
     "tagName": null,
     "tagMatch": null,
+    "getLatestTagFromAllRefs": false,
     "tagAnnotation": "Release ${version}",
     "tagArgs": [],
     "push": true,

package/lib/plugin/GitBase.js

@@ -94,10 +94,20 @@ class GitBase extends Plugin {
     const context = Object.assign({}, this.config.getContext(), { version: '*' });
     const match = format(this.options.tagMatch || this.options.tagName || '${version}', context);
     const exclude = this.options.tagExclude ? ` --exclude=${format(this.options.tagExclude, context)}` : '';
-    return this.exec(`git describe --tags --match=${match} --abbrev=0${exclude}`, { options }).then(
-      stdout => stdout || null,
-      () => null
-    );
+    if (this.options.getLatestTagFromAllRefs) {
+      return this.exec(
+        `git -c "versionsort.suffix=-" for-each-ref --count=1 --sort=-v:refname --format="%(refname:short)" refs/tags/${match}`,
+        { options }
+      ).then(
+        stdout => stdout || null,
+        () => null
+      );
+    } else {
+      return this.exec(`git describe --tags --match=${match} --abbrev=0${exclude}`, { options }).then(
+        stdout => stdout || null,
+        () => null
+      );
+    }
   }
 
   async getSecondLatestTagName(latestTag) {

package/lib/plugin/GitRelease.js

@@ -12,7 +12,14 @@ class GitRelease extends GitBase {
   getInitialOptions(options) {
     const baseOptions = super.getInitialOptions(...arguments);
     const git = options.git || defaultConfig.git;
-    const gitOptions = _.pick(git, ['tagExclude', 'tagName', 'tagMatch', 'pushRepo', 'changelog']);
+    const gitOptions = _.pick(git, [
+      'tagExclude',
+      'tagName',
+      'tagMatch',
+      'getLatestTagFromAllRefs',
+      'pushRepo',
+      'changelog'
+    ]);
     return _.defaults(baseOptions, gitOptions);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "16.0.0",
+  "version": "16.1.1",
   "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.1",
     "async-retry": "1.3.3",
     "chalk": "5.3.0",
     "cosmiconfig": "8.2.0",
     "execa": "7.1.1",
     "git-url-parse": "13.1.0",
-    "globby": "13.2.1",
+    "globby": "13.2.2",
     "got": "13.0.0",
-    "inquirer": "9.2.7",
+    "inquirer": "9.2.8",
     "is-ci": "3.0.1",
     "issue-parser": "6.0.0",
     "lodash": "4.17.21",
@@ -81,8 +81,8 @@
     "ora": "6.3.1",
     "os-name": "5.1.0",
     "promise.allsettled": "1.0.6",
-    "proxy-agent": "6.2.1",
-    "semver": "7.5.3",
+    "proxy-agent": "6.2.2",
+    "semver": "7.5.4",
     "shelljs": "0.8.5",
     "update-notifier": "6.0.2",
     "url-join": "5.0.0",
@@ -90,18 +90,18 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@octokit/request-error": "3.0.3",
+    "@octokit/request-error": "5.0.0",
     "ava": "5.3.1",
-    "eslint": "8.44.0",
+    "eslint": "8.45.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-ava": "14.0.0",
     "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-prettier": "4.2.1",
-    "knip": "2.14.3",
+    "eslint-plugin-prettier": "5.0.0",
+    "knip": "2.15.5",
     "mock-fs": "5.2.0",
     "mock-stdio": "1.0.3",
-    "nock": "13.3.1",
-    "prettier": "2.8.8",
+    "nock": "13.3.2",
+    "prettier": "3.0.0",
     "remark-cli": "11.0.0",
     "remark-preset-webpro": "0.0.3",
     "sinon": "15.2.0",

package/test/git.js

@@ -322,3 +322,37 @@ test.serial('should not roll back with risky config', async t => {
   await gitClient.beforeRelease();
   t.is('rollbackOnce' in gitClient, false);
 });
+
+test.serial('should return latest tag from default branch (not parent commit)', async t => {
+  sh.exec('git init');
+
+  {
+    const options = { git: { getLatestTagFromAllRefs: true } };
+    const gitClient = factory(Git, { options });
+    gitAdd('main', 'file', 'Add file in main');
+    const defaultBranchName = await gitClient.getBranchName();
+    const developBranchName = 'develop';
+    const featureBranchPrefix = 'feature';
+    await gitClient.tag({ name: '1.0.0' });
+    sh.exec(`git branch ${developBranchName} ${defaultBranchName}`);
+    sh.exec(`git checkout -b ${featureBranchPrefix}/first ${developBranchName}`);
+    gitAdd('feature/1', 'file', 'Update file in feature branch (1)');
+    sh.exec(`git checkout ${developBranchName}`);
+    sh.exec(`git merge --no-ff ${featureBranchPrefix}/first`);
+    await gitClient.tag({ name: '1.1.0-rc.1' });
+    sh.exec(`git checkout ${defaultBranchName}`);
+    sh.exec(`git merge --no-ff ${developBranchName}`);
+    await gitClient.tag({ name: '1.1.0' });
+    sh.exec(`git checkout -b ${featureBranchPrefix}/second ${developBranchName}`);
+    gitAdd('feature/2', 'file', 'Update file again, in feature branch (2)');
+    sh.exec(`git checkout ${developBranchName}`);
+    sh.exec(`git merge --no-ff ${featureBranchPrefix}/second`);
+    t.is(await gitClient.getLatestTagName(), '1.1.0');
+  }
+
+  {
+    const options = { git: { getLatestTagFromAllRefs: false } };
+    const gitClient = factory(Git, { options });
+    t.is(await gitClient.getLatestTagName(), '1.1.0-rc.1');
+  }
+});