release-it 19.0.0-next.0 → 19.0.0-next.2

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

@@ -1,9 +1,12 @@
 import util from 'node:util';
 import { cosmiconfigSync } from 'cosmiconfig';
 import parseToml from '@iarna/toml/parse-string.js';
-import _ from 'lodash';
 import { isCI } from 'ci-info';
-import { readJSON, getSystemInfo } from './util.js';
+import defaultsDeep from '@nodeutils/defaults-deep';
+import { isObjectStrict } from '@phun-ky/typeof';
+import merge from 'lodash.merge';
+import get from 'lodash.get';
+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));
@@ -35,7 +38,34 @@ const getLocalConfig = ({ file, dir = process.cwd() }) => {
     throw new Error(`Invalid configuration file at ${result.filepath}`);
   }
   debug({ cosmiconfig: result });
-  return result && _.isPlainObject(result.config) ? result.config : localConfig;
+  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 {
@@ -72,7 +102,7 @@ class Config {
   }
 
   mergeOptions() {
-    return _.defaultsDeep(
+    return defaultsDeep(
       {},
       this.constructorConfig,
       {
@@ -83,14 +113,17 @@ class Config {
     );
   }
 
+  mergeRemoteOptions(remoteConfiguration) {
+    return merge({}, this.options, remoteConfiguration);
+  }
   getContext(path) {
-    const context = _.merge({}, this.options, this.contextOptions);
-    return path ? _.get(context, path) : context;
+    const context = merge({}, this.options, this.contextOptions);
+    return path ? get(context, path) : context;
   }
 
   setContext(options) {
     debug(options);
-    _.merge(this.contextOptions, options);
+    merge(this.contextOptions, options);
   }
 
   setCI(value = true) {
@@ -138,4 +171,6 @@ class Config {
   }
 }
 
+export { getRemoteConfiguration };
+
 export default Config;

package/lib/index.js

@@ -1,11 +1,10 @@
-import _ from 'lodash';
 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';
-import { reduceUntil, parseVersion } from './util.js';
+import { reduceUntil, parseVersion, castArray } from './util.js';
 
 const runTasks = async (opts, di) => {
   let container = {};
@@ -14,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;
 
@@ -33,20 +41,20 @@ const runTasks = async (opts, di) => {
       if (!scripts || !scripts.length) return;
       const context = config.getContext();
       const external = true;
-      for (const script of _.castArray(scripts)) {
+      for (const script of castArray(scripts)) {
         const task = () => shell.exec(script, { external }, context);
         await spinner.show({ task, label: script, context, external });
       }
     };
 
     const runLifeCycleHook = async (plugin, name, ...args) => {
-      if (plugin === _.first(plugins)) await runHook('before', name);
+      if (plugin === plugins.at(0)) await runHook('before', name);
       await runHook('before', plugin.namespace, name);
       const willHookRun = (await plugin[name](...args)) !== false;
       if (willHookRun) {
         await runHook('after', plugin.namespace, name);
       }
-      if (plugin === _.last(plugins)) await runHook('after', name);
+      if (plugin === plugins.at(-1)) await runHook('after', name);
     };
 
     const [internal, external] = await getPlugins(config, container);
@@ -63,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 };
@@ -96,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) {
@@ -126,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,8 +1,7 @@
 import { EOL } from 'node:os';
 import chalk from 'chalk';
-import _ from 'lodash';
-
-const { isObject, last, filter, isString, lowerCase, upperFirst, isArray } = _;
+import { isObjectLoose } from '@phun-ky/typeof';
+import { upperFirst } from './util.js';
 
 class Logger {
   constructor({ isCI = true, isVerbose = false, verbosityLevel = 0, isDryRun = false } = {}) {
@@ -25,27 +24,29 @@ class Logger {
   }
 
   info(...args) {
-    this.log(chalk.grey(...args));
+    console.error(chalk.grey(...args));
   }
 
   warn(...args) {
-    this.log(chalk.yellow('WARNING'), ...args);
+    console.error(chalk.yellow('WARNING'), ...args);
   }
 
   verbose(...args) {
-    const { isExternal } = isObject(last(args)) ? last(args) : {};
+    const { isExternal } = isObjectLoose(args.at(-1)) ? args.at(-1) : {};
     if (this.shouldLog(isExternal)) {
-      this.log(...filter(args, isString));
+      console.error(...args.filter(str => typeof str === 'string'));
     }
   }
 
   exec(...args) {
-    const { isDryRun: isExecutedInDryRun, isExternal, isCached } = isObject(last(args)) ? last(args) : {};
+    const { isDryRun: isExecutedInDryRun, isExternal, isCached } = isObjectLoose(args.at(-1)) ? args.at(-1) : {};
     if (this.shouldLog(isExternal) || this.isDryRun) {
       const prefix = isExecutedInDryRun == null ? '$' : '!';
-      const command = args.map(cmd => (isString(cmd) ? cmd : isArray(cmd) ? cmd.join(' ') : '')).join(' ');
+      const command = args
+        .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);
     }
   }
 
@@ -61,7 +62,7 @@ class Logger {
       const body = text.replace(new RegExp(EOL + EOL, 'g'), EOL);
       this.obtrusive(`${header}:${EOL}${body}`);
     } else {
-      this.obtrusive(`Empty ${lowerCase(title)}`);
+      this.obtrusive(`Empty ${title.toLowerCase()}`);
     }
   }
 }

package/lib/plugin/GitBase.js

@@ -22,7 +22,8 @@ class GitBase extends Plugin {
   }
 
   getName() {
-    return this.getContext('repo.project');
+    const repo = this.getContext('repo');
+    return repo.project;
   }
 
   getLatestVersion() {

package/lib/plugin/GitRelease.js

@@ -1,5 +1,4 @@
-import _ from 'lodash';
-import { readJSON } from '../util.js';
+import { pick, readJSON } from '../util.js';
 import GitBase from './GitBase.js';
 
 const defaultConfig = readJSON(new URL('../../config/release-it.json', import.meta.url));
@@ -12,7 +11,7 @@ class GitRelease extends GitBase {
   getInitialOptions(options) {
     const baseOptions = super.getInitialOptions(...arguments);
     const git = options.git || defaultConfig.git;
-    const gitOptions = _.pick(git, [
+    const gitOptions = pick(git, [
       'tagExclude',
       'tagName',
       'tagMatch',
@@ -21,12 +20,13 @@ class GitRelease extends GitBase {
       'changelog',
       'commit'
     ]);
-    return _.defaults(baseOptions, gitOptions);
+
+    return Object.assign({}, gitOptions, baseOptions);
   }
 
   get token() {
     const { tokenRef } = this.options;
-    return _.get(process.env, tokenRef, null);
+    return process.env[tokenRef] || null;
   }
 
   async beforeRelease() {

package/lib/plugin/Plugin.js

@@ -1,5 +1,6 @@
 import { debug } from 'node:util';
-import _ from 'lodash';
+import merge from 'lodash.merge';
+import get from 'lodash.get';
 
 class Plugin {
   static isEnabled() {
@@ -40,12 +41,13 @@ class Plugin {
   afterRelease() {}
 
   getContext(path) {
-    const context = _.merge({}, this.options, this.context);
-    return path ? _.get(context, path) : context;
+    const context = merge({}, this.options, this.context);
+
+    return path ? get(context, path) : context;
   }
 
   setContext(context) {
-    _.merge(this.context, context);
+    merge(this.context, context);
   }
 
   exec(command, { options, context = {} } = {}) {

package/lib/plugin/factory.js

@@ -2,7 +2,7 @@ import url from 'node:url';
 import path from 'node:path';
 import util from 'node:util';
 import { createRequire } from 'node:module';
-import _ from 'lodash';
+import { castArray } from '../util.js';
 import Version from './version/Version.js';
 import Git from './git/Git.js';
 import GitLab from './gitlab/GitLab.js';
@@ -54,23 +54,23 @@ export const getPluginName = pluginName => {
 export let getPlugins = async (config, container) => {
   const context = config.getContext();
   const disabledPlugins = [];
-
-  const enabledExternalPlugins = await _.reduce(
-    context.plugins,
-    async (result, pluginConfig, pluginName) => {
+  const enabledExternalPlugins = [];
+  if (context.plugins) {
+    for (const [pluginName, pluginConfig] of Object.entries(context.plugins)) {
       const [name, Plugin] = await load(pluginName);
       const [namespace, options] = pluginConfig.length === 2 ? pluginConfig : [name, pluginConfig];
+
       config.setContext({ [namespace]: options });
+
       if (await Plugin.isEnabled(options)) {
         const instance = new Plugin({ namespace, options: config.getContext(), container });
         debug({ namespace, options: instance.options });
-        (await result).push(instance);
-        disabledPlugins.push(..._.intersection(pluginNames, _.castArray(Plugin.disablePlugin(options))));
+        enabledExternalPlugins.push(instance);
+
+        disabledPlugins.push(...pluginNames.filter(p => castArray(Plugin.disablePlugin(options)).includes(p)));
       }
-      return result;
-    },
-    []
-  );
+    }
+  }
 
   const enabledPlugins = await pluginNames.reduce(async (result, plugin) => {
     if (plugin in plugins && !disabledPlugins.includes(plugin)) {

package/lib/plugin/git/Git.js

@@ -1,8 +1,7 @@
 import { EOL } from 'node:os';
-import _ from 'lodash';
 import { execa } from 'execa';
 import matcher from 'wildcard-match';
-import { format, e, fixArgs } from '../../util.js';
+import { format, e, fixArgs, once, castArray } from '../../util.js';
 import GitBase from '../GitBase.js';
 import prompts from './prompts.js';
 
@@ -64,7 +63,7 @@ class Git extends GitBase {
   }
 
   enableRollback() {
-    this.rollbackOnce = _.once(this.rollback.bind(this));
+    this.rollbackOnce = once(this.rollback.bind(this));
     process.on('SIGINT', this.rollbackOnce);
     process.on('exit', this.rollbackOnce);
   }
@@ -96,7 +95,7 @@ class Git extends GitBase {
 
   async isRequiredBranch() {
     const branch = await this.getBranchName();
-    const requiredBranches = _.castArray(this.options.requireBranch);
+    const requiredBranches = castArray(this.options.requireBranch);
     const [branches, negated] = requiredBranches.reduce(
       ([p, n], b) => (b.startsWith('!') ? [p, [...n, b.slice(1)]] : [[...p, b], n]),
       [[], []]
@@ -151,7 +150,7 @@ class Git extends GitBase {
 
   stage(file) {
     if (!file || !file.length) return noop;
-    const files = _.castArray(file);
+    const files = castArray(file);
     return this.exec(['git', 'add', ...files]).catch(err => {
       this.log.warn(`Could not stage ${files}`);
       this.debug(err);
@@ -164,7 +163,7 @@ class Git extends GitBase {
   }
 
   reset(file) {
-    const files = _.castArray(file);
+    const files = castArray(file);
     return this.exec(['git', 'checkout', 'HEAD', '--', ...files]).catch(err => {
       this.log.warn(`Could not reset ${files}`);
       this.debug(err);

package/lib/plugin/github/GitHub.js

@@ -4,19 +4,14 @@ import open from 'open';
 import { Octokit } from '@octokit/rest';
 import { globby } from 'globby';
 import mime from 'mime-types';
-import _ from 'lodash';
 import retry from 'async-retry';
 import newGithubReleaseUrl from 'new-github-release-url';
 import { ProxyAgent } from 'proxy-agent';
-import { format, parseVersion, readJSON, e } from '../../util.js';
+import { format, parseVersion, readJSON, e, castArray } from '../../util.js';
 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
  */
@@ -34,7 +29,7 @@ const parseErrormsg = err => {
   if (err instanceof Error) {
     const { status, message } = err;
     const headers = err.response ? err.response.headers : {};
-    msg = `${_.get(headers, 'status', status)} (${message})`;
+    msg = `${headers?.status || status} (${message})`;
   }
   return msg;
 };
@@ -166,7 +161,7 @@ class GitHub extends Release {
     const githubError = new Error(message);
     this.log.verbose(err.errors);
     this.debug(err);
-    if (!_.includes(RETRY_CODES, err.status)) {
+    if (!RETRY_CODES.includes(err.status)) {
       return bail(githubError);
     }
     throw githubError;
@@ -175,7 +170,8 @@ class GitHub extends Release {
   get client() {
     if (this._client) return this._client;
     const { proxy, timeout } = this.options;
-    const host = this.options.host || this.getContext('repo.host');
+    const repo = this.getContext('repo');
+    const host = this.options.host || repo.host;
     const isGitHub = host === 'github.com';
     const baseUrl = `https://${isGitHub ? 'api.github.com' : host}${isGitHub ? '' : '/api/v3'}`;
     const options = {
@@ -226,6 +222,7 @@ class GitHub extends Release {
     const { isPreRelease } = parseVersion(version);
     const name = format(releaseName, this.config.getContext());
     const releaseNotesObject = this.options.releaseNotes;
+
     const body = autoGenerate
       ? isUpdate
         ? null
@@ -331,7 +328,7 @@ class GitHub extends Release {
     const context = this.config.getContext();
     const { isDryRun } = this.config;
 
-    const patterns = _.castArray(assets).map(pattern => format(pattern, context));
+    const patterns = castArray(assets).map(pattern => format(pattern, context));
 
     this.log.exec('octokit repos.uploadReleaseAssets', patterns, { isDryRun });
 
@@ -356,9 +353,9 @@ class GitHub extends Release {
   }
 
   async generateWebUrl() {
-    const host = this.options.host || this.getContext('repo.host');
+    const repo = this.getContext('repo');
+    const host = this.options.host || repo.host;
     const isGitHub = host === 'github.com';
-
     const options = await this.getOctokitReleaseOptions();
     const url = newGithubReleaseUrl({
       user: options.owner,
@@ -410,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 ?? {};
@@ -422,13 +419,13 @@ 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 host = 'https://' + (this.options.host || this.getContext('repo.host'));
-    const resolvedIssues = getResolvedIssuesFromChangelog(host, owner, repo, changelog);
+    const hostURL = 'https://' + (this.options.host || host);
+    const resolvedIssues = getResolvedIssuesFromChangelog(hostURL, owner, repo, changelog);
 
     for (const item of [...resolvedIssues, ...mergedPullRequests]) {
       const { type, number } = item;
       const comment = format(format(type === 'pr' ? pr : issue, context), context);
-      const url = `${host}/${owner}/${repo}/${type === 'pr' ? 'pull' : 'issues'}/${number}`;
+      const url = `${hostURL}/${owner}/${repo}/${type === 'pr' ? 'pull' : 'issues'}/${number}`;
 
       if (isDryRun) {
         this.log.exec(`octokit issues.createComment (${url})`, { isDryRun });

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,10 +1,9 @@
 import path from 'node:path';
 import fs, { promises } from 'node:fs'; // import fs here so it can be stubbed in tests
 import { globby } from 'globby';
-import _ from 'lodash';
 import { Agent } from 'undici';
 import Release from '../GitRelease.js';
-import { format, e } from '../../util.js';
+import { format, e, castArray } from '../../util.js';
 import prompts from './prompts.js';
 
 const docs = 'https://git.io/release-it-gitlab';
@@ -16,7 +15,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);
@@ -309,7 +311,7 @@ class GitLab extends Release {
     const { isDryRun } = this.config;
     const context = this.config.getContext();
 
-    const patterns = _.castArray(assets).map(pattern => format(pattern, context));
+    const patterns = castArray(assets).map(pattern => format(pattern, context));
 
     this.log.exec('gitlab releases#uploadAssets', patterns, { isDryRun });
 

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.');