Skip to content

Commit

Permalink
Merge pull request #1345 from Zamiell/v17
Browse files Browse the repository at this point in the history
  • Loading branch information
raineorshine committed Dec 18, 2023
2 parents 4ab2c9d + 5809c98 commit f873346
Show file tree
Hide file tree
Showing 36 changed files with 2,322 additions and 1,634 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,14 @@ module.exports = {
'@typescript-eslint/array-type': [
'error',
{
'array-type': 'array',
default: 'array',
},
],
},
},
],
plugins: ['fp', 'jsdoc'],
plugins: ['jsdoc'],
rules: {
// jsdoc
'jsdoc/require-jsdoc': [
'error',
{
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ on:

env:
FORCE_COLOR: 2
NODE_COV: 16
LRU_CACHE_IGNORE_AC_WARNING: 1
NODE_COV: 18

permissions:
contents: read
Expand All @@ -29,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18]
node: [16, 18, 20]
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
12 changes: 6 additions & 6 deletions .ncurc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ module.exports = {
'find-up',
'get-stdin',
'globby',
/* pin to 4.0.0 to match make-fetch-happen/cacache. */
'p-map',
'remote-git-tags',
'untildify',
// Broken in v6.0.0
// Working upgrade is in branch 'hosted-git-info', but hold off on merging due to node engine requirements: ^14.17.0 || ^16.13.0 || >=18.0.0
// https://github.com/npm/hosted-git-info/releases/tag/v6.0.0
'hosted-git-info',
// Waiting for Prettier v3 support in @trivago/prettier-plugin-sort-imports
// https://github.com/trivago/prettier-plugin-sort-imports/issues/240
'prettier',
// Removed support for node v14 in v0.35.0
'makdownlint-cli',
// manually keep in alignment with pacote's version of make-fetch-happen
'make-fetch-happen',
// 5.2.0 breaks moduleResolution
// Need to upgrade module and moduleResolution together (high risk)
'typescript',
// 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',
],
}
1 change: 1 addition & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"importOrder": ["^\\.\\./", "^\\./"],
"importOrderSortSpecifiers": true,
"overrides": [{ "files": "*.ts", "options": { "parser": "typescript" } }],
"plugins": ["@trivago/prettier-plugin-sort-imports"],
"printWidth": 120,
"semi": false,
"singleQuote": true,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ Options that take no arguments can be negated by prefixing them with `--no-`, e.
</tr>
<tr>
<td>--root</td>
<td>Runs updates on the root project in addition to specified workspaces. Only allowed with <code>--workspace</code> or <code>--workspaces</code>. (default: false)</td>
<td>Runs updates on the root project in addition to specified workspaces. Only allowed with <code>--workspace</code> or <code>--workspaces</code>. (default: true)</td>
</tr>
<tr>
<td>-s, --silent</td>
Expand Down

0 comments on commit f873346

Please sign in to comment.