release-it 14.9.0 → 14.10.0

package/lib/plugin/github/GitHub.js

@@ -19,7 +19,8 @@ const DEFAULT_RETRY_MIN_TIMEOUT = 1000;
 const parseErrormsg = err => {
   let msg = err;
   if (err instanceof Error) {
-    const { status, message, headers } = err;
+    const { status, message } = err;
+    const { headers } = err.response;
     msg = `${_.get(headers, 'status', status)} (${message})`;
   }
   return msg;
@@ -259,6 +260,7 @@ class GitHub extends Release {
   uploadAssets() {
     const { assets } = this.options;
     const { isReleased } = this.getContext();
+    const context = this.config.getContext();
     const { isDryRun } = this.config;
 
     this.log.exec('octokit repos.uploadReleaseAssets', assets, { isDryRun });
@@ -267,7 +269,9 @@ class GitHub extends Release {
       return true;
     }
 
-    return globby(assets).then(files => {
+    const patterns = _.castArray(assets).map(pattern => format(pattern, context));
+
+    return globby(patterns).then(files => {
       if (!files.length) {
         this.log.warn(`octokit repos.uploadReleaseAssets: did not find "${assets}" relative to ${process.cwd()}`);
       }

package/lib/plugin/gitlab/GitLab.js

@@ -3,6 +3,7 @@ const path = require('path');
 const got = require('got');
 const globby = require('globby');
 const FormData = require('form-data');
+const _ = require('lodash');
 const Release = require('../GitRelease');
 const { format, e } = require('../../util');
 const prompts = require('./prompts');
@@ -195,6 +196,7 @@ class GitLab extends Release {
   uploadAssets() {
     const { assets } = this.options;
     const { isDryRun } = this.config;
+    const context = this.config.getContext();
 
     this.log.exec('gitlab releases#uploadAssets', assets, { isDryRun });
 
@@ -202,7 +204,9 @@ class GitLab extends Release {
       return noop;
     }
 
-    return globby(assets).then(files => {
+    const patterns = _.castArray(assets).map(pattern => format(pattern, context));
+
+    return globby(patterns).then(files => {
       if (!files.length) {
         this.log.warn(`gitlab releases#uploadAssets: could not find "${assets}" relative to ${process.cwd()}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "14.9.0",
+  "version": "14.10.0",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -58,24 +58,24 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@octokit/rest": "18.5.3",
+    "@octokit/rest": "18.6.0",
     "async-retry": "1.3.1",
     "chalk": "4.1.1",
     "cosmiconfig": "7.0.0",
     "debug": "4.3.1",
     "deprecated-obj": "2.0.0",
-    "execa": "5.0.0",
+    "execa": "5.1.1",
     "find-up": "5.0.0",
     "form-data": "4.0.0",
     "git-url-parse": "11.4.4",
-    "globby": "11.0.3",
+    "globby": "11.0.4",
     "got": "11.8.2",
     "import-cwd": "3.0.0",
-    "inquirer": "8.1.0",
+    "inquirer": "8.1.1",
     "is-ci": "3.0.0",
     "lodash": "4.17.21",
-    "mime-types": "2.1.30",
-    "ora": "5.4.0",
+    "mime-types": "2.1.31",
+    "ora": "5.4.1",
     "os-name": "4.0.0",
     "parse-json": "5.2.0",
     "semver": "7.3.5",
@@ -87,22 +87,22 @@
     "yargs-parser": "20.2.7"
   },
   "devDependencies": {
-    "@octokit/request-error": "2.0.5",
+    "@octokit/request-error": "2.1.0",
     "ava": "3.15.0",
     "codecov": "3.8.2",
-    "eslint": "7.27.0",
+    "eslint": "7.29.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-ava": "12.0.0",
-    "eslint-plugin-import": "2.23.3",
+    "eslint-plugin-import": "2.23.4",
     "eslint-plugin-prettier": "3.4.0",
     "markdown-toc": "1.2.0",
-    "mock-fs": "4.14.0",
+    "mock-fs": "5.0.0",
     "mock-stdio": "1.0.3",
-    "nock": "13.0.11",
+    "nock": "13.1.0",
     "nyc": "15.1.0",
-    "prettier": "2.3.0",
+    "prettier": "2.3.1",
     "proxyquire": "2.1.3",
-    "sinon": "10.0.1",
+    "sinon": "11.1.1",
     "strip-ansi": "6.0.0"
   },
   "engines": {

package/test/github.js

@@ -16,6 +16,7 @@ const tokenRef = 'GITHUB_TOKEN';
 const pushRepo = 'git://github.com:user/repo';
 const host = 'github.com';
 const git = { changelog: null };
+const requestErrorOptions = { request: { url: '', headers: {} }, response: { headers: {} } };
 
 test.serial('should validate token', async t => {
   const tokenRef = 'MY_GITHUB_TOKEN';
@@ -34,7 +35,6 @@ test.serial('should validate token', async t => {
 });
 
 test('should release and upload assets', async t => {
-  const asset = 'file1';
   const options = {
     git,
     github: {
@@ -43,7 +43,7 @@ test('should release and upload assets', async t => {
       release: true,
       releaseName: 'Release ${tagName}',
       releaseNotes: 'echo Custom notes',
-      assets: `test/resources/${asset}`
+      assets: 'test/resources/file-v${version}.txt'
     }
   };
   const github = factory(GitHub, { options });
@@ -53,7 +53,7 @@ test('should release and upload assets', async t => {
   interceptAuthentication();
   interceptCollaborator();
   interceptCreate({ body: { tag_name: '2.0.2', name: 'Release 2.0.2', body: 'Custom notes' } });
-  interceptAsset({ body: asset });
+  interceptAsset({ body: '*' });
 
   await runTasks(github);
 
@@ -225,7 +225,7 @@ test('should throw for unauthenticated user', async t => {
   const options = { github: { tokenRef, pushRepo, host } };
   const github = factory(GitHub, { options });
   const stub = sinon.stub(github.client.users, 'getAuthenticated');
-  stub.throws(new RequestError('Bad credentials', 401, { request: { url: '', headers: {} } }));
+  stub.throws(new RequestError('Bad credentials', 401, requestErrorOptions));
 
   await t.throwsAsync(runTasks(github), {
     message: /^Could not authenticate with GitHub using environment variable "GITHUB_TOKEN"/
@@ -240,7 +240,7 @@ test('should throw for non-collaborator', async t => {
   const options = { github: { tokenRef, pushRepo, host } };
   const github = factory(GitHub, { options });
   const stub = sinon.stub(github.client.repos, 'checkCollaborator');
-  stub.throws(new RequestError('HttpError', 401, { request: { url: '', headers: {} } }));
+  stub.throws(new RequestError('HttpError', 401, requestErrorOptions));
 
   await t.throwsAsync(runTasks(github), { message: /^User john is not a collaborator for user\/repo/ });
 
@@ -271,7 +271,7 @@ test.serial('should skip authentication and collaborator checks when running on
 test('should handle octokit client error (without retries)', async t => {
   const github = factory(GitHub, { options: { github: { tokenRef, pushRepo, host } } });
   const stub = sinon.stub(github.client.repos, 'createRelease');
-  stub.throws(new RequestError('Not found', 404, { request: { url: '', headers: {} } }));
+  stub.throws(new RequestError('Not found', 404, requestErrorOptions));
   interceptAuthentication();
   interceptCollaborator();
 
@@ -285,7 +285,7 @@ test('should handle octokit client error (with retries)', async t => {
   const options = { github: { tokenRef, pushRepo, host, retryMinTimeout: 0 } };
   const github = factory(GitHub, { options });
   const stub = sinon.stub(github.client.repos, 'createRelease');
-  stub.throws(new RequestError('Request failed', 500, { request: { url: '', headers: {} } }));
+  stub.throws(new RequestError('Request failed', 500, requestErrorOptions));
   interceptAuthentication();
   interceptCollaborator();
 
@@ -310,7 +310,7 @@ test('should not call octokit client in dry run', async t => {
   const { isReleased, releaseUrl } = github.getContext();
   t.true(isReleased);
   t.is(releaseUrl, 'https://github.com/user/repo/releases/tag/v1.0.1');
-  spy.restore();
+  spy.get.restore();
   exec.restore();
 });
 

package/test/gitlab.js

@@ -48,7 +48,6 @@ test.serial('should support CI Job token header', async t => {
 
 test.serial('should upload assets and release', async t => {
   const pushRepo = 'https://gitlab.com/user/repo';
-  const asset = 'file1';
   const options = {
     git: { pushRepo },
     gitlab: {
@@ -56,7 +55,7 @@ test.serial('should upload assets and release', async t => {
       release: true,
       releaseName: 'Release ${version}',
       releaseNotes: 'echo Custom notes',
-      assets: `test/resources/${asset}`
+      assets: 'test/resources/file-v${version}.txt'
     }
   };
   const gitlab = factory(GitLab, { options });
@@ -73,8 +72,8 @@ test.serial('should upload assets and release', async t => {
       assets: {
         links: [
           {
-            name: asset,
-            url: `${pushRepo}/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${asset}`
+            name: 'file-v2.0.1.txt',
+            url: `${pushRepo}/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/file-v2.0.1.txt`
           }
         ]
       }
@@ -83,7 +82,7 @@ test.serial('should upload assets and release', async t => {
 
   await runTasks(gitlab);
 
-  t.is(gitlab.assets[0].url, `${pushRepo}/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${asset}`);
+  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`);
@@ -192,7 +191,7 @@ test('should not make requests in dry run', async t => {
   t.is(gitlab.log.exec.args[2][0], 'gitlab releases#createRelease "R" (1.0.1)');
   t.true(isReleased);
   t.is(releaseUrl, `${pushRepo}/-/releases`);
-  spy.restore();
+  spy.get.restore();
 });
 
 test('should skip checks', async t => {

package/test/resources/file-v2.0.1.txt

@@ -0,0 +1 @@
+*

package/test/resources/file-v2.0.2.txt

@@ -0,0 +1 @@
+*