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

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/bin/release-it.js

@@ -1,38 +1,12 @@
 #!/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';
+import { parseCliArguments } from '../lib/args.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;
-};
-
 const options = parseCliArguments([].slice.call(process.argv, 2));
 
 updater({ pkg: pkg }).notify();

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/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,15 +20,15 @@ class Logger {
   }
 
   error(...args) {
-    console.error(chalk.red('ERROR'), ...args);
+    console.error([styleText('red', 'ERROR'), ...args].join(' '));
   }
 
   info(...args) {
-    console.error(chalk.grey(...args));
+    console.error(styleText('grey', args.join(' ')));
   }
 
   warn(...args) {
-    console.error(chalk.yellow('WARNING'), ...args);
+    console.error([styleText('yellow', 'WARNING'), ...args].join(' '));
   }
 
   verbose(...args) {
@@ -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/git/Git.js

@@ -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/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';
@@ -264,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')) {
@@ -288,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/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.2",
+  "version": "19.0.0-next.4",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -81,51 +81,48 @@
     "@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",
-    "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.5.0",
+    "inquirer": "12.5.2",
     "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",
     "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.24",
-    "eslint": "9.23.0",
-    "eslint-config-prettier": "10.1.1",
-    "eslint-plugin-import-x": "4.9.3",
-    "eslint-plugin-prettier": "5.2.5",
+    "@types/node": "20.17.28",
+    "eslint": "9.24.0",
+    "eslint-plugin-import-x": "4.10.2",
     "globals": "16.0.0",
     "installed-check": "9.3.0",
-    "knip": "5.46.1",
+    "knip": "5.48.0",
     "mentoss": "0.9.0",
     "mock-stdio": "1.0.3",
     "prettier": "3.5.3",
     "remark-cli": "12.0.1",
     "remark-preset-webpro": "1.1.1",
-    "typescript": "5.8.2"
+    "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');
+});

package/test/config.js

@@ -1,9 +1,9 @@
 import test, { describe, before, after, afterEach } from 'node:test';
 import assert from 'node:assert/strict';
 import { isCI } from 'ci-info';
-import { MockServer, FetchMocker } from 'mentoss';
 import Config, { getRemoteConfiguration } from '../lib/config.js';
 import { readJSON } from '../lib/util.js';
+import { mockFetch } from './util/mock.js';
 
 const defaultConfig = readJSON(new URL('../config/release-it.json', import.meta.url));
 const projectConfig = readJSON(new URL('../.release-it.json', import.meta.url));
