release-it 14.12.5 → 14.13.0

package/config/release-it.json

@@ -26,6 +26,7 @@
     "tag": null,
     "otp": null,
     "ignoreVersion": false,
+    "allowSameVersion": false,
     "skipChecks": false,
     "timeout": 10
   },

package/lib/plugin/git/Git.js

@@ -1,6 +1,7 @@
 const { EOL } = require('os');
 const _ = require('lodash');
 const execa = require('execa');
+const matcher = require('wildcard-match');
 const { format, e } = require('../../util');
 const GitBase = require('../GitBase');
 const prompts = require('./prompts');
@@ -94,7 +95,7 @@ class Git extends GitBase {
   async isRequiredBranch() {
     const branch = await this.getBranchName();
     const requiredBranches = _.castArray(this.options.requireBranch);
-    return requiredBranches.includes(branch);
+    return matcher(requiredBranches)(branch);
   }
 
   async hasUpstreamBranch() {

package/lib/plugin/npm/npm.js

@@ -82,7 +82,8 @@ class npm extends Plugin {
 
     if (!this.config.isIncrement) return false;
 
-    const task = () => this.exec(`npm version ${version} --no-git-tag-version`);
+    const allowSameVersion = this.options.allowSameVersion ? ' --allow-same-version' : '';
+    const task = () => this.exec(`npm version ${version} --no-git-tag-version${allowSameVersion}`);
     return this.spinner.show({ task, label: 'npm version' });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "14.12.5",
+  "version": "14.13.0",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -81,6 +81,7 @@
     "update-notifier": "5.1.0",
     "url-join": "4.0.1",
     "uuid": "8.3.2",
+    "wildcard-match": "5.1.2",
     "yaml": "1.10.2",
     "yargs-parser": "20.2.9"
   },

package/test/git.init.js

@@ -24,6 +24,19 @@ test.serial('should throw if on wrong branch', async t => {
   await t.throwsAsync(gitClient.init(), { message: /^Must be on branch dev/ });
 });
 
+test.serial('should not throw if required branch matches', async t => {
+  const options = { git: { requireBranch: 'ma?*' } };
+  const gitClient = factory(Git, { options });
+  await t.notThrowsAsync(gitClient.init());
+});
+
+test.serial('should not throw if one of required branch matches', async t => {
+  const options = { git: { requireBranch: ['release/*', 'hotfix/*'] } };
+  const gitClient = factory(Git, { options });
+  sh.exec('git checkout -b release/v1');
+  await t.notThrowsAsync(gitClient.init());
+});
+
 test.serial('should throw if there is no remote Git url', async t => {
   const gitClient = factory(Git, { options: { git } });
   sh.exec('git remote remove origin');

package/test/npm.js

@@ -349,3 +349,12 @@ test('should not publish when `npm version` fails', async t => {
 
   exec.restore();
 });
+
+test('should add allow-same-version argument', async t => {
+  const options = { npm: { skipChecks: true, allowSameVersion: true } };
+  const npmClient = factory(npm, { options });
+  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
+  await runTasks(npmClient);
+  const version = exec.args.filter(arg => arg[0].startsWith('npm version'));
+  t.regex(version[0][0], / --allow-same-version/);
+});