release-it 17.5.0 → 18.0.0-next.0

package/config/release-it.json

@@ -63,6 +63,7 @@
     "tokenRef": "GITLAB_TOKEN",
     "tokenHeader": "Private-Token",
     "certificateAuthorityFile": null,
+    "secure": null,
     "assets": null,
     "origin": null,
     "skipChecks": false

package/lib/plugin/github/GitHub.js

@@ -2,7 +2,6 @@ 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';
@@ -177,8 +176,7 @@ class GitHub extends Release {
       userAgent: `release-it/${pkg.version}`,
       log: this.config.isDebug ? console : null,
       request: {
-        timeout,
-        fetch
+        timeout
       }
     };
 

package/lib/plugin/gitlab/GitLab.js

@@ -1,8 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import got from 'got';
 import { globby } from 'globby';
-import { FormData, fileFromSync } from 'node-fetch';
 import _ from 'lodash';
 import Release from '../GitRelease.js';
 import { format, e } from '../../util.js';
@@ -17,26 +15,17 @@ class GitLab extends Release {
     super(...args);
     this.registerPrompts(prompts);
     this.assets = [];
-    const { certificateAuthorityFile } = this.options;
-    this.certificateAuthorityOption = certificateAuthorityFile
-      ? { https: { certificateAuthority: fs.readFileSync(certificateAuthorityFile) } }
-      : {};
-  }
+    const { certificateAuthorityFile, secure } = this.options;
 
