.github/workflows/commitlint.yml

@@ -13,6 +13,4 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 100
-      - uses: wagoid/commitlint-github-action@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: wagoid/commitlint-github-action@v4

.github/workflows/nodejs.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [12.x, 14.x, 16.x, 17.x]
+        node-version: [14.x, 16.x, 18.x]
         os: [ubuntu-latest, macOS-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -40,4 +40,4 @@ jobs:
       - name: Run tests
         run: npm run coverage-all
       - name: Upload coverage report to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3

.github/workflows/release-please.yml

@@ -14,7 +14,6 @@ jobs:
       - uses: google-github-actions/release-please-action@v3
         id: release
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
           release-type: node
           package-name: node-core-utils
   npm-publish:
@@ -25,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: lts/*
           registry-url: 'https://registry.npmjs.org'
       - run: npm publish
         env:

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.0.0](https://github.com/nodejs/node-core-utils/compare/v1.31.4...v2.0.0) (2022-06-22)
+
+
+### ⚠ BREAKING CHANGES
+
+* **ci:** Removed support for Node.js 12 and 17.
+
+### Bug Fixes
+
+* broken enquirer in listr2 ([#636](https://github.com/nodejs/node-core-utils/issues/636)) ([460b50d](https://github.com/nodejs/node-core-utils/commit/460b50dcea878a6234021448441395efefaeb2bf))
+
+
+### Miscellaneous Chores
+
+* **ci:** test on supported Node.js versions ([40a1ee2](https://github.com/nodejs/node-core-utils/commit/40a1ee220b058a1ce2b6e513d75d2a5ea0124633))
+
 ### [1.31.4](https://github.com/nodejs/node-core-utils/compare/v1.31.3...v1.31.4) (2022-04-25)
 
 

components/git/backport.js

@@ -10,12 +10,12 @@ const epilogue = `====================== Example =======================
 Demo: https://asciinema.org/a/221244
 Backporting https://github.com/nodejs/node/pull/24816 to v11.x
 
-# Sync master with upstream for the commits, if they are not yet there
-$ git checkout master
-$ ncu-config set branch master
+# Sync main with upstream for the commits, if they are not yet there
+$ git checkout main
+$ ncu-config set branch main
 $ git node sync
 
-# Backport existing commits from master to v11.x-staging
+# Backport existing commits from main to v11.x-staging
 $ git checkout v11.x-staging
 $ ncu-config set branch v11.x-staging
 $ git node sync

components/git/epilogue.js

@@ -4,9 +4,9 @@ $ cd path/to/node/project
 
 # If you have not configured it before
 $ ncu-config set upstream <name-of-remote-to-nodejs/node>
-$ ncu-config set branch master   # Assuming you are landing commits on master
+$ ncu-config set branch main   # Assuming you are landing commits on main
 
-$ git checkout master
+$ git checkout main
 $ git node land --abort          # Abort a landing session, just in case
 $ git node land $PRID            # Start a new landing session
 $ git node land $URL             # Start a new landing session using the PR URL

docs/git-node.md

@@ -3,28 +3,29 @@
 A custom Git command for managing pull requests. You can run it as
 `git-node` or `git node`. To see the help text, run `git node`.
 
-- [`git node land`](#git-node-land)
-  - [Prerequisites](#git-node-land-prerequisites)
-  - [Git bash for Windows](#git-bash-for-windows)
-  - [Demo & Usage](#demo--usage)
-  - [Optional Settings](#git-node-land-optional-settings)
-- [`git node backport`](#git-node-backport)
-  - [Example](#example)
-- [`git node release`](#git-node-release)
-  - [Example](#example-1)
-- [`git node sync`](#git-node-sync)
-- [`git node metadata`](#git-node-metadata)
-  - [Optional Settings](#git-node-metadata-optional-settings)
-- [`git node v8`](#git-node-v8)
-  - [Prerequisites](#git-node-v8-prerequisites)
-  - [`git node v8 major`](#git-node-v8-major)
-  - [`git node v8 minor`](#git-node-v8-minor)
-  - [`git node v8 backport <sha..>`](#git-node-v8-backport-sha)
-  - [General options](#general-options)
-- [`git node status`](#git-node-status)
-  - [Example](#example)
-- [`git node wpt`](#git-node-wpt)
-  - [Example](#example-2)
+- [git-node](#git-node)
+  - [`git node land`](#git-node-land)
+    - [Prerequisites](#prerequisites)
+    - [Git bash for Windows](#git-bash-for-windows)
+    - [Demo & Usage](#demo--usage)
+    - [Optional Settings](#optional-settings)
+  - [`git node backport`](#git-node-backport)
+    - [Example](#example)
+  - [`git node release`](#git-node-release)
+    - [Example](#example-1)
+  - [`git node sync`](#git-node-sync)
+  - [`git node metadata`](#git-node-metadata)
+    - [Optional Settings](#optional-settings-1)
+  - [`git node v8`](#git-node-v8)
+    - [Prerequisites](#prerequisites-1)
+    - [`git node v8 major`](#git-node-v8-major)
+    - [`git node v8 minor`](#git-node-v8-minor)
+    - [`git node v8 backport <sha..>`](#git-node-v8-backport-sha)
+    - [General options](#general-options)
+  - [`git node status`](#git-node-status)
+    - [Example](#example-2)
+  - [`git node wpt`](#git-node-wpt)
+    - [Example](#example-3)
 
 ## `git node land`
 
@@ -93,8 +94,8 @@ Examples:
    # Tell ncu that your upstream remote is named "upstream"
    $ ncu-config set upstream upstream
 
-   # Tell ncu that you are landing patches to "master" branch
-   $ ncu-config set branch master
+   # Tell ncu that you are landing patches to "main" branch
+   $ ncu-config set branch main
    ```
 
 Note: If you are behind a firewall and run into `ECONNREFUSED` issues with
@@ -130,9 +131,9 @@ $ cd path/to/node/project
 
 # If you have not configured it before
 $ ncu-config set upstream <name-of-remote-to-nodejs/node>
-$ ncu-config set branch master   # Assuming you are landing commits on master
+$ ncu-config set branch main   # Assuming you are landing commits on main
 
-$ git checkout master
+$ git checkout main
 $ git node land --abort          # Abort a landing session, just in case
 $ git node land $PRID            # Start a new landing session
 $ git node land $URL             # Start a new landing session using the PR URL
@@ -192,11 +193,11 @@ Options:
 ```
 Backporting https://github.com/nodejs/node/pull/12344 to v10.x
 
-# Sync master with upstream for the commits, if they are not yet there
-$ git checkout master
+# Sync main with upstream for the commits, if they are not yet there
+$ git checkout main
 $ git node sync
 
-# Backport existing commits from master to v10.x-staging
+# Backport existing commits from main to v10.x-staging
 $ git checkout v10.x-staging
 $ git node sync
 $ git node backport 12344 --to 10
@@ -397,14 +398,14 @@ Return status and information about the current git-node land session. Shows the
 ### Example
 
 ```sh
-node on git:master ❯ git node status                                             11:32AM
+node on git:main ❯ git node status                                             11:32AM
    ✔  Landing session in progress
 --------------------------------------------------------------------------------
 PR:        https:/github.com/nodejs/node/pull/34800
 State:     AMENDING
 Username:  codebytere
 Upstream:  upstream
-Branch:    master
+Branch:    main
 ```
 
 ## `git node wpt`
@@ -441,4 +442,4 @@ $ git node wpt url  # Will update test/fixtures/wpt/url and related files
 $ git node wpt url --commit=43feb7f612fe9160639e09a47933a29834904d69
 ```
 
-[node.js abi version registry]: https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
+[node.js abi version registry]: https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json

docs/ncu-ci.md

@@ -42,7 +42,7 @@ Options:
 Examples:
 
 ```sh
-node on git:master ❯ ncu-ci rate pr
+node on git:main ❯ ncu-ci rate pr
 --------------------------------------------------------------------------------
 [1/1] Running health
 --------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ node on git:master ❯ ncu-ci rate pr
 ```
 
 ```sh
-node on git:master ❯ ncu-ci rate commit
+node on git:main ❯ ncu-ci rate commit
 --------------------------------------------------------------------------------
 [1/1] Running health
 --------------------------------------------------------------------------------
@@ -69,7 +69,7 @@ node on git:master ❯ ncu-ci rate commit
 
 Example:
 ```sh
-node on git:master ❯ ncu-ci walk commit
+node on git:main ❯ ncu-ci walk commit
 ✔  Done--------------------------------------------------------------------------------
 [1/60] Running health
 --------------------------------------------------------------------------------
@@ -133,7 +133,7 @@ For example, if you would like to see the results of `node-test-pull-request` fo
 
 Example:
 ```sh
-node on git:master ❯ ncu-ci pr 32158
+node on git:main ❯ ncu-ci pr 32158
 --------------------------------------------------------------------------------
 [1/1] Running PR: 32158
 --------------------------------------------------------------------------------
@@ -157,7 +157,7 @@ For example, if you would like to see the results of `node-test-commit` for http
 
 Example:
 ```sh
-node on git:master ❯ ncu-ci commit 39377
+node on git:main ❯ ncu-ci commit 39377
 --------------------------------------------------------------------------------
 [1/1] Running COMMIT: 39377
 --------------------------------------------------------------------------------
@@ -180,7 +180,7 @@ Unstable   https://ci.nodejs.org/job/node-test-commit-arm-fanned/15148/
 
 Example:
 ```sh
-node on git:master ❯ ncu-ci url https://github.com/nodejs/node/pull/34127
+node on git:main ❯ ncu-ci url https://github.com/nodejs/node/pull/34127
 --------------------------------------------------------------------------------
 [1/1] Running PR: 32158
 --------------------------------------------------------------------------------
@@ -202,7 +202,7 @@ Unstable   https://ci.nodejs.org/job/node-test-commit-arm-fanned/15155/
 
 Example:
 ```sh
-node on git:master ❯ ncu-ci benchmark 636
+node on git:main ❯ ncu-ci benchmark 636
 --------------------------------------------------------------------------------
 [1/1] Running BENCHMARK: 636
 --------------------------------------------------------------------------------
@@ -237,7 +237,7 @@ Finished: SUCCESS
 
 Example:
 ```
-node on git:master ❯ ncu-ci citgm 2400
+node on git:main ❯ ncu-ci citgm 2400
 --------------------------------------------------------------------------------
 [1/1] Running CITGM: 2400
 --------------------------------------------------------------------------------
@@ -316,7 +316,7 @@ FAILURE: 5 failures in 2390 not present in 2392
 `ncu-ci daily` show recent results of `node-daily-master`. You can also aggregate the results by passing `--cache`, or limit the maximum number of CIs jobs to get data from with `--limit=N`. See `ncu-ci daily --help` for more.
 
 ```sh
-node on git:master ❯ ncu-ci daily
+node on git:main ❯ ncu-ci daily
 ✔  Done--------------------------------------------------------------------------------
 [1/16] Running health
 --------------------------------------------------------------------------------
@@ -333,7 +333,7 @@ node on git:master ❯ ncu-ci daily
 ----------------------------------- Summary ------------------------------------
 Result     FAILURE
 URL        https://ci.nodejs.org/job/node-test-commit/39692/
-Source     https://api.github.com/repos/nodejs/node/git/refs/heads/master
+Source     https://api.github.com/repos/nodejs/node/git/refs/heads/main
 Commit     [bf0d82c10247] test: remove common.localhostIPv6
 Date       2020-07-16 16:57:30 -0700
 Author     Rich Trott <rtrott@gmail.com>

lib/backport_session.js

@@ -141,9 +141,9 @@ export default class BackportSession extends Session {
     // TODO(joyeechuneg): add more warnings
     const { prid } = this;
     const url = getPrURL(this);
-    cli.log(`Looking for commits of ${url} on master...`);
+    cli.log(`Looking for commits of ${url} on main...`);
 
-    const commits = this.getCommitsFromBranch(prid, 'master');
+    const commits = this.getCommitsFromBranch(prid, 'main');
 
     if (commits.length === 0) {
       cli.error('Could not find any commit matching the PR');

lib/collaborators.js

@@ -68,7 +68,7 @@ export async function getCollaborators(cli, request, argv) {
 
 function parseCollaborators(readme, cli) {
   // This is more or less taken from
-  // https://github.com/rvagg/archived-iojs-tools/blob/master/pr-metadata/pr-metadata.js
+  // https://github.com/rvagg/archived-iojs-tools/blob/main/pr-metadata/pr-metadata.js
   const collaborators = new Map();
   let m;
 

lib/prepare_release.js

@@ -587,7 +587,7 @@ export default class ReleasePreparation {
         'baking-for-lts'
       ];
 
-      let comparisonBranch = 'master';
+      let comparisonBranch = 'main';
       const isSemverMinor = versionComponents.patch === 0;
       if (isLTS) {
         // Assume Current branch matches tag with highest semver value.

lib/session.js

@@ -369,8 +369,8 @@ export default class Session {
       cli.separator();
       cli.info(
         'For example, if your want to land commits on the ' +
-        '`master` branch, you can run:\n\n' +
-        '  $ ncu-config set branch master');
+        '`main` branch, you can run:\n\n' +
+        '  $ ncu-config set branch main');
       cli.separator();
       cli.setExitCode(1);
     }

lib/update-v8/applyNodeChanges.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
 
+import Enquirer from 'enquirer';
 import { Listr } from 'listr2';
 
 import {
@@ -22,7 +23,11 @@ export default function applyNodeChanges() {
     task: async(ctx) => {
       const v8Version = await getNodeV8Version(ctx.nodeDir);
       const list = filterForVersion(nodeChanges, v8Version);
-      return new Listr(list.map((change) => change.task()));
+      return new Listr(list.map((change) => change.task()), {
+        injectWrapper: {
+          enquirer: new Enquirer()
+        }
+      });
     }
   };
 }