release-it 15.1.0-next.0 → 15.1.2

package/lib/plugin/git/Git.js

@@ -168,7 +168,8 @@ class Git extends GitBase {
 
   commit({ message = this.options.commitMessage, args = this.options.commitArgs } = {}) {
     const msg = format(message, this.config.getContext());
-    return this.exec(['git', 'commit', '--message', msg, ...fixArgs(args)]).then(
+    const commitMessageArgs = msg ? ['--message', msg] : [];
+    return this.exec(['git', 'commit', ...commitMessageArgs, ...fixArgs(args)]).then(
       () => this.setContext({ isCommitted: true }),
       err => {
         this.debug(err);

package/lib/plugin/github/GitHub.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import open from 'open';
 import { Octokit } from '@octokit/rest';
+import fetch from 'node-fetch';
 import { globby } from 'globby';
 import mime from 'mime-types';
 import _ from 'lodash';
@@ -164,7 +165,8 @@ class GitHub extends Release {
       userAgent: `release-it/${pkg.version}`,
       log: this.config.isDebug ? console : null,
       request: {
-        timeout
+        timeout,
+        fetch
       }
     };
 
@@ -280,14 +282,14 @@ class GitHub extends Release {
     const context = this.config.getContext();
     const { isDryRun } = this.config;
 
-    this.log.exec('octokit repos.uploadReleaseAssets', assets, { isDryRun });
+    const patterns = _.castArray(assets).map(pattern => format(pattern, context));
+
+    this.log.exec('octokit repos.uploadReleaseAssets', patterns, { isDryRun });
 
     if (!assets || !isReleased || isDryRun) {
       return true;
     }
 
-    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

@@ -253,14 +253,14 @@ class GitLab extends Release {
     const { isDryRun } = this.config;
     const context = this.config.getContext();
 
-    this.log.exec('gitlab releases#uploadAssets', assets, { isDryRun });
+    const patterns = _.castArray(assets).map(pattern => format(pattern, context));
+
+    this.log.exec('gitlab releases#uploadAssets', patterns, { isDryRun });
 
     if (!assets || isDryRun) {
       return noop;
     }
 
-    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": "15.1.0-next.0",
+  "version": "15.1.2",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -38,7 +38,7 @@
   "type": "module",
   "exports": {
     ".": "./lib/index.js",
-    "./test/util": "./test/util/index.js"
+    "./test/util.js": "./test/util/index.js"
   },
   "files": [
     "bin",
@@ -59,46 +59,47 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@octokit/rest": "18.12.0",
+    "@octokit/rest": "19.0.3",
     "async-retry": "1.3.3",
     "chalk": "5.0.1",
     "cosmiconfig": "7.0.1",
     "execa": "6.1.0",
     "form-data": "4.0.0",
     "git-url-parse": "11.6.0",
-    "globby": "13.1.1",
-    "got": "12.0.4",
-    "inquirer": "8.2.4",
+    "globby": "13.1.2",
+    "got": "12.1.0",
+    "inquirer": "9.0.1",
     "is-ci": "3.0.1",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "new-github-release-url": "2.0.0",
+    "node-fetch": "3.2.8",
     "open": "8.4.0",
-    "ora": "6.1.0",
+    "ora": "6.1.2",
     "os-name": "5.0.1",
     "promise.allsettled": "1.0.5",
     "proxy-agent": "5.0.0",
     "semver": "7.3.7",
     "shelljs": "0.8.5",
-    "update-notifier": "5.1.0",
+    "update-notifier": "6.0.2",
     "url-join": "5.0.0",
     "wildcard-match": "5.1.2",
     "yargs-parser": "21.0.1"
   },
   "devDependencies": {
-    "@octokit/request-error": "2.1.0",
-    "ava": "4.2.0",
-    "eslint": "8.14.0",
+    "@octokit/request-error": "3.0.0",
+    "ava": "4.3.1",
+    "eslint": "8.19.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-ava": "13.2.0",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-prettier": "4.2.1",
     "mock-fs": "5.1.2",
     "mock-stdio": "1.0.3",
-    "nock": "13.2.4",
+    "nock": "13.2.8",
     "nyc": "15.1.0",
-    "prettier": "2.6.2",
-    "sinon": "13.0.2",
+    "prettier": "2.7.1",
+    "sinon": "14.0.0",
     "strip-ansi": "7.0.1"
   },
   "engines": {

package/test/git.js

@@ -140,6 +140,20 @@ test.serial('should commit, tag and push with extra args', async t => {
   stub.restore();
 });
 
+test.serial('should amend commit without message if not provided', async t => {
+  const bare = mkTmpDir();
+  sh.exec(`git init --bare ${bare}`);
+  sh.exec(`git clone ${bare} .`);
+  gitAdd('line', 'file', 'Add file');
+  const options = { git: { commitArgs: ['--amend', '--no-edit', '--no-verify'] } };
+  const gitClient = factory(Git, { options });
+  const stub = sinon.stub(gitClient.shell, 'exec').resolves();
+  await gitClient.stage('package.json');
+  await gitClient.commit();
+  t.deepEqual(stub.secondCall.args[0], ['git', 'commit', '--amend', '--no-edit', '--no-verify']);
+  stub.restore();
+});
+
 test.serial('should commit and tag with quoted characters', async t => {
   const bare = mkTmpDir();
   sh.exec(`git init --bare ${bare}`);

package/test/github.js

@@ -198,7 +198,8 @@ test('should create new release for unreleased tag', async t => {
 });
 
 test('should release to enterprise host', async t => {
-  const github = factory(GitHub, { options: { git, github: { tokenRef } } });
+  const options = { git, github: { tokenRef, pushRepo: 'git://github.example.org:user/repo' } };
+  const github = factory(GitHub, { options });
   const exec = sinon.stub(github.shell, 'exec').callThrough();
   exec.withArgs('git remote get-url origin').resolves(`https://github.example.org/user/repo`);
   exec.withArgs('git config --get remote.origin.url').resolves(`https://github.example.org/user/repo`);
@@ -307,7 +308,7 @@ test.serial('should skip authentication and collaborator checks when running on
 
   t.is(authStub.callCount, 0);
   t.is(collaboratorStub.callCount, 0);
-  t.is(github.getContext('username'), 'webpro');
+  t.is(github.getContext('username'), process.env.GITHUB_ACTOR);
 
   authStub.restore();
   collaboratorStub.restore();