Skip to content

Commit b800ecd

Browse files
committed
Merge branch 'main' into upgrade-spawn-please
2 parents a898848 + 2235c29 commit b800ecd

File tree

12 files changed

+179
-298
lines changed

12 files changed

+179
-298
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
node: [16, 18, 20]
31+
node: [18, 20]
3232
os: [ubuntu-latest, windows-latest]
3333

3434
steps:

.ncurc.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
module.exports = {
22
format: 'group',
33
reject: [
4-
// TODO: major version upgrades
5-
'chai',
6-
'commander',
7-
'@typescript-eslint/eslint-plugin',
8-
'@typescript-eslint/parser',
9-
// ESM only modules
10-
// https://github.com/microsoft/TypeScript/issues/46452
4+
// esm only modules
115
'find-up',
12-
/* pin to 4.0.0 to match make-fetch-happen/cacache. */
6+
'chai',
137
'p-map',
148
'remote-git-tags',
159
'untildify',
1610
// major changes required to upgrade to v3
1711
'spawn-please',
18-
// v0.60.0 breaks cli option description output
19-
// https://github.com/YousefED/typescript-json-schema/issues/568
20-
'typescript-json-schema',
21-
// node >= 18
22-
'update-notifier',
2312
],
2413
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ Options that take no arguments can be negated by prefixing them with `--no-`, e.
344344
</tr>
345345
<tr>
346346
<td><a href="#target">-t, --target &lt;value&gt;</a></td>
347-
<td>Determines the version to upgrade to: latest, newest, greatest, minor, patch, semver, @[tag], or [function]. (default: latest)</td>
347+
<td>Determines the version to upgrade to: latest, newest, greatest, minor, patch, semver, <code>@[tag]<code>, or [function]. (default: latest)</td>
348348
</tr>
349349
<tr>
350350
<td>--timeout &lt;ms&gt;</td>
@@ -715,7 +715,7 @@ The predicate function is only available in .ncurc.js or when importing npm-chec
715715
(See: https://git.coolaj86.com/coolaj86/semver-utils.js#semverutils-parse-semverstring)
716716
@returns True if the package should be excluded, false if it should be included.
717717
*/
718-
filterVersionFunction: (name, semver) => {
718+
rejectVersionFunction: (name, semver) => {
719719
if (name.startsWith('@myorg/') && parseInt(semver[0]?.major) > 5) {
720720
return true
721721
}

0 commit comments

Comments
 (0)