release-it 14.12.5 → 14.14.0

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
   },
@@ -48,6 +49,7 @@
     "release": false,
     "releaseName": "Release ${version}",
     "releaseNotes": null,
+    "milestones": [],
     "tokenRef": "GITLAB_TOKEN",
     "tokenHeader": "Private-Token",
     "certificateAuthorityFile": null,

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/gitlab/GitLab.js

@@ -107,6 +107,66 @@ class GitLab extends Release {
     }
   }
 
+  async beforeRelease() {
+    await super.beforeRelease();
+    await this.checkReleaseMilestones();
+  }
+
+  async checkReleaseMilestones() {
+    if (this.options.skipChecks) return;
+
+    const releaseMilestones = this.getReleaseMilestones();
+    if (releaseMilestones.length < 1) {
+      return;
+    }
+
+    this.log.exec(`gitlab releases#checkReleaseMilestones`);
+
+    const { id } = this.getContext();
+    const endpoint = `projects/${id}/milestones`;
+    const requests = releaseMilestones.map(milestone => {
+      const options = {
+        method: 'GET',
+        searchParams: {
+          title: milestone,
+          include_parent_milestones: true
+        }
+      };
+      return this.request(endpoint, options).then(response => {
+        if (!Array.isArray(response)) {
+          const { baseUrl } = this.getContext();
+          throw new Error(
+            `Unexpected response from ${baseUrl}/${endpoint}. Expected an array but got: ${JSON.stringify(response)}`
+          );
+        }
+        if (response.length === 0) {
+          const error = new Error(`Milestone '${milestone}' does not exist.`);
+          this.log.warn(error.message);
+          throw error;
+        }
+        this.log.verbose(`gitlab releases#checkReleaseMilestones: milestone '${milestone}' exists`);
+      });
+    });
+    try {
+      await Promise.allSettled(requests).then(results => {
+        for (const result of results) {
+          if (result.status === 'rejected') {
+            throw e('Missing one or more milestones in GitLab. Creating a GitLab release will fail.', docs);
+          }
+        }
+      });
+    } catch (err) {
+      this.debug(err);
+      throw err;
+    }
+    this.log.verbose('gitlab releases#checkReleaseMilestones: done');
+  }
+
+  getReleaseMilestones() {
+    const { milestones } = this.options;
+    return (milestones || []).map(milestone => format(milestone, this.config.getContext()));
+  }
+
   async release() {
     const glRelease = () => this.createRelease();
     const glUploadAssets = () => this.uploadAssets();
@@ -138,6 +198,7 @@ class GitLab extends Release {
     const name = format(releaseName, this.config.getContext());
     const description = releaseNotes || '-';
     const releaseUrl = `${origin}/${repo.repository}/-/releases`;
+    const releaseMilestones = this.getReleaseMilestones();
 
     this.log.exec(`gitlab releases#createRelease "${name}" (${tagName})`, { isDryRun });
 
@@ -161,6 +222,10 @@ class GitLab extends Release {
       };
     }
 
+    if (releaseMilestones.length) {
+      options.json.milestones = releaseMilestones;
+    }
+
     try {
       await this.request(endpoint, options);
       this.log.verbose('gitlab releases#createRelease: done');

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.14.0",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -60,17 +60,17 @@
     "async-retry": "1.3.3",
     "chalk": "4.1.2",
     "cosmiconfig": "7.0.1",
-    "debug": "4.3.3",
+    "debug": "4.3.4",
     "execa": "5.1.1",
     "form-data": "4.0.0",
     "git-url-parse": "11.6.0",
     "globby": "11.0.4",
     "got": "11.8.3",
     "import-cwd": "3.0.0",
-    "inquirer": "8.2.0",
+    "inquirer": "8.2.2",
     "is-ci": "3.0.1",
     "lodash": "4.17.21",
-    "mime-types": "2.1.34",
+    "mime-types": "2.1.35",
     "new-github-release-url": "1.0.0",
     "open": "7.4.2",
     "ora": "5.4.1",
@@ -81,25 +81,26 @@
     "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"
   },
   "devDependencies": {
     "@octokit/request-error": "2.1.0",
     "ava": "3.15.0",
-    "eslint": "8.7.0",
-    "eslint-config-prettier": "8.3.0",
+    "eslint": "8.12.0",
+    "eslint-config-prettier": "8.5.0",
     "eslint-plugin-ava": "13.2.0",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-prettier": "4.0.0",
     "markdown-toc": "1.2.0",
     "mock-fs": "5.1.2",
     "mock-stdio": "1.0.3",
-    "nock": "13.2.2",
+    "nock": "13.2.4",
     "node-fetch": "2.6.7",
-    "prettier": "2.5.1",
+    "prettier": "2.6.1",
     "proxyquire": "2.1.3",
-    "sinon": "12.0.1",
+    "sinon": "13.0.1",
     "strip-ansi": "6.0.0"
   },
   "engines": {

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

@@ -214,7 +214,7 @@ test('should release to enterprise host', async t => {
 });
 
 test('should release to alternative host and proxy', async t => {
-  const remote = { api: 'https://my-custom-host.org/api/v3', host: 'my-custom-host.org' };
+  const remote = { api: 'https://custom.example.org/api/v3', host: 'custom.example.org' };
   interceptAuthentication(remote);
   interceptCollaborator(remote);
   interceptCreate(Object.assign({ body: { tag_name: '1.0.1' } }, remote));
@@ -222,8 +222,8 @@ test('should release to alternative host and proxy', async t => {
     git,
     github: {
       tokenRef,
-      pushRepo: `git://my-custom-host.org:user/repo`,
-      host: 'my-custom-host.org',
+      pushRepo: `git://custom.example.org:user/repo`,
+      host: 'custom.example.org',
       proxy: 'http://proxy:8080'
     }
   };
@@ -235,24 +235,24 @@ test('should release to alternative host and proxy', async t => {
 
   const { isReleased, releaseUrl } = github.getContext();
   t.true(isReleased);
-  t.is(releaseUrl, `https://my-custom-host.org/user/repo/releases/tag/1.0.1`);
+  t.is(releaseUrl, `https://custom.example.org/user/repo/releases/tag/1.0.1`);
   exec.restore();
 });
 
 test('should release to git.pushRepo', async t => {
-  const remote = { api: 'https://my-custom-host.org/api/v3', host: 'my-custom-host.org' };
+  const remote = { api: 'https://custom.example.org/api/v3', host: 'custom.example.org' };
   interceptCreate(Object.assign({ body: { tag_name: '1.0.1' } }, remote));
   const options = { git: { pushRepo: 'upstream', changelog: '' }, github: { tokenRef, skipChecks: true } };
   const github = factory(GitHub, { options });
   const exec = sinon.stub(github.shell, 'exec').callThrough();
   exec.withArgs('git describe --tags --match=* --abbrev=0').resolves('1.0.0');
-  exec.withArgs('git remote get-url upstream').resolves('https://my-custom-host.org/user/repo');
+  exec.withArgs('git remote get-url upstream').resolves('https://custom.example.org/user/repo');
 
   await runTasks(github);
 
   const { isReleased, releaseUrl } = github.getContext();
   t.true(isReleased);
-  t.is(releaseUrl, 'https://my-custom-host.org/user/repo/releases/tag/1.0.1');
+  t.is(releaseUrl, 'https://custom.example.org/user/repo/releases/tag/1.0.1');
   exec.restore();
 });
 
@@ -385,10 +385,10 @@ test('should generate GitHub web release url for enterprise host', async t => {
   const options = {
     git,
     github: {
-      pushRepo: 'git://my-custom-host.org:user/repo',
+      pushRepo: 'git://custom.example.org:user/repo',
       release: true,
       web: true,
-      host: 'my-custom-host.org',
+      host: 'custom.example.org',
       releaseName: 'The Launch',
       releaseNotes: 'echo It happened'
     }
@@ -403,7 +403,7 @@ test('should generate GitHub web release url for enterprise host', async t => {
   t.true(isReleased);
   t.is(
     releaseUrl,
-    'https://my-custom-host.org/user/repo/releases/new?tag=2.0.2&title=The+Launch&body=It+happened&prerelease=false'
+    'https://custom.example.org/user/repo/releases/new?tag=2.0.2&title=The+Launch&body=It+happened&prerelease=false'
   );
   exec.restore();
 });

package/test/gitlab.js

@@ -7,7 +7,8 @@ const {
   interceptCollaborator,
   interceptCollaboratorFallback,
   interceptPublish,
-  interceptAsset
+  interceptAsset,
+  interceptMilestones
 } = require('./stub/gitlab');
 const { factory, runTasks } = require('./util');
 
@@ -55,7 +56,8 @@ test.serial('should upload assets and release', async t => {
       release: true,
       releaseName: 'Release ${version}',
       releaseNotes: 'echo Custom notes',
-      assets: 'test/resources/file-v${version}.txt'
+      assets: 'test/resources/file-v${version}.txt',
+      milestones: ['${version}', '${latestVersion} UAT']
     }
   };
   const gitlab = factory(GitLab, { options });
@@ -63,6 +65,26 @@ test.serial('should upload assets and release', async t => {
 
   interceptUser();
   interceptCollaborator();
+  interceptMilestones({
+    query: { title: '2.0.1' },
+    milestones: [
+      {
+        id: 17,
+        iid: 3,
+        title: '2.0.1'
+      }
+    ]
+  });
+  interceptMilestones({
+    query: { title: '2.0.0 UAT' },
+    milestones: [
+      {
+        id: 42,
+        iid: 4,
+        title: '2.0.0 UAT'
+      }
+    ]
+  });
   interceptAsset();
   interceptPublish({
     body: {
@@ -76,7 +98,8 @@ test.serial('should upload assets and release', async t => {
             url: `${pushRepo}/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/file-v2.0.1.txt`
           }
         ]
-      }
+      },
+      milestones: ['2.0.1', '2.0.0 UAT']
     }
   });
 
@@ -88,6 +111,41 @@ test.serial('should upload assets and release', async t => {
   t.is(releaseUrl, `${pushRepo}/-/releases`);
 });
 
+test.serial('should throw when release milestone is missing', async t => {
+  const pushRepo = 'https://gitlab.com/user/repo';
+  const options = {
+    git: { pushRepo },
+    gitlab: {
+      tokenRef,
+      release: true,
+      milestones: ['${version}', '${latestVersion} UAT']
+    }
+  };
+  const gitlab = factory(GitLab, { options });
+  sinon.stub(gitlab, 'getLatestVersion').resolves('2.0.0');
+
+  interceptUser();
+  interceptCollaborator();
+  interceptMilestones({
+    query: { title: '2.0.1' },
+    milestones: [
+      {
+        id: 17,
+        iid: 3,
+        title: '2.0.1'
+      }
+    ]
+  });
+  interceptMilestones({
+    query: { title: '2.0.0 UAT' },
+    milestones: []
+  });
+
+  await t.throwsAsync(runTasks(gitlab), {
+    message: /^Missing one or more milestones in GitLab. Creating a GitLab release will fail./
+  });
+});
+
 test.serial('should release to self-managed host', async t => {
   const host = 'https://gitlab.example.org';
   const scope = nock(host);
@@ -195,7 +253,14 @@ test('should not make requests in dry run', async t => {
 });
 
 test('should skip checks', async t => {
-  const options = { gitlab: { tokenRef, skipChecks: true } };
+  const options = { gitlab: { tokenRef, skipChecks: true, release: true, milestones: ['v1.0.0'] } };
   const gitlab = factory(GitLab, { options });
+  const spy = sinon.spy(gitlab, 'client', ['get']);
+
   await t.notThrowsAsync(gitlab.init());
+  await t.notThrowsAsync(gitlab.beforeRelease());
+
+  t.is(spy.get.callCount, 0);
+
+  t.is(gitlab.log.exec.args.filter(entry => /checkReleaseMilestones/.test(entry[0])).length, 0);
 });

package/test/npm.js

@@ -13,9 +13,9 @@ test('should return npm package url', t => {
 });
 
 test('should return npm package url (custom registry)', t => {
-  const options = { npm: { name: 'my-cool-package', publishConfig: { registry: 'https://my-registry.com/' } } };
+  const options = { npm: { name: 'my-cool-package', publishConfig: { registry: 'https://registry.example.org/' } } };
   const npmClient = factory(npm, { options });
-  t.is(npmClient.getPackageUrl(), 'https://my-registry.com/package/my-cool-package');
+  t.is(npmClient.getPackageUrl(), 'https://registry.example.org/package/my-cool-package');
 });
 
 test('should return default tag', async t => {
@@ -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/gitlab.js

@@ -19,6 +19,22 @@ module.exports.interceptCollaboratorFallback = (
     .get(`/api/v4/projects/${group ? `${group}%2F` : ''}${owner}%2F${project}/members/${userId}`)
     .reply(200, { id: userId, username: owner, access_level: 30 });
 
+module.exports.interceptMilestones = (
+  { host = 'https://gitlab.com', owner = 'user', project = 'repo', query = {}, milestones = [] } = {},
+  options
+) =>
+  nock(host, options)
+    .get(`/api/v4/projects/${owner}%2F${project}/milestones`)
+    .query(
+      Object.assign(
+        {
+          include_parent_milestones: true
+        },
+        query
+      )
+    )
+    .reply(200, JSON.stringify(milestones));
+
 module.exports.interceptPublish = (
   { host = 'https://gitlab.com', owner = 'user', project = 'repo', body } = {},
   options

package/test/tasks.js

@@ -358,7 +358,7 @@ test.serial('should initially publish non-private scoped npm package privately',
 test.serial('should use pkg.publishConfig.registry', async t => {
   const { target } = t.context;
   const pkgName = path.basename(target);
-  const registry = 'https://my-registry.com';
+  const registry = 'https://my-registry.example.org';
 
   gitAdd(
     JSON.stringify({

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);