release-it 17.4.2 → 17.6.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/config.js

@@ -50,14 +50,15 @@ class Config {
   }
 
   expandPreReleaseShorthand(options) {
-    const { increment, preRelease, preReleaseId, snapshot } = options;
+    const { increment, preRelease, preReleaseId, snapshot, preReleaseBase } = options;
     const isPreRelease = Boolean(preRelease) || Boolean(snapshot);
     const inc = snapshot ? 'prerelease' : increment;
     const preId = typeof preRelease === 'string' ? preRelease : typeof snapshot === 'string' ? snapshot : preReleaseId;
     options.version = {
       increment: inc,
       isPreRelease,
-      preReleaseId: preId
+      preReleaseId: preId,
+      preReleaseBase
     };
     if (typeof snapshot === 'string' && options.git) {
       // Pre set and hard code some options

package/lib/index.js

@@ -56,7 +56,7 @@ const runTasks = async (opts, di) => {
       await runLifeCycleHook(plugin, 'init');
     }
 
-    const { increment, isPreRelease, preReleaseId } = options.version;
+    const { increment, isPreRelease, preReleaseId, preReleaseBase } = options.version;
 
     const name = await reduceUntil(plugins, plugin => plugin.getName());
     const latestVersion = (await reduceUntil(plugins, plugin => plugin.getLatestVersion())) || '0.0.0';
@@ -67,7 +67,7 @@ const runTasks = async (opts, di) => {
       process.exit(0);
     }
 
-    const incrementBase = { latestVersion, increment, isPreRelease, preReleaseId };
+    const incrementBase = { latestVersion, increment, isPreRelease, preReleaseId, preReleaseBase };
 
     const { snapshot } = config.options;
     if (snapshot && (!incrementBase.latestVersion.startsWith('0.0.0') || incrementBase.latestVersion === '0.0.0')) {

package/lib/plugin/gitlab/GitLab.js

@@ -17,10 +17,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;
+
+    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 };
   }
 
   get client() {

package/lib/plugin/version/Version.js

@@ -16,10 +16,10 @@ const CHOICES = {
 };
 
 const getIncrementChoices = context => {
-  const { latestIsPreRelease, isPreRelease, preReleaseId } = context.version;
+  const { latestIsPreRelease, isPreRelease, preReleaseId, preReleaseBase } = context.version;
   const types = latestIsPreRelease ? CHOICES.latestIsPreRelease : isPreRelease ? CHOICES.preRelease : CHOICES.default;
   const choices = types.map(increment => ({
-    name: `${increment} (${semver.inc(context.latestVersion, increment, preReleaseId)})`,
+    name: `${increment} (${semver.inc(context.latestVersion, increment, preReleaseId, preReleaseBase)})`,
     value: increment
   }));
   const otherChoice = {
@@ -87,7 +87,7 @@ class Version extends Plugin {
     return Boolean(semver.valid(version));
   }
 
-  incrementVersion({ latestVersion, increment, isPreRelease, preReleaseId }) {
+  incrementVersion({ latestVersion, increment, isPreRelease, preReleaseId, preReleaseBase }) {
     if (increment === false) return latestVersion;
 
     const latestIsPreRelease = this.isPreRelease(latestVersion);
@@ -102,12 +102,12 @@ class Version extends Plugin {
     }
 
     if (isPreRelease && !increment && latestIsPreRelease) {
-      return semver.inc(latestVersion, 'prerelease', preReleaseId);
+      return semver.inc(latestVersion, 'prerelease', preReleaseId, preReleaseBase);
     }
 
     if (this.config.isCI && !increment) {
       if (isPreRelease) {
-        return semver.inc(latestVersion, 'prepatch', preReleaseId);
+        return semver.inc(latestVersion, 'prepatch', preReleaseId, preReleaseBase);
       } else {
         return semver.inc(latestVersion, 'patch');
       }
@@ -115,7 +115,7 @@ class Version extends Plugin {
 
     const normalizedType = RELEASE_TYPES.includes(increment) && isPreRelease ? `pre${increment}` : increment;
     if (ALL_RELEASE_TYPES.includes(normalizedType)) {
-      return semver.inc(latestVersion, normalizedType, preReleaseId);
+      return semver.inc(latestVersion, normalizedType, preReleaseId, preReleaseBase);
     }
 
     const coercedVersion = !isValidVersion && semver.coerce(increment);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "17.4.2",
+  "version": "17.6.0",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -100,36 +100,36 @@
     "proxy-agent": "6.4.0",
     "semver": "7.6.2",
     "shelljs": "0.8.5",
-    "update-notifier": "7.0.0",
+    "update-notifier": "7.1.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",
+    "@eslint/js": "9.7.0",
     "@octokit/request-error": "5.1.0",
-    "@types/node": "20.14.9",
+    "@types/node": "20.14.10",
     "ava": "6.1.3",
-    "eslint": "9.6.0",
+    "eslint": "9.7.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-ava": "15.0.1",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import-x": "3.0.1",
     "eslint-plugin-prettier": "5.1.3",
     "fs-monkey": "1.0.6",
-    "globals": "15.7.0",
+    "globals": "15.8.0",
     "installed-check": "9.3.0",
-    "knip": "5.23.2",
+    "knip": "5.26.0",
     "memfs": "4.9.3",
     "mock-stdio": "1.0.3",
     "nock": "13.5.4",
-    "prettier": "3.3.2",
+    "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.3"
   },
   "overrides": {
     "pac-resolver": "7.0.1",

package/schema/gitlab.json

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

package/test/config.js

@@ -101,6 +101,7 @@ test('should expand pre-release shortcut', t => {
   t.deepEqual(config.options.version, {
     increment: 'major',
     isPreRelease: true,
+    preReleaseBase: undefined,
     preReleaseId: 'beta'
   });
 });
@@ -110,6 +111,7 @@ test('should expand pre-release shortcut (preRelease boolean)', t => {
   t.deepEqual(config.options.version, {
     increment: undefined,
     isPreRelease: true,
+    preReleaseBase: undefined,
     preReleaseId: undefined
   });
 });
@@ -119,6 +121,7 @@ test('should expand pre-release shortcut (without increment)', t => {
   t.deepEqual(config.options.version, {
     increment: undefined,
     isPreRelease: true,
+    preReleaseBase: undefined,
     preReleaseId: 'alpha'
   });
 });
@@ -128,15 +131,27 @@ test('should expand pre-release shortcut (including increment and npm.tag)', t =
   t.deepEqual(config.options.version, {
     increment: 'minor',
     isPreRelease: true,
+    preReleaseBase: undefined,
     preReleaseId: 'rc'
   });
 });
 
+test('should use pre-release base', t => {
+  const config = new Config({ increment: 'minor', preRelease: 'next', preReleaseBase: '1' });
+  t.deepEqual(config.options.version, {
+    increment: 'minor',
+    isPreRelease: true,
+    preReleaseBase: '1',
+    preReleaseId: 'next'
+  });
+});
+
 test('should expand pre-release shortcut (snapshot)', t => {
   const config = new Config({ snapshot: 'feat' });
   t.deepEqual(config.options.version, {
     increment: 'prerelease',
     isPreRelease: true,
+    preReleaseBase: undefined,
     preReleaseId: 'feat'
   });
   t.is(config.options.git.tagMatch, '0.0.0-feat.[0-9]*');

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';
@@ -250,3 +251,50 @@ test('should skip checks', async t => {
 
   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/version.js

@@ -138,6 +138,34 @@ test('should increment version (patch release after pre-release)', t => {
   t.is(v.incrementVersion({ latestVersion: '1.2.3-alpha.1', increment: 'patch' }), '1.2.3');
 });
 
+test('should increment version and start at base 1', t => {
+  const v = factory(Version);
+  t.is(
+    v.incrementVersion({
+      latestVersion: '1.3.0',
+      increment: 'major',
+      isPreRelease: true,
+      preReleaseId: 'beta',
+      preReleaseBase: '1'
+    }),
+    '2.0.0-beta.1'
+  );
+});
+
+test('should increment prerelease version and ignore prelease base 1', t => {
+  const v = factory(Version);
+  t.is(
+    v.incrementVersion({
+      latestVersion: '1.2.3-alpha.5',
+      increment: 'prerelease',
+      preReleaseId: 'alpha',
+      isPreRelease: true,
+      preReleaseBase: '1'
+    }),
+    '1.2.3-alpha.6'
+  );
+});
+
 test('should run tasks without errors', async t => {
   const options = { version: { increment: 'minor' } };
   const v = factory(Version, { options });

package/types/config.d.ts

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