release-it 14.12.4 → 14.13.1

package/README.md

@@ -323,7 +323,7 @@ While mostly used as a CLI tool, release-it can be used as a dependency to integ
 - [metalsmith/metalsmith](https://github.com/metalsmith/metalsmith)
 - [react-native-paper](https://github.com/callstack/react-native-paper)
 - [js-cookie/js-cookie](https://github.com/js-cookie/js-cookie)
-- [mirumee/saleor](https://github.com/mirumee/saleor)
+- [saleor/saleor](https://github.com/saleor/saleor)
 - [mozilla/readability](https://github.com/mozilla/readability)
 - [redis/node-redis](https://github.com/redis/node-redis)
 - [shipshapecode/shepherd](https://github.com/shipshapecode/shepherd)

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/github/GitHub.js

@@ -193,10 +193,10 @@ class GitHub extends Release {
     const { owner, project: repo } = this.getContext('repo');
     const { releaseName, draft = false, preRelease = false, autoGenerate = false } = this.options;
     const { tagName } = this.config.getContext();
-    const { version, releaseNotes } = this.getContext();
+    const { version, releaseNotes, isUpdate } = this.getContext();
     const { isPreRelease } = parseVersion(version);
     const name = format(releaseName, this.config.getContext());
-    const body = autoGenerate ? '' : releaseNotes || '';
+    const body = autoGenerate ? (isUpdate ? null : '') : releaseNotes;
 
     return Object.assign(options, {
       owner,

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.4",
+  "version": "14.13.1",
   "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/git.js

@@ -228,7 +228,10 @@ test.serial('should push to remote name (not "origin")', async t => {
     gitAdd('line', 'file', 'Add file');
     await gitClient.push();
     t.deepEqual(spy.lastCall.args[0], ['git', 'push', '--set-upstream', 'upstream', 'foo']);
-    t.regex(await spy.lastCall.returnValue, /Branch .?foo.? set up to track remote branch .?foo.? from .?upstream.?/);
+    t.regex(
+      await spy.lastCall.returnValue,
+      /branch .?foo.? set up to track (remote branch .?foo.? from .?upstream.?|.?upstream\/foo.?)/i
+    );
   }
   spy.restore();
 });

package/test/github.js

@@ -89,7 +89,7 @@ test('should create a pre-release and draft release notes', async t => {
 
   interceptAuthentication();
   interceptCollaborator();
-  interceptCreate({ body: { tag_name: '2.0.2', name: 'Release 2.0.2', body: '', prerelease: true, draft: true } });
+  interceptCreate({ body: { tag_name: '2.0.2', name: 'Release 2.0.2', prerelease: true, draft: true } });
 
   await runTasks(github);
 
@@ -99,7 +99,7 @@ test('should create a pre-release and draft release notes', async t => {
   exec.restore();
 });
 
-test('should create auto generated release notes', async t => {
+test('should create auto-generated release notes', async t => {
   const options = {
     git,
     github: {
@@ -116,9 +116,7 @@ test('should create auto generated release notes', async t => {
 
   interceptAuthentication();
   interceptCollaborator();
-  interceptCreate({
-    body: { tag_name: '2.0.2', name: 'Release 2.0.2', draft: false, prerelease: false, generate_release_notes: true }
-  });
+  interceptCreate({ body: { tag_name: '2.0.2', name: 'Release 2.0.2', generate_release_notes: true, body: '' } });
 
   await runTasks(github);
 

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/);
+});

package/test/stub/github.js

@@ -44,7 +44,7 @@ const interceptCreate = ({
   host = 'github.com',
   owner = 'user',
   project = 'repo',
-  body: { tag_name, name = '', body = '', prerelease = false, draft = false, generate_release_notes = false }
+  body: { tag_name, name = '', generate_release_notes = false, body = null, prerelease = false, draft = false }
 } = {}) => {
   nock(api)
     .post(`/repos/${owner}/${project}/releases`, {
@@ -77,7 +77,7 @@ const interceptUpdate = ({
   api = 'https://api.github.com',
   owner = 'user',
   project = 'repo',
-  body: { tag_name, name = '', body = '', prerelease = false, draft = false, generate_release_notes = false }
+  body: { tag_name, name = '', body = null, prerelease = false, draft = false, generate_release_notes = false }
 } = {}) => {
   nock(api)
     .patch(`/repos/${owner}/${project}/releases/1`, { tag_name, name, body, draft, prerelease, generate_release_notes })

package/test/util/index.js

@@ -47,10 +47,11 @@ module.exports.runTasks = async plugin => {
 
   const name = (await plugin.getName()) || '__test__';
   const latestVersion = (await plugin.getLatestVersion()) || '1.0.0';
+  const latestTag = plugin.config.getContext('latestTag');
   const changelog = (await plugin.getChangelog(latestVersion)) || null;
   const increment = getIncrement(plugin);
 
-  plugin.config.setContext({ name, latestVersion, latestTag: latestVersion, changelog });
+  plugin.config.setContext({ name, latestVersion, latestTag, changelog });
 
   const { preRelease } = plugin.config.options;
   const isPreRelease = Boolean(preRelease);