release-it 17.9.0 → 17.10.0

package/lib/plugin/gitlab/GitLab.js

@@ -165,6 +165,7 @@ class GitLab extends Release {
     const url = `${baseUrl}/${endpoint}${options.searchParams ? `?${new URLSearchParams(options.searchParams)}` : ''}`;
     const headers = {
       'user-agent': 'webpro/release-it',
+      'Content-Type': typeof options.json !== 'undefined' ? 'application/json' : 'text/plain',
       [tokenHeader]: this.token
     };
     const requestOptions = {
@@ -173,18 +174,29 @@ class GitLab extends Release {
       ...this.certificateAuthorityOption
     };
 
-    const response = await fetch(
-      url,
-      options.json || options.body
-        ? {
-            ...requestOptions,
-            body: options.json ? JSON.stringify(options.json) : options.body
-          }
-        : requestOptions
-    );
-    const body = await response.json();
-    this.debug(body);
-    return body;
+    try {
+      const response = await fetch(
+        url,
+        options.json || options.body
+          ? {
+              ...requestOptions,
+              body: options.json ? JSON.stringify(options.json) : options.body
+            }
+          : requestOptions
+      );
+
+      if (!response.ok) {
+        const body = await response.json();
+        throw new Error(body.error);
+      }
+
+      const body = await response.json();
+      this.debug(body);
+      return body;
+    } catch (err) {
+      this.debug(err);
+      throw err;
+    }
   }
 
   async createRelease() {
@@ -195,7 +207,7 @@ class GitLab extends Release {
     const name = format(releaseName, this.config.getContext());
     const tagMessage = format(tagAnnotation, this.config.getContext());
     const description = releaseNotes || '-';
-    const releaseUrl = `${origin}/${repo.repository}/-/releases`;
+    const releaseUrl = `${origin}/${repo.repository}/-/releases/${tagName}`;
     const releaseMilestones = this.getReleaseMilestones();
 
     this.log.exec(`gitlab releases#createRelease "${name}" (${tagName})`, { isDryRun });
@@ -227,10 +239,11 @@ class GitLab extends Release {
     }
 
     try {
-      await this.request(endpoint, options);
+      const body = await this.request(endpoint, options);
+      const releaseUrlSelf = body._links?.self ?? releaseUrl;
       this.log.verbose('gitlab releases#createRelease: done');
-      this.setContext({ isReleased: true, releaseUrl });
-      this.config.setContext({ isReleased: true, releaseUrl });
+      this.setContext({ isReleased: true, releaseUrl: releaseUrlSelf });
+      this.config.setContext({ isReleased: true, releaseUrl: releaseUrlSelf });
       return true;
     } catch (err) {
       this.debug(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "17.9.0",
+  "version": "17.10.0",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",

package/test/gitlab.js

@@ -114,7 +114,7 @@ test.serial('should upload assets and release', async t => {
   t.is(gitlab.assets[0].url, `${pushRepo}/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/file-v2.0.1.txt`);
   const { isReleased, releaseUrl } = gitlab.getContext();
   t.true(isReleased);
-  t.is(releaseUrl, `${pushRepo}/-/releases`);
+  t.is(releaseUrl, `${pushRepo}/-/releases/2.0.1`);
 });
 
 test.serial('should upload assets with ID-based URLs too', async t => {
@@ -211,7 +211,7 @@ test.serial('should release to sub-grouped repo', async t => {
 
   const { isReleased, releaseUrl } = gitlab.getContext();
   t.true(isReleased);
-  t.is(releaseUrl, 'https://gitlab.com/group/sub-group/repo/-/releases');
+  t.regex(releaseUrl, /https:\/\/gitlab.com\/group\/sub-group\/repo\/-\/releases\//);
 });
 
 test.serial('should throw for unauthenticated user', async t => {
@@ -265,7 +265,7 @@ test('should not make requests in dry run', async t => {
   t.is(gitlab.log.exec.args[2][0], 'gitlab releases#uploadAssets');
   t.is(gitlab.log.exec.args[3][0], 'gitlab releases#createRelease "R" (1.0.1)');
   t.true(isReleased);
-  t.is(releaseUrl, `${pushRepo}/-/releases`);
+  t.is(releaseUrl, `${pushRepo}/-/releases/1.0.1`);
 });
 
 test('should skip checks', async t => {

package/test/stub/gitlab.js

@@ -12,7 +12,13 @@ export let interceptCollaborator = (
     .reply(200, { id: userId, username: owner, access_level: 30 });
 
 export let interceptPublish = ({ host = 'https://gitlab.com', owner = 'user', project = 'repo', body } = {}, options) =>
-  nock(host, options).post(`/api/v4/projects/${owner}%2F${project}/releases`, body).reply(200, {});
+  nock(host, options)
+    .post(`/api/v4/projects/${owner}%2F${project}/releases`, body)
+    .reply(200, {
+      _links: {
+        self: `https://gitlab.com/${owner}/${project}/-/releases/${body?.tag_name ?? '1.0.0'}`
+      }
+    });
 
 export let interceptMilestones = (
   { host = 'https://gitlab.com', owner = 'user', project = 'repo', query = {}, milestones = [] } = {},
@@ -34,12 +40,15 @@ export let interceptAsset = ({ host = 'https://gitlab.com', owner = 'user', proj
   nock(host)
     .post(`/api/v4/projects/${owner}%2F${project}/uploads`)
     .query(true)
-    .reply(200, function (_, requestBody) {
+    .reply(200, (_, requestBody) => {
       const [, name] = requestBody.match(/filename="([^"]+)/);
       return {
         alt: name,
         url: `/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name}`,
         full_path: `/-/project/1234/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name}`,
-        markdown: `[${name}](/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name})`
+        markdown: `[${name}](/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name})`,
+        _links: {
+          self: `https://gitlab.com/${owner}/${project}/-/releases/${name}`
+        }
       };
     });

package/test/tasks.js

@@ -339,7 +339,7 @@ test.serial('should release all the things (pre-release, github, gitlab)', async
   t.true(log.obtrusive.firstCall.args[0].endsWith(`release ${pkgName} (1.0.0...1.1.0-alpha.0)`));
   t.true(log.log.firstCall.args[0].endsWith(`https://www.npmjs.com/package/${pkgName}`));
   t.true(log.log.secondCall.args[0].endsWith(`https://github.com/${owner}/${project}/releases/tag/v1.1.0-alpha.0`));
-  t.true(log.log.thirdCall.args[0].endsWith(`${project}/-/releases`));
+  t.true(log.log.thirdCall.args[0].endsWith(`${project}/-/releases/v1.1.0-alpha.0`));
   t.regex(log.log.lastCall.args[0], /Done \(in [0-9]+s\.\)/);
 
   exec.restore();