Skip to content

Commit 041e834

Browse files
committed
Merge branch 'main' into rneatherway/typescript-upgrade
2 parents f04c5d8 + 3f2eee9 commit 041e834

17 files changed

Lines changed: 12946 additions & 84 deletions

File tree

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"plugin:@typescript-eslint/recommended",
1111
"plugin:@typescript-eslint/recommended-requiring-type-checking",
1212
"plugin:github/recommended",
13-
"plugin:github/typescript"
13+
"plugin:github/typescript",
14+
"plugin:prettier/recommended"
1415
],
1516
"rules": {
1617
"filenames/match-regex": ["error", "^[a-z0-9-]+(\\.test)?$"],

.vscode/extensions.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"esbenp.prettier-vscode",
4+
"dbaeumer.vscode-eslint"
5+
]
6+
}

.vscode/settings.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,10 @@
66

77
// transpiled JavaScript
88
"lib": true,
9-
}
9+
},
10+
"editor.formatOnSave": true,
11+
"editor.formatOnPaste": false,
12+
"[typescript]": {
13+
"editor.defaultFormatter": "esbenp.prettier-vscode"
14+
},
1015
}

lib/combine-results.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/combine-results.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)