release-it 19.0.0-next.1 → 19.0.0-next.3

package/README.md

@@ -400,7 +400,7 @@ Are you using release-it at work? Please consider [sponsoring me][14]!
 [29]: ./docs/git.md
 [30]: https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases
 [31]: ./docs/github-releases.md
-[32]: https://docs.gitlab.com/ce/user/project/releases/
+[32]: https://docs.gitlab.com/api/releases/
 [33]: https://gitlab.com/profile/personal_access_tokens
 [34]: ./docs/environment-variables.md
 [35]: ./docs/gitlab-releases.md

package/lib/cli.js

@@ -1,11 +1,8 @@
 import { readJSON } from './util.js';
-import Log from './log.js';
 import runTasks from './index.js';
 
 const pkg = readJSON(new URL('../package.json', import.meta.url));
 
-const log = new Log();
-
 const helpText = `Release It! v${pkg.version}
 
   Usage: release-it <increment> [options]
@@ -27,10 +24,10 @@ const helpText = `Release It! v${pkg.version}
 For more details, please see https://github.com/release-it/release-it`;
 
 /** @internal */
-export const version = () => log.log(`v${pkg.version}`);
+export const version = () => console.log(`v${pkg.version}`);
 
 /** @internal */
-export const help = () => log.log(helpText);
+export const help = () => console.log(helpText);
 
 export default async options => {
   if (options.version) {

package/lib/config.js

@@ -6,7 +6,7 @@ import defaultsDeep from '@nodeutils/defaults-deep';
 import { isObjectStrict } from '@phun-ky/typeof';
 import merge from 'lodash.merge';
 import get from 'lodash.get';
-import { readJSON, getSystemInfo } from './util.js';
+import { e, getSystemInfo, readJSON } from './util.js';
 
 const debug = util.debug('release-it:config');
 const defaultConfig = readJSON(new URL('../config/release-it.json', import.meta.url));
@@ -38,10 +38,36 @@ const getLocalConfig = ({ file, dir = process.cwd() }) => {
     throw new Error(`Invalid configuration file at ${result.filepath}`);
   }
   debug({ cosmiconfig: result });
-
   return result && isObjectStrict(result.config) ? result.config : localConfig;
 };
 
+const fetchConfigurationFromGitHub = async configuration => {
+  const docs = 'https://github.com/release-it/release-it/blob/main/docs/configuration.md';
+
+  const regex = /^github:([^/]+)\/([^#:]+)(?::([^#]+))?(?:#(.+))?$/;
+  const match = configuration.match(regex);
+
+  if (!match) {
+    throw e(`Invalid Extended Configuration from GitHub: ${configuration}`, docs);
+  }
+
+  const [, owner, repo, file = '.release-it.json', tag] = match;
+  const ref = tag ? `refs/tags/${tag}` : 'HEAD';
+  const url = new URL(`https://raw.githubusercontent.com/${owner}/${repo}/${ref}/${file}`);
+
+  const response = await fetch(url);
+
+  if (!response.ok) {
+    throw e(`Failed to fetch ${url}: ${response.statusText}`, docs);
+  }
+
+  return response.json();
+};
+
+const getRemoteConfiguration = async configuration => {
+  return fetchConfigurationFromGitHub(configuration);
+};
+
 class Config {
   constructor(config = {}) {
     this.constructorConfig = config;
@@ -86,6 +112,10 @@ class Config {
       this.defaultConfig
     );
   }
+
+  mergeRemoteOptions(remoteConfiguration) {
+    return merge({}, this.options, remoteConfiguration);
+  }
   getContext(path) {
     const context = merge({}, this.options, this.contextOptions);
     return path ? get(context, path) : context;
@@ -141,4 +171,6 @@ class Config {
   }
 }
 
+export { getRemoteConfiguration };
+
 export default Config;

package/lib/index.js

@@ -1,6 +1,6 @@
 import { getPlugins } from './plugin/factory.js';
 import Logger from './log.js';
-import Config from './config.js';
+import Config, { getRemoteConfiguration } from './config.js';
 import Shell from './shell.js';
 import Prompt from './prompt.js';
 import Spinner from './spinner.js';
@@ -13,6 +13,15 @@ const runTasks = async (opts, di) => {
     Object.assign(container, di);
     container.config = container.config || new Config(opts);
 
+    if (typeof container.config.options?.extends === 'string') {
+      /**
+       * If the configuration has an 'extends' property, fetch the remote configuration
+       * and merge it into the local configuration options.
+       */
+      const remoteConfiguration = await getRemoteConfiguration(container.config.options.extends);
+      container.config.options = container.config.mergeRemoteOptions(remoteConfiguration);
+    }
+
     const { config } = container;
     const { isCI, isVerbose, verbosityLevel, isDryRun, isChangelog, isReleaseVersion } = config;
 
@@ -62,8 +71,13 @@ const runTasks = async (opts, di) => {
     const changelog = await reduceUntil(plugins, plugin => plugin.getChangelog(latestVersion));
 
     if (isChangelog) {
-      console.log(changelog);
-      process.exit(0);
+      if (changelog) {
+        console.log(changelog);
+        process.exit(0);
+      } else {
+        log.warn('No changelog found');
+        process.exit(1);
+      }
     }
 
     const incrementBase = { latestVersion, increment, isPreRelease, preReleaseId, preReleaseBase };
@@ -95,13 +109,14 @@ const runTasks = async (opts, di) => {
       version = version || (await reduceUntil(plugins, plugin => plugin.getIncrementedVersion(incrementBase)));
     }
 
-    if (!version) {
-      log.obtrusive(`No new version to release`);
-    }
-
     if (isReleaseVersion) {
-      console.log(version);
-      process.exit(0);
+      if (version) {
+        console.log(version);
+        process.exit(0);
+      } else {
+        log.warn(`No new version to release`);
+        process.exit(1);
+      }
     }
 
     if (version) {
@@ -125,6 +140,8 @@ const runTasks = async (opts, di) => {
           await runLifeCycleHook(plugin, hook);
         }
       }
+    } else {
+      log.obtrusive(`No new version to release`);
     }
 
     log.log(`🏁 Done (in ${Math.floor(process.uptime())}s.)`);

package/lib/log.js

@@ -1,5 +1,5 @@
 import { EOL } from 'node:os';
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 import { isObjectLoose } from '@phun-ky/typeof';
 import { upperFirst } from './util.js';
 
@@ -20,21 +20,21 @@ class Logger {
   }
 
   error(...args) {
-    console.error(chalk.red('ERROR'), ...args);
+    console.error([styleText('red', 'ERROR'), ...args].join(' '));
   }
 
   info(...args) {
-    this.log(chalk.grey(...args));
+    console.error(styleText('grey', args.join(' ')));
   }
 
   warn(...args) {
-    this.log(chalk.yellow('WARNING'), ...args);
+    console.error([styleText('yellow', 'WARNING'), ...args].join(' '));
   }
 
   verbose(...args) {
     const { isExternal } = isObjectLoose(args.at(-1)) ? args.at(-1) : {};
     if (this.shouldLog(isExternal)) {
-      this.log(...args.filter(str => typeof str === 'string'));
+      console.error(...args.filter(str => typeof str === 'string'));
     }
   }
 
@@ -46,7 +46,7 @@ class Logger {
         .map(cmd => (typeof cmd === 'string' ? cmd : Array.isArray(cmd) ? cmd.join(' ') : ''))
         .join(' ');
       const message = [prefix, command, isCached ? '[cached]' : ''].join(' ').trim();
-      this.log(message);
+      console.error(message);
     }
   }
 
@@ -58,7 +58,7 @@ class Logger {
 
   preview({ title, text }) {
     if (text) {
-      const header = chalk.bold(upperFirst(title));
+      const header = styleText('bold', upperFirst(title));
       const body = text.replace(new RegExp(EOL + EOL, 'g'), EOL);
       this.obtrusive(`${header}:${EOL}${body}`);
     } else {

package/lib/plugin/github/GitHub.js

@@ -12,10 +12,6 @@ import Release from '../GitRelease.js';
 import prompts from './prompts.js';
 import { getCommitsFromChangelog, getResolvedIssuesFromChangelog, searchQueries } from './util.js';
 
-/**
- * @typedef {import('@octokit/rest').RestEndpointMethodTypes['repos']['createRelease']['parameters']} CreateReleaseOptions
- */
-
 /**
  * @typedef {import('@octokit/rest').RestEndpointMethodTypes['repos']['createRelease']['parameters']} CreateReleaseOptions
  */
@@ -411,7 +407,7 @@ class GitHub extends Release {
 
   async commentOnResolvedItems() {
     const { isDryRun } = this.config;
-    const { owner, project: repo } = this.getContext('repo');
+    const { host, owner, project: repo } = this.getContext('repo');
     const changelog = await this.getChangelog();
     const { comments } = this.options;
     const { submit, issue, pr } = comments ?? {};
@@ -423,7 +419,7 @@ class GitHub extends Release {
     const searchResults = await Promise.all(searchQueries(this.client, owner, repo, shas));
     const mergedPullRequests = searchResults.flatMap(items => items.map(item => ({ type: 'pr', number: item.number })));
 
-    const hostURL = 'https://' + (this.options.host || repo.host);
+    const hostURL = 'https://' + (this.options.host || host);
     const resolvedIssues = getResolvedIssuesFromChangelog(hostURL, owner, repo, changelog);
 
     for (const item of [...resolvedIssues, ...mergedPullRequests]) {

package/lib/plugin/github/util.js

@@ -18,7 +18,7 @@ export const getSearchQueries = (base, commits, separator = '+') => {
 
 export const searchQueries = (client, owner, repo, shas) =>
   getSearchQueries(`repo:${owner}/${repo}+type:pr+is:merged`, shas).map(
-    async q => (await client.search.issuesAndPullRequests({ q })).data.items
+    async q => (await client.search.issuesAndPullRequests({ q, advanced_search: true })).data.items
   );
 
 export const getCommitsFromChangelog = changelog => {

package/lib/plugin/gitlab/GitLab.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
-import fs, { promises } from 'node:fs'; // import fs here so it can be stubbed in tests
+import fs from 'node:fs'; // import fs here so it can be stubbed in tests
+import { readFile } from 'node:fs/promises';
 import { globby } from 'globby';
 import { Agent } from 'undici';
 import Release from '../GitRelease.js';
@@ -15,7 +16,10 @@ class GitLab extends Release {
     super(...args);
     this.registerPrompts(prompts);
     this.assets = [];
-    const { certificateAuthorityFile, secure } = this.options;
+    const { secure } = this.options;
+    const certificateAuthorityFileRef = this.options.certificateAuthorityFileRef || 'CI_SERVER_TLS_CA_FILE';
+    const certificateAuthorityFile =
+      this.options.certificateAuthorityFile || process.env[certificateAuthorityFileRef] || null;
     this.certificateAuthorityOption = {};
 
     const needsCustomAgent = Boolean(secure === false || certificateAuthorityFile);
@@ -261,14 +265,17 @@ class GitLab extends Release {
     const name = path.basename(filePath);
     const { useIdsForUrls, useGenericPackageRepositoryForAssets, genericPackageRepositoryName } = this.options;
     const { id, origin, repo, version, baseUrl } = this.getContext();
+
     const endpoint = useGenericPackageRepositoryForAssets
       ? `projects/${id}/packages/generic/${genericPackageRepositoryName}/${version}/${name}`
       : `projects/${id}/uploads`;
+
     if (useGenericPackageRepositoryForAssets) {
       const options = {
         method: 'PUT',
-        body: await promises.readFile(filePath)
+        body: await readFile(filePath)
       };
+
       try {
         const body = await this.request(endpoint, options);
         if (!(body.message && body.message == '201 Created')) {
@@ -285,7 +292,7 @@ class GitLab extends Release {
       }
     } else {
       const body = new FormData();
-      const rawData = await promises.readFile(filePath);
+      const rawData = await readFile(filePath);
       body.set('file', new Blob([rawData]), name);
       const options = { body };
 

package/lib/plugin/npm/npm.js

@@ -256,6 +256,10 @@ class npm extends Plugin {
       })
       .catch(err => {
         this.debug(err);
+        if (this.config.isDryRun && /publish over the previously published version/.test(err)) {
+          return Promise.resolve();
+        }
+
         if (/one-time pass/.test(err)) {
           if (otp != null) {
             this.log.warn('The provided OTP is incorrect or has expired.');

package/lib/plugin/version/Version.js

@@ -1,9 +1,7 @@
+import { styleText } from 'node:util';
 import semver from 'semver';
-import chalk from 'chalk';
 import Plugin from '../Plugin.js';
 
-const { green, red, redBright } = chalk;
-
 const RELEASE_TYPES = ['patch', 'minor', 'major'];
 const PRERELEASE_TYPES = ['prepatch', 'preminor', 'premajor'];
 const CONTINUATION_TYPES = ['prerelease', 'pre'];
@@ -30,7 +28,11 @@ const getIncrementChoices = context => {
 };
 
 const versionTransformer = context => input =>
-  semver.valid(input) ? (semver.gt(input, context.latestVersion) ? green(input) : red(input)) : redBright(input);
+  semver.valid(input)
+    ? semver.gt(input, context.latestVersion)
+      ? styleText('green', input)
+      : styleText('red', input)
+    : styleText(['red', 'bold'], input);
 
 const prompts = {
   incrementList: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "19.0.0-next.1",
+  "version": "19.0.0-next.3",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -48,9 +48,9 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./lib/index.js",
-      "require": "./lib/index.js",
-      "types": "./types/index.d.ts"
+      "require": "./lib/index.js"
     },
     "./package.json": "./package.json",
     "./test/util/index.js": "./test/util/index.js"
@@ -69,7 +69,7 @@
     "lint": "eslint lib test",
     "format": "prettier --write eslint.config.mjs \"{lib,test}/**/*.js\"",
     "docs": "remark README.md 'docs/**/*.md' '.github/*.md' -o",
-    "test": "ava --no-worker-threads && installed-check --ignore ava --ignore nock",
+    "test": "node --env-file=.env.test --test && installed-check",
     "release": "./bin/release-it.js"
   },
   "author": {
@@ -83,25 +83,24 @@
     "@octokit/rest": "21.1.1",
     "@phun-ky/typeof": "1.2.3",
     "async-retry": "1.3.3",
-    "chalk": "5.4.1",
     "ci-info": "^4.2.0",
     "cosmiconfig": "9.0.0",
     "eta": "3.5.0",
     "execa": "9.5.2",
     "git-url-parse": "16.0.1",
     "globby": "14.1.0",
-    "inquirer": "12.4.3",
+    "inquirer": "12.5.0",
     "issue-parser": "7.0.1",
     "lodash.get": "4.4.2",
     "lodash.merge": "4.6.2",
-    "mime-types": "2.1.35",
+    "mime-types": "3.0.1",
     "new-github-release-url": "2.0.0",
     "open": "10.1.0",
     "ora": "8.2.0",
     "os-name": "6.0.0",
     "proxy-agent": "6.5.0",
     "semver": "7.7.1",
-    "undici": "6.21.1",
+    "undici": "6.21.2",
     "update-notifier": "7.3.1",
     "url-join": "5.0.0",
     "wildcard-match": "5.1.4",
@@ -109,28 +108,20 @@
   },
   "devDependencies": {
     "@eslint/compat": "1.2.7",
-    "@eslint/eslintrc": "3.3.0",
-    "@eslint/js": "9.22.0",
+    "@eslint/eslintrc": "3.3.1",
+    "@eslint/js": "9.23.0",
     "@octokit/request-error": "6.1.7",
-    "@types/node": "20.17.17",
-    "ava": "6.2.0",
-    "eslint": "9.22.0",
-    "eslint-config-prettier": "10.1.1",
-    "eslint-plugin-ava": "15.0.1",
-    "eslint-plugin-import-x": "4.6.1",
-    "eslint-plugin-prettier": "5.2.3",
-    "fs-monkey": "1.0.6",
+    "@types/node": "20.17.28",
+    "eslint": "9.23.0",
+    "eslint-plugin-import-x": "4.9.4",
     "globals": "16.0.0",
     "installed-check": "9.3.0",
-    "knip": "5.45.0",
-    "memfs": "4.17.0",
+    "knip": "5.46.3",
+    "mentoss": "0.9.0",
     "mock-stdio": "1.0.3",
-    "nock": "14.0.1",
     "prettier": "3.5.3",
     "remark-cli": "12.0.1",
     "remark-preset-webpro": "1.1.1",
-    "sinon": "19.0.2",
-    "strip-ansi": "7.1.0",
     "typescript": "5.8.2"
   },
   "overrides": {

package/schema/gitlab.json

@@ -46,6 +46,10 @@
     "certificateAuthorityFile": {
       "default": null
     },
+    "certificateAuthorityFileRef": {
+      "type": "string",
+      "default": "CI_SERVER_TLS_CA_FILE"
+    },
     "secure": {
       "default": null
     },

package/schema/release-it.json

@@ -9,6 +9,10 @@
       "type": "string",
       "description": "The JSON schema version used to validate this configuration file"
     },
+    "extends": {
+      "type": "string",
+      "description": "URL that specifies a configuration to extend"
+    },
     "hooks": {
       "type": "object",
       "additionalProperties": true,

package/test/cli.js

@@ -1,20 +1,21 @@
-import test from 'ava';
+import test from 'node:test';
+import assert from 'node:assert/strict';
 import mockStdIo from 'mock-stdio';
 import { version, help } from '../lib/cli.js';
 import { readJSON } from '../lib/util.js';
 
 const pkg = readJSON(new URL('../package.json', import.meta.url));
 
-test('should print version', t => {
+test('should print version', () => {
   mockStdIo.start();
   version();
   const { stdout } = mockStdIo.end();
-  t.is(stdout, `v${pkg.version}\n`);
+  assert.equal(stdout, `v${pkg.version}\n`);
 });
 
-test('should print help', t => {
+test('should print help', () => {
   mockStdIo.start();
   help();
   const { stdout } = mockStdIo.end();
-  t.regex(stdout, RegExp(`Release It!.+${pkg.version}`));
+  assert.match(stdout, new RegExp(`Release It!.+${pkg.version}`));
 });