@@ -165,11 +165,7 @@ describe('config', () => {
 });
 
 describe('fetch extended configuration', () => {
-  const server = new MockServer('https://raw.githubusercontent.com');
-
-  const mocker = new FetchMocker({
-    servers: [server]
-  });
+  const [mocker, server] = mockFetch('https://raw.githubusercontent.com');
 
   before(() => {
     mocker.mockGlobal();

package/test/github.js

@@ -1,7 +1,6 @@
 import test, { describe, before, after, afterEach } from 'node:test';
 import assert from 'node:assert/strict';
 import { RequestError } from '@octokit/request-error';
-import { MockServer, FetchMocker } from 'mentoss';
 import GitHub from '../lib/plugin/github/GitHub.js';
 import { getSearchQueries } from '../lib/plugin/github/util.js';
 import { factory, runTasks } from './util/index.js';
@@ -13,6 +12,7 @@ import {
   interceptUpdate,
   interceptAsset
 } from './stub/github.js';
+import { mockFetch } from './util/mock.js';
 
 describe('github', () => {
   const tokenRef = 'GITHUB_TOKEN';
@@ -21,14 +21,12 @@ describe('github', () => {
   const git = { changelog: '' };
   const requestErrorOptions = { request: { url: '', headers: {} }, response: { headers: {} } };
 
-  const api = new MockServer('https://api.github.com');
-  const assets = new MockServer('https://uploads.github.com');
-  const example = new MockServer('https://github.example.org/api/v3');
-  const custom = new MockServer('https://custom.example.org/api/v3');
-
-  const mocker = new FetchMocker({
-    servers: [api, assets, example, custom]
-  });
+  const [mocker, api, assets, example, custom] = mockFetch([
+    'https://api.github.com',
+    'https://uploads.github.com',
+    'https://github.example.org/api/v3',
+    'https://custom.example.org/api/v3'
+  ]);
 
   before(() => {
     mocker.mockGlobal();

package/test/gitlab.js

@@ -2,7 +2,6 @@ import fs from 'node:fs';
 import test, { before, after, afterEach, beforeEach, describe } from 'node:test';
 import assert from 'node:assert/strict';
 import { Agent } from 'undici';
-import { MockServer, FetchMocker } from 'mentoss';
 import Git from '../lib/plugin/git/Git.js';
 import GitLab from '../lib/plugin/gitlab/GitLab.js';
 import { GitlabTestServer } from './util/https-server/server.js';
@@ -13,21 +12,21 @@ import {
   interceptPublish,
   interceptAsset,
   interceptAssetGeneric,
-  interceptMilestones
+  interceptMilestones,
+  interceptMembers
 } from './stub/gitlab.js';
+import { mockFetch } from './util/mock.js';
 
 describe('GitLab', () => {
   const tokenHeader = 'Private-Token';
   const tokenRef = 'GITLAB_TOKEN';
   const certificateAuthorityFileRef = 'CI_SERVER_TLS_CA_FILE';
 
-  const api = new MockServer('https://gitlab.com/api/v4');
-  const example = new MockServer('https://gitlab.example.org/api/v4');
-  const local = new MockServer('https://localhost:3000/api/v4');
-
-  const mocker = new FetchMocker({
-    servers: [api, example, local]
-  });
+  const [mocker, api, example, local] = mockFetch([
+    'https://gitlab.com/api/v4',
+    'https://gitlab.example.org/api/v4',
+    'https://localhost:3000/api/v4'
+  ]);
 
   before(() => {
     mocker.mockGlobal();
@@ -129,7 +128,7 @@ describe('GitLab', () => {
     assert.equal(releaseUrl, `${pushRepo}/-/releases/2.0.1`);
   });
 
-  test('should upload assets with ID-based URLs too', async t => {
+  test('should upload assets with ID-based URLs', async t => {
     const host = 'https://gitlab.com';
     const pushRepo = `${host}/user/repo`;
     const options = {
@@ -266,7 +265,7 @@ describe('GitLab', () => {
     const options = { gitlab: { tokenRef, pushRepo, host } };
     const gitlab = factory(GitLab, { options });
 
-    api.get(`/projects/john%2Frepo/members/all/1`, { status: 200, username: 'emma' });
+    interceptMembers(api, { owner: 'emma' });
     interceptUser(api, { owner: 'john' });
 
     await assert.rejects(runTasks(gitlab), /User john is not a collaborator for john\/repo/);
@@ -278,7 +277,7 @@ describe('GitLab', () => {
     const options = { gitlab: { tokenRef, pushRepo, host } };
     const gitlab = factory(GitLab, { options });
 
-    api.get(`/projects/john%2Frepo/members/all/1`, { status: 200, username: 'john', access_level: 10 });
+    interceptMembers(api, { owner: 'john', access_level: 10 });
     interceptUser(api, { owner: 'john' });
 
     await assert.rejects(runTasks(gitlab), /User john is not a collaborator for john\/repo/);

package/test/stub/gitlab.js

@@ -1,3 +1,7 @@
+export const interceptMembers = (server, { owner = 'emma' } = {}) => {
+  server.get(`/projects/john%2Frepo/members/all/1`, { status: 200, username: owner });
+};
+
 export const interceptUser = (server, { owner = 'user' } = {}, options = {}) => {
   server.get({ url: '/user', ...options }, { status: 200, body: { id: 1, username: owner } });
 };
@@ -52,10 +56,8 @@ export const interceptAsset = (server, { owner = 'user', project = 'repo' } = {}
       url: `/projects/${owner}%2F${project}/uploads`
     },
     async request => {
-      const reader = request.body.getReader();
-      const { value } = await reader.read();
-      const bodyText = new TextDecoder().decode(value);
-      const [, name] = bodyText.match(/filename="([^"]+)"/);
+      const formData = await request.formData();
+      const { name } = formData.get('file');
       return {
         status: 200,
         body: {

package/test/tasks.interactive.js

@@ -3,7 +3,6 @@ import { renameSync } from 'node:fs';
 import childProcess from 'node:child_process';
 import test, { afterEach, after, before, beforeEach, describe, mock } from 'node:test';
 import assert from 'node:assert/strict';
-import { MockServer, FetchMocker } from 'mentoss';
 import Prompt from '../lib/prompt.js';
 import Config from '../lib/config.js';
 import runTasks from '../lib/index.js';
@@ -14,15 +13,14 @@ import ShellStub from './stub/shell.js';
 import { interceptPublish as interceptGitLabPublish } from './stub/gitlab.js';
 import { interceptCreate as interceptGitHubCreate } from './stub/github.js';
 import { factory, LogStub, SpinnerStub } from './util/index.js';
+import { mockFetch } from './util/mock.js';
 
 describe('tasks.interactive', () => {
-  const github = new MockServer('https://api.github.com');
-  const gitlab = new MockServer('https://gitlab.com/api/v4');
-  const githubusercontent = new MockServer('https://raw.githubusercontent.com');
-
-  const mocker = new FetchMocker({
-    servers: [github, gitlab, githubusercontent]
-  });
+  const [mocker, github, gitlab, githubusercontent] = mockFetch([
+    'https://api.github.com',
+    'https://gitlab.com/api/v4',
+    'https://raw.githubusercontent.com'
+  ]);
 
   before(() => {
     mocker.mockGlobal();

package/test/tasks.js

@@ -4,7 +4,6 @@ import { appendFileSync, mkdirSync, renameSync } from 'node:fs';
 import test, { after, afterEach, before, beforeEach, describe } from 'node:test';
 import assert from 'node:assert/strict';
 import semver from 'semver';
-import { MockServer, FetchMocker } from 'mentoss';
 import Config from '../lib/config.js';
 import runTasks from '../lib/index.js';
 import Git from '../lib/plugin/git/Git.js';
@@ -24,17 +23,16 @@ import {
   interceptAsset as interceptGitHubAsset
 } from './stub/github.js';
 import { factory, LogStub, SpinnerStub } from './util/index.js';
+import { mockFetch } from './util/mock.js';
 
 describe('tasks', () => {
   const rootDir = new URL('..', import.meta.url);
 
-  const github = new MockServer('https://api.github.com');
-  const assets = new MockServer('https://uploads.github.com');
-  const gitlab = new MockServer('https://gitlab.com/api/v4');
-
-  const mocker = new FetchMocker({
-    servers: [github, assets, gitlab]
-  });
+  const [mocker, github, assets, gitlab] = mockFetch([
+    'https://api.github.com',
+    'https://uploads.github.com',
+    'https://gitlab.com/api/v4'
+  ]);
 
   const npmMajorVersion = semver.major(process.env.npm_config_user_agent.match(/npm\/([^ ]+)/)[1]);
 

package/test/util/mock.js

@@ -0,0 +1,11 @@
+import { MockServer, FetchMocker } from 'mentoss';
+
+export const mockFetch = baseUrls => {
+  const servers = [baseUrls].flat().map(url => new MockServer(url));
+
+  const mocker = new FetchMocker({
+    servers
+  });
+
+  return [mocker, ...servers];
+};