Skip to content

Commit c642972

Browse files
authored
Merge branch 'main' into test-database-rewrite
2 parents 1a14706 + 22a8cbc commit c642972

File tree

5 files changed

+236
-224
lines changed

5 files changed

+236
-224
lines changed

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ module.exports = defineConfig({
1616
'eslint:recommended',
1717
'plugin:@typescript-eslint/recommended',
1818
'plugin:@typescript-eslint/recommended-requiring-type-checking',
19-
'plugin:prettier/recommended',
2019
],
2120
parser: '@typescript-eslint/parser',
2221
parserOptions: {
2322
project: ['./tsconfig.lint.json'],
2423
sourceType: 'module',
2524
warnOnUnsupportedTypeScriptVersion: false,
2625
},
27-
plugins: ['@typescript-eslint', 'prettier'],
26+
plugins: ['@typescript-eslint'],
2827
rules: {
2928
// We may want to use this in the future
3029
'no-useless-escape': 'off',

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,20 @@
8888
},
8989
"devDependencies": {
9090
"@types/node": "~16.11.21",
91-
"@typescript-eslint/eslint-plugin": "~5.10.1",
92-
"@typescript-eslint/parser": "~5.10.1",
91+
"@typescript-eslint/eslint-plugin": "~5.10.2",
92+
"@typescript-eslint/parser": "~5.10.2",
9393
"@types/prettier": "~2.4.3",
9494
"@types/validator": "~13.7.1",
9595
"@vitest/ui": "~0.2.5",
9696
"c8": "~7.11.0",
9797
"conventional-changelog-cli": "~2.2.2",
98-
"cypress": "~9.3.1",
99-
"esbuild": "~0.14.14",
100-
"eslint-config-prettier": "~8.3.0",
98+
"cypress": "~9.4.1",
99+
"esbuild": "~0.14.18",
101100
"eslint-define-config": "~1.2.3",
102101
"eslint-gitignore": "~0.1.0",
103-
"eslint-plugin-prettier": "~4.0.0",
104102
"eslint": "~8.8.0",
105103
"esno": "~0.14.0",
106-
"lint-staged": "~12.3.2",
104+
"lint-staged": "~12.3.3",
107105
"npm-run-all": "~4.1.5",
108106
"picocolors": "~1.0.0",
109107
"prettier": "2.5.1",
@@ -117,7 +115,7 @@
117115
"vitepress": "~0.21.6",
118116
"vitest": "~0.2.5"
119117
},
120-
"packageManager": "pnpm@6.28.0",
118+
"packageManager": "pnpm@6.29.1",
121119
"engines": {
122120
"node": ">=14.0.0",
123121
"npm": ">=7.0.0"

0 commit comments

Comments
 (0)