-  get client() {
-    if (this._client) return this._client;
-    const { tokenHeader } = this.options;
-    const { baseUrl } = this.getContext();
-    this._client = got.extend({
-      prefixUrl: baseUrl,
-      method: 'POST',
-      headers: {
-        'user-agent': 'webpro/release-it',
-        [tokenHeader]: this.token
-      },
-      ...this.certificateAuthorityOption
-    });
-    return this._client;
+    const httpsOptions = {
+      certificateAuthority: certificateAuthorityFile ? fs.readFileSync(certificateAuthorityFile) : undefined,
+      rejectUnauthorized: typeof secure === 'boolean' ? secure : undefined
+    };
+
+    // Remove keys with undefined values
+    const https = _.pickBy(httpsOptions, value => value !== undefined);
+
+    this.certificateAuthorityOption = _.isEmpty(https) ? {} : { https };
   }
 
   async init() {
@@ -172,8 +161,28 @@ class GitLab extends Release {
     const { baseUrl } = this.getContext();
     this.debug(Object.assign({ url: `${baseUrl}/${endpoint}` }, options));
     const method = (options.method || 'POST').toLowerCase();
-    const response = await this.client[method](endpoint, options);
-    const body = typeof response.body === 'string' ? JSON.parse(response.body) : response.body || {};
+    const { tokenHeader } = this.options;
+    const url = `${baseUrl}/${endpoint}${options.searchParams ? `?${new URLSearchParams(options.searchParams)}` : ''}`;
+    const headers = {
+      'user-agent': 'webpro/release-it',
+      [tokenHeader]: this.token
+    };
+    const requestOptions = {
+      method,
+      headers,
+      ...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;
   }
@@ -232,7 +241,8 @@ class GitLab extends Release {
     const endpoint = `projects/${id}/uploads`;
 
     const body = new FormData();
-    body.set('file', fileFromSync(filePath));
+    const rawData = await fs.promises.readFile(filePath);
+    body.set('file', new Blob([rawData]), name);
     const options = { body };
 
     try {

package/lib/prompt.js

@@ -19,7 +19,7 @@ class Prompt {
       name: promptName,
       message: prompt.message(context),
       choices: 'choices' in prompt && prompt.choices(context),
-      transformer: 'transformer' in prompt && prompt.transformer(context)
+      transformer: 'transformer' in prompt ? prompt.transformer(context) : undefined
     });
 
     const answers = await this.createPrompt([options]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "17.5.0",
+  "version": "18.0.0-next.0",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -79,64 +79,62 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@octokit/rest": "20.1.1",
+    "@octokit/rest": "21.0.2",
     "async-retry": "1.3.3",
     "chalk": "5.3.0",
     "cosmiconfig": "9.0.0",
-    "execa": "8.0.1",
-    "git-url-parse": "14.0.0",
+    "execa": "9.3.1",
+    "git-url-parse": "15.0.0",
     "globby": "14.0.2",
-    "got": "13.0.0",
-    "inquirer": "9.3.2",
+    "inquirer": "10.1.8",
     "is-ci": "3.0.1",
     "issue-parser": "7.0.1",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "new-github-release-url": "2.0.0",
-    "node-fetch": "3.3.2",
     "open": "10.1.0",
     "ora": "8.0.1",
-    "os-name": "5.1.0",
+    "os-name": "6.0.0",
     "proxy-agent": "6.4.0",
-    "semver": "7.6.2",
+    "semver": "7.6.3",
     "shelljs": "0.8.5",
-    "update-notifier": "7.0.0",
+    "update-notifier": "7.2.0",
     "url-join": "5.0.0",
     "wildcard-match": "5.1.3",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@eslint/compat": "1.1.0",
+    "@eslint/compat": "1.1.1",
     "@eslint/eslintrc": "3.1.0",
-    "@eslint/js": "9.6.0",
-    "@octokit/request-error": "5.1.0",
-    "@types/node": "20.14.9",
+    "@eslint/js": "9.9.1",
+    "@octokit/request-error": "6.1.4",
+    "@types/node": "20.14.10",
     "ava": "6.1.3",
-    "eslint": "9.6.0",
+    "eslint": "9.9.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-ava": "15.0.1",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-prettier": "5.1.3",
+    "eslint-plugin-import-x": "3.1.0",
+    "eslint-plugin-prettier": "5.2.1",
     "fs-monkey": "1.0.6",
-    "globals": "15.7.0",
+    "globals": "15.9.0",
     "installed-check": "9.3.0",
-    "knip": "5.23.2",
-    "memfs": "4.9.3",
+    "knip": "5.27.3",
+    "memfs": "4.11.1",
     "mock-stdio": "1.0.3",
-    "nock": "13.5.4",
-    "prettier": "3.3.2",
+    "nock": "14.0.0-beta.8",
+    "prettier": "3.3.3",
     "remark-cli": "12.0.1",
     "remark-preset-webpro": "1.1.0",
     "sinon": "18.0.0",
     "strip-ansi": "7.1.0",
-    "typescript": "5.5.2"
+    "typescript": "5.5.4"
   },
   "overrides": {
     "pac-resolver": "7.0.1",
     "socks": "2.8.3"
   },
   "engines": {
-    "node": "^18.18.0 || ^20.9.0 || ^22.0.0"
+    "node": "^20.9.0 || ^22.0.0"
   },
   "remarkConfig": {
     "plugins": [

package/schema/git.json

@@ -14,7 +14,11 @@
       "default": true
     },
     "requireBranch": {
-      "type": "boolean",
+      "oneOf": [
+        { "type": "boolean", "enum": [false] },
+        { "type": "string" },
+        { "type": "array", "items": { "type": "string" } }
+      ],
       "default": false
     },
     "requireUpstream": {

package/schema/gitlab.json

@@ -46,6 +46,9 @@
     "certificateAuthorityFile": {
       "default": null
     },
+    "secure": {
+      "default": null
+    },
     "assets": {
       "default": null
     },

package/test/gitlab.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import test from 'ava';
 import sinon from 'sinon';
 import nock from 'nock';
@@ -225,28 +226,70 @@ test('should not make requests in dry run', async t => {
   const options = { 'dry-run': true, git: { pushRepo }, gitlab: { releaseName: 'R', tokenRef } };
   const gitlab = factory(GitLab, { options });
   sinon.stub(gitlab, 'getLatestVersion').resolves('1.0.0');
-  const spy = sinon.spy(gitlab, 'client', ['get']);
 
   await runTasks(gitlab);
 
   const { isReleased, releaseUrl } = gitlab.getContext();
-  t.is(spy.get.callCount, 0);
+
   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`);
-  spy.get.restore();
 });
 
 test('should skip checks', async t => {
   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);
 });
+
+test('should handle certificate authority options', t => {
+  const sandbox = sinon.createSandbox();
+  sandbox.stub(fs, 'readFileSync').returns('test certificate');
+
+  {
+    const options = { gitlab: {} };
+    const gitlab = factory(GitLab, { options });
+    t.deepEqual(gitlab.certificateAuthorityOption, {});
+  }
+
+  {
+    const options = { gitlab: { certificateAuthorityFile: 'cert.crt' } };
+    const gitlab = factory(GitLab, { options });
+    t.deepEqual(gitlab.certificateAuthorityOption, { https: { certificateAuthority: 'test certificate' } });
+  }
+
+  {
+    const options = { gitlab: { secure: false } };
+    const gitlab = factory(GitLab, { options });
+    t.deepEqual(gitlab.certificateAuthorityOption, { https: { rejectUnauthorized: false } });
+  }
+
+  {
+    const options = { gitlab: { secure: true } };
+    const gitlab = factory(GitLab, { options });
+    t.deepEqual(gitlab.certificateAuthorityOption, { https: { rejectUnauthorized: true } });
+  }
+
+  {
+    const options = { gitlab: { certificateAuthorityFile: 'cert.crt', secure: true } };
+    const gitlab = factory(GitLab, { options });
+    t.deepEqual(gitlab.certificateAuthorityOption, {
+      https: { certificateAuthority: 'test certificate', rejectUnauthorized: true }
+    });
+  }
+
+  {
+    const options = { gitlab: { certificateAuthorityFile: 'cert.crt', secure: false } };
+    const gitlab = factory(GitLab, { options });
+    t.deepEqual(gitlab.certificateAuthorityOption, {
+      https: { certificateAuthority: 'test certificate', rejectUnauthorized: false }
+    });
+  }
+
+  sandbox.restore();
+});

package/test/prompt.js

@@ -42,7 +42,7 @@ test('should create prompt', async t => {
     message: 'Push?',
     name: 'push',
     choices: false,
-    transformer: false,
+    transformer: undefined,
     default: true
   });
 });

package/types/config.d.ts

@@ -170,6 +170,9 @@ export interface Config {
 
     /** @default null */
     certificateAuthorityFile?: any;
+    
+    /** @default null */
+    secure?: boolean;
 
     /** @default null */
     assets?: any;