Skip to content

Commit

Permalink
Merge branch 'v17-next' into pr/1345
Browse files Browse the repository at this point in the history
  • Loading branch information
raineorshine committed Nov 6, 2023
2 parents e0db05a + 667516f commit 9e74056
Show file tree
Hide file tree
Showing 27 changed files with 2,576 additions and 1,199 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.js
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
8 changes: 2 additions & 6 deletions .ncurc.js
Expand Up @@ -13,16 +13,12 @@ module.exports = {
// 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',
Expand Down
1 change: 1 addition & 0 deletions .prettierrc.json
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

0 comments on commit 9e74056

Please sign in to comment.