Skip to content

Commit 0b3a164

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/grpc/grpc-js-1.13.4
2 parents f0c849d + 833aed7 commit 0b3a164

File tree

4 files changed

+217
-243
lines changed

4 files changed

+217
-243
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"package-no-sbt": "yarn workspace @omega-edit/server package-no-sbt && yarn workspace @omega-edit/client package"
2424
},
2525
"devDependencies": {
26-
"@types/chai": "^4.3.12",
26+
"@types/chai": "^5.2.2",
2727
"@types/mocha": "^10.0.10",
2828
"@types/node": "^22.13.1",
29-
"chai": "^4.3.10",
29+
"chai": "^5.2.1",
3030
"copy-webpack-plugin": "^13.0.0",
31-
"eslint": "^8.57.0",
31+
"eslint": "^9.30.1",
3232
"eslint-config-prettier": "^10.0.1",
3333
"eslint-plugin-prettier": "^5.2.3",
3434
"mocha": "^10.8.2",
@@ -38,7 +38,7 @@
3838
"typedoc": "^0.28.7",
3939
"typescript": "^5.7.3",
4040
"unzip-stream": "^0.3.4",
41-
"webpack": "^5.98.0",
41+
"webpack": "^5.100.1",
4242
"webpack-cli": "^6.0.1"
4343
},
4444
"prettier": {

packages/client/.eslintrc

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/client/eslint.config.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
const globals = require('globals')
2+
const prettierPlugin = require('eslint-plugin-prettier')
3+
const prettierConfig = require('eslint-config-prettier')
4+
5+
module.exports = [
6+
{
7+
plugins: { prettier: prettierPlugin },
8+
rules: {
9+
'prettier/prettier': 'error',
10+
},
11+
languageOptions: {
12+
ecmaVersion: 2022,
13+
sourceType: 'module',
14+
globals: {
15+
...globals.browser,
16+
...globals.node,
17+
...globals.es2021,
18+
},
19+
},
20+
},
21+
prettierConfig,
22+
]

0 commit comments

Comments
 (0)