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

package/bin/release-it.js

@@ -1,41 +1,10 @@
 #!/usr/bin/env node
 
-import updater from 'update-notifier';
-import parseArgs from 'yargs-parser';
 import release from '../lib/cli.js';
-import { readJSON } from '../lib/util.js';
-
-const pkg = readJSON(new URL('../package.json', import.meta.url));
-
-const aliases = {
-  c: 'config',
-  d: 'dry-run',
-  h: 'help',
-  i: 'increment',
-  v: 'version',
-  V: 'verbose'
-};
-
-const parseCliArguments = args => {
-  const options = parseArgs(args, {
-    boolean: ['dry-run', 'ci'],
-    alias: aliases,
-    configuration: {
-      'parse-numbers': false,
-      'camel-case-expansion': false
-    }
-  });
-  if (options.V) {
-    options.verbose = typeof options.V === 'boolean' ? options.V : options.V.length;
-    delete options.V;
-  }
-  options.increment = options._[0] || options.i;
-  return options;
-};
+import { parseCliArguments } from '../lib/args.js';
 
 const options = parseCliArguments([].slice.call(process.argv, 2));
 
-updater({ pkg: pkg }).notify();
 release(options).then(
   () => process.exit(0),
   ({ code }) => process.exit(Number.isInteger(code) ? code : 1)

package/lib/args.js

@@ -0,0 +1,64 @@
+import parseArgs from 'yargs-parser';
+
+const aliases = {
+  c: 'config',
+  d: 'dry-run',
+  h: 'help',
+  i: 'increment',
+  v: 'version',
+  V: 'verbose'
+};
+
+const booleanOptions = [
+  'dry-run',
+  'ci',
+  'git',
+  'npm',
+  'github',
+  'gitlab',
+  'git.addUntrackedFiles',
+  'git.requireCleanWorkingDir',
+  'git.requireUpstream',
+  'git.requireCommits',
+  'git.requireCommitsFail',
+  'git.commit',
+  'git.tag',
+  'git.push',
+  'git.getLatestTagFromAllRefs',
+  'git.skipChecks',
+  'github.release',
+  'github.autoGenerate',
+  'github.preRelease',
+  'github.draft',
+  'github.skipChecks',
+  'github.web',
+  'github.comments.submit',
+  'gitlab.release',
+  'gitlab.autoGenerate',
+  'gitlab.preRelease',
+  'gitlab.draft',
+  'gitlab.useIdsForUrls',
+  'gitlab.useGenericPackageRepositoryForAssets',
+  'gitlab.skipChecks',
+  'npm.publish',
+  'npm.ignoreVersion',
+  'npm.allowSameVersion',
+  'npm.skipChecks'
+];
+
+export const parseCliArguments = args => {
+  const options = parseArgs(args, {
+    boolean: booleanOptions,
+    alias: aliases,
+    configuration: {
+      'parse-numbers': false,
+      'camel-case-expansion': false
+    }
+  });
+  if (options.V) {
+    options.verbose = typeof options.V === 'boolean' ? options.V : options.V.length;
+    delete options.V;
+  }
+  options.increment = options._[0] || options.i;
+  return options;
+};

package/lib/config.js

@@ -1,121 +1,31 @@
 import util from 'node:util';
-import { cosmiconfigSync } from 'cosmiconfig';
-import parseToml from '@iarna/toml/parse-string.js';
+import assert from 'node:assert';
 import { isCI } from 'ci-info';
 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';
+import { loadConfig as loadC12 } from 'c12';
+import { getSystemInfo, readJSON } from './util.js';
 
 const debug = util.debug('release-it:config');
 const defaultConfig = readJSON(new URL('../config/release-it.json', import.meta.url));
 
-const searchPlaces = [
-  'package.json',
-  '.release-it.json',
-  '.release-it.js',
-  '.release-it.ts',
-  '.release-it.cjs',
-  '.release-it.yaml',
-  '.release-it.yml',
-  '.release-it.toml'
-];
-
-const loaders = {
-  '.toml': (_, content) => parseToml(content)
-};
-
-const getLocalConfig = ({ file, dir = process.cwd() }) => {
-  let localConfig = {};
-  if (file === false) return localConfig;
-  const explorer = cosmiconfigSync('release-it', {
-    searchPlaces,
-    loaders
-  });
-  const result = file ? explorer.load(file) : explorer.search(dir);
-  if (result && typeof result.config === 'string') {
-    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;
-    this.localConfig = getLocalConfig({ file: config.config, dir: config.configDir });
-    this.options = this.mergeOptions();
-    this.options = this.expandPreReleaseShorthand(this.options);
     this.contextOptions = {};
     debug({ system: getSystemInfo() });
-    debug(this.options);
-  }
-
-  expandPreReleaseShorthand(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,
-      preReleaseBase
-    };
-    if (typeof snapshot === 'string' && options.git) {
-      // Pre set and hard code some options
-      options.git.tagMatch = `0.0.0-${snapshot}.[0-9]*`;
-      options.git.getLatestTagFromAllRefs = true;
-      options.git.requireBranch = '!main';
-      options.git.requireUpstream = false;
-      options.npm.ignoreVersion = true;
-    }
-    return options;
-  }
-
-  mergeOptions() {
-    return defaultsDeep(
-      {},
-      this.constructorConfig,
-      {
-        ci: isCI
-      },
-      this.localConfig,
-      this.defaultConfig
-    );
-  }
-
-  mergeRemoteOptions(remoteConfiguration) {
-    return merge({}, this.options, remoteConfiguration);
   }
+
+  async init() {
+    await loadOptions(this.constructorConfig).then(({ options, localConfig }) => {
+      this._options = options;
+      this._localConfig = localConfig;
+      debug(this._options);
+    });
+  }
+
   getContext(path) {
     const context = merge({}, this.options, this.contextOptions);
     return path ? get(context, path) : context;
@@ -169,8 +79,108 @@ class Config {
   get isChangelog() {
     return Boolean(this.options['changelog']);
   }
+
+  get options() {
+    assert(this._options, `The "options" not resolve yet`);
+    return this._options;
+  }
+
+  get localConfig() {
+    assert(this._localConfig, `The "localConfig" not resolve yet`);
+    return this._localConfig;
+  }
 }
 
-export { getRemoteConfiguration };
+async function loadOptions(constructorConfig) {
+  const localConfig = await loadLocalConfig(constructorConfig);
+  const merged = defaultsDeep(
+    {},
+    constructorConfig,
+    {
+      ci: isCI
+    },
+    localConfig,
+    defaultConfig
+  );
+  const expanded = expandPreReleaseShorthand(merged);
+
+  return {
+    options: expanded,
+    localConfig
+  };
+}
+
+function expandPreReleaseShorthand(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,
+    preReleaseBase
+  };
+  if (typeof snapshot === 'string' && options.git) {
+    // Pre set and hard code some options
+    options.git.tagMatch = `0.0.0-${snapshot}.[0-9]*`;
+    options.git.getLatestTagFromAllRefs = true;
+    options.git.requireBranch = '!main';
+    options.git.requireUpstream = false;
+    options.npm.ignoreVersion = true;
+  }
+  return options;
+}
+
+async function loadLocalConfig(constructorConfig) {
+  const file = resolveFile();
+  const dir = resolveDir();
+  const extend = resolveExtend();
+  const defaultConfig = resolveDefaultConfig();
+
+  if (file === false) return {};
+
+  const resolvedConfig = await loadC12({
+    name: 'release-it',
+    configFile: file,
+    packageJson: true,
+    rcFile: false,
+    envName: false,
+    cwd: dir,
+    extend,
+    defaultConfig
+  }).catch(() => {
+    throw new Error(`Invalid configuration file at ${file}`);
+  });
+
+  if (Object.keys(resolvedConfig.config).length === 0) {
+    throw new Error(`no such file ${resolvedConfig.configFile}`);
+  }
+
+  debug('Loaded local config', resolvedConfig.config);
+  return isObjectStrict(resolvedConfig.config) ? resolvedConfig.config : {};
+
+  function resolveFile() {
+    if (constructorConfig.config === false) return false;
+
+    if (constructorConfig.config === true) return '.release-it';
+
+    return constructorConfig.config ?? '.release-it';
+  }
+
+  function resolveDir() {
+    return constructorConfig.configDir ?? process.cwd();
+  }
+
+  function resolveExtend() {
+    return constructorConfig.extends === false ? false : undefined;
+  }
+
+  function resolveDefaultConfig() {
+    return {
+      extends: constructorConfig.extends === false ? undefined : constructorConfig.extends
+    };
+  }
+}
 
 export default Config;

package/lib/index.js

@@ -1,6 +1,6 @@
 import { getPlugins } from './plugin/factory.js';
 import Logger from './log.js';
-import Config, { getRemoteConfiguration } from './config.js';
+import Config from './config.js';
 import Shell from './shell.js';
 import Prompt from './prompt.js';
 import Spinner from './spinner.js';
@@ -12,15 +12,7 @@ const runTasks = async (opts, di) => {
   try {
     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);
-    }
+    await container.config.init();
 
     const { config } = container;
     const { isCI, isVerbose, verbosityLevel, isDryRun, isChangelog, isReleaseVersion } = config;

package/lib/plugin/git/Git.js

@@ -1,5 +1,5 @@
 import { EOL } from 'node:os';
-import { execa } from 'execa';
+import { x } from 'tinyexec';
 import matcher from 'wildcard-match';
 import { format, e, fixArgs, once, castArray } from '../../util.js';
 import GitBase from '../GitBase.js';
@@ -12,7 +12,7 @@ const options = { write: false };
 const docs = 'https://git.io/release-it-git';
 
 const isGitRepo = () =>
-  execa('git', ['rev-parse', '--git-dir']).then(
+  x('git', ['rev-parse', '--git-dir'], { throwOnError: true }).then(
     () => true,
     () => false
   );
@@ -131,7 +131,7 @@ class Git extends GitBase {
   async getCommitsSinceLatestTag(commitsPath = '') {
     const latestTagName = await this.getLatestTagName();
     const ref = latestTagName ? `${latestTagName}..HEAD` : 'HEAD';
-    return this.exec(`git rev-list ${ref} --count ${commitsPath}`, { options }).then(Number);
+    return this.exec(`git rev-list ${ref} --count ${commitsPath ? `-- ${commitsPath}` : ''}`, { options }).then(Number);
   }
 
   async getUpstreamArgs(pushRepo) {

package/lib/plugin/github/GitHub.js

@@ -2,7 +2,7 @@ import { createReadStream, statSync } from 'node:fs';
 import path from 'node:path';
 import open from 'open';
 import { Octokit } from '@octokit/rest';
-import { globby } from 'globby';
+import { glob } from 'tinyglobby';
 import mime from 'mime-types';
 import retry from 'async-retry';
 import newGithubReleaseUrl from 'new-github-release-url';
@@ -336,7 +336,7 @@ class GitHub extends Release {
       return true;
     }
 
-    return globby(patterns).then(files => {
+    return glob(patterns).then(files => {
       if (!files.length) {
         this.log.warn(`octokit repos.uploadReleaseAssets: did not find "${assets}" relative to ${process.cwd()}`);
       }

package/lib/plugin/gitlab/GitLab.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 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 { glob } from 'tinyglobby';
 import { Agent } from 'undici';
 import Release from '../GitRelease.js';
 import { format, e, castArray } from '../../util.js';
@@ -323,7 +323,7 @@ class GitLab extends Release {
       return noop;
     }
 
-    return globby(patterns).then(files => {
+    return glob(patterns).then(files => {
       if (!files.length) {
         this.log.warn(`gitlab releases#uploadAssets: could not find "${assets}" relative to ${process.cwd()}`);
       }

package/lib/shell.js

@@ -1,6 +1,6 @@
 import util from 'node:util';
 import childProcess from 'node:child_process';
-import { execa } from 'execa';
+import { x } from 'tinyexec';
 import { format } from './util.js';
 
 const debug = util.debug('release-it:shell');
@@ -72,17 +72,17 @@ class Shell {
     const [program, ...programArgs] = command;
 
     try {
-      const { stdout: out, stderr } = await execa(program, programArgs);
+      const { stdout: out, stderr } = await x(program, programArgs, { throwOnError: true });
       const stdout = out === '""' ? '' : out;
       this.log.verbose(stdout, { isExternal });
       debug({ command, options, stdout, stderr });
-      return Promise.resolve(stdout || stderr);
+      return Promise.resolve((stdout || stderr).trim());
     } catch (err) {
-      if (err.stdout) {
-        this.log.log(`\n${err.stdout}`);
+      if (err.output.stdout) {
+        this.log.log(`\n${err.output.stdout}`);
       }
       debug(err);
-      return Promise.reject(new Error(err.stderr || err.message));
+      return Promise.reject(new Error(err.output.stderr || err.output.stdout || err.message));
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "19.0.0-next.3",
+  "version": "19.0.0-next.5",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -78,18 +78,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@iarna/toml": "2.2.5",
     "@nodeutils/defaults-deep": "1.1.0",
     "@octokit/rest": "21.1.1",
-    "@phun-ky/typeof": "1.2.3",
+    "@phun-ky/typeof": "1.2.4",
     "async-retry": "1.3.3",
+    "c12": "2.0.4",
     "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.5.0",
+    "inquirer": "12.5.2",
     "issue-parser": "7.0.1",
     "lodash.get": "4.4.2",
     "lodash.merge": "4.6.2",
@@ -100,29 +97,31 @@
     "os-name": "6.0.0",
     "proxy-agent": "6.5.0",
     "semver": "7.7.1",
+    "tinyexec": "1.0.1",
+    "tinyglobby": "0.2.12",
     "undici": "6.21.2",
-    "update-notifier": "7.3.1",
     "url-join": "5.0.0",
     "wildcard-match": "5.1.4",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@eslint/compat": "1.2.7",
+    "@eslint/compat": "1.2.8",
     "@eslint/eslintrc": "3.3.1",
-    "@eslint/js": "9.23.0",
+    "@eslint/js": "9.24.0",
     "@octokit/request-error": "6.1.7",
     "@types/node": "20.17.28",
-    "eslint": "9.23.0",
-    "eslint-plugin-import-x": "4.9.4",
+    "eslint": "9.24.0",
+    "eslint-plugin-import-x": "4.10.2",
     "globals": "16.0.0",
     "installed-check": "9.3.0",
-    "knip": "5.46.3",
-    "mentoss": "0.9.0",
+    "knip": "5.48.0",
+    "mentoss": "0.9.2",
     "mock-stdio": "1.0.3",
     "prettier": "3.5.3",
     "remark-cli": "12.0.1",
     "remark-preset-webpro": "1.1.1",
-    "typescript": "5.8.2"
+    "tar": "6.2.1",
+    "typescript": "5.8.3"
   },
   "overrides": {
     "pac-resolver": "7.0.1",

package/schema/git.json

@@ -38,8 +38,8 @@
       "default": ""
     },
     "addUntrackedFiles": {
-      "type": "string",
-      "default": ""
+      "type": "boolean",
+      "default": false
     },
     "commit": {
       "type": "boolean",
@@ -53,6 +53,10 @@
       },
       "default": []
     },
+    "commitMessage": {
+      "type": "string",
+      "default": null
+    },
     "tag": {
       "type": "boolean",
       "default": true

package/test/args.js

@@ -0,0 +1,27 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { parseCliArguments } from '../lib/args.js';
+
+test('should parse boolean arguments', () => {
+  const args = [
+    '--dry-run=false',
+    '--ci',
+    '--github=false',
+    '--no-npm',
+    '--git.addUntrackedFiles=true',
+    '--git.commit=false',
+    '--no-git.tag',
+    '--git.commitMessage=test'
+  ];
+
+  const result = parseCliArguments(args);
+
+  assert.equal(result['dry-run'], false);
+  assert.equal(result.ci, true);
+  assert.equal(result.github, false);
+  assert.equal(result.npm, false);
+  assert.equal(result.git.addUntrackedFiles, true);
+  assert.equal(result.git.commit, false);
+  assert.equal(result.git.tag, false);
+  assert.equal(result.git.commitMessage, 'test');
+});