release-it 17.4.1 → 17.5.0

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/factory.js

@@ -27,10 +27,12 @@ const load = async pluginName => {
     const module = await import(pluginName);
     plugin = module.default;
   } catch (err) {
+    debug(err);
     try {
       const module = await import(path.join(process.cwd(), pluginName));
       plugin = module.default;
     } catch (err) {
+      debug(err);
       // In some cases or tests we might need to support legacy `require.resolve`
       const require = createRequire(process.cwd());
       const module = await import(url.pathToFileURL(require.resolve(pluginName, { paths: [process.cwd()] })));

package/lib/plugin/github/GitHub.js

@@ -105,8 +105,8 @@ class GitHub extends Release {
       const { data } = await this.client.users.getAuthenticated();
       this.setContext({ username: data.login });
       return true;
-    } catch (error) {
-      this.debug(error);
+    } catch (err) {
+      this.debug(err);
       return false;
     }
   }
@@ -120,8 +120,8 @@ class GitHub extends Release {
       this.log.verbose(`octokit repos#checkCollaborator (${username})`);
       await this.client.repos.checkCollaborator(options);
       return true;
-    } catch (error) {
-      this.debug(error);
+    } catch (err) {
+      this.debug(err);
       return false;
     }
   }

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/lib/shell.js

@@ -78,12 +78,12 @@ class Shell {
       this.log.verbose(stdout, { isExternal });
       debug({ command, options, stdout, stderr });
       return Promise.resolve(stdout || stderr);
-    } catch (error) {
-      if (error.stdout) {
-        this.log.log(`\n${error.stdout}`);
+    } catch (err) {
+      if (err.stdout) {
+        this.log.log(`\n${err.stdout}`);
       }
-      debug({ error });
-      return Promise.reject(new Error(error.stderr || error.message));
+      debug(err);
+      return Promise.reject(new Error(err.stderr || err.message));
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "17.4.1",
+  "version": "17.5.0",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -131,6 +131,10 @@
     "strip-ansi": "7.1.0",
     "typescript": "5.5.2"
   },
+  "overrides": {
+    "pac-resolver": "7.0.1",
+    "socks": "2.8.3"
+  },
   "engines": {
     "node": "^18.18.0 || ^20.9.0 || ^22.0.0"
   },

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/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

@@ -13,7 +13,7 @@ export interface Config {
     requireCleanWorkingDir?: boolean;
 
     /** @default false */
-    requireBranch?: boolean;
+    requireBranch?: false | string;
 
     /** @default true */
     requireUpstream?: boolean;