Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-spawn-please
Browse files Browse the repository at this point in the history
  • Loading branch information
raineorshine committed Mar 14, 2024
2 parents a898848 + 2235c29 commit b800ecd
Show file tree
Hide file tree
Showing 12 changed files with 179 additions and 298 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [16, 18, 20]
node: [18, 20]
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
15 changes: 2 additions & 13 deletions .ncurc.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
module.exports = {
format: 'group',
reject: [
// TODO: major version upgrades
'chai',
'commander',
'@typescript-eslint/eslint-plugin',
'@typescript-eslint/parser',
// ESM only modules
// https://github.com/microsoft/TypeScript/issues/46452
// esm only modules
'find-up',
/* pin to 4.0.0 to match make-fetch-happen/cacache. */
'chai',
'p-map',
'remote-git-tags',
'untildify',
// major changes required to upgrade to v3
'spawn-please',
// v0.60.0 breaks cli option description output
// https://github.com/YousefED/typescript-json-schema/issues/568
'typescript-json-schema',
// node >= 18
'update-notifier',
],
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ Options that take no arguments can be negated by prefixing them with `--no-`, e.
</tr>
<tr>
<td><a href="#target">-t, --target &lt;value&gt;</a></td>
<td>Determines the version to upgrade to: latest, newest, greatest, minor, patch, semver, @[tag], or [function]. (default: latest)</td>
<td>Determines the version to upgrade to: latest, newest, greatest, minor, patch, semver, <code>@[tag]<code>, or [function]. (default: latest)</td>
</tr>
<tr>
<td>--timeout &lt;ms&gt;</td>
Expand Down Expand Up @@ -715,7 +715,7 @@ The predicate function is only available in .ncurc.js or when importing npm-chec
(See: https://git.coolaj86.com/coolaj86/semver-utils.js#semverutils-parse-semverstring)
@returns True if the package should be excluded, false if it should be included.
*/
filterVersionFunction: (name, semver) => {
rejectVersionFunction: (name, semver) => {
if (name.startsWith('@myorg/') && parseInt(semver[0]?.major) > 5) {
return true
}
Expand Down
Loading

0 comments on commit b800ecd

Please sign in to comment.