Skip to content

Commit 4319b8e

Browse files
committed
reslved merge conflits react dev tools working
2 parents 4118467 + e7b388b commit 4319b8e

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,9 @@
102102
"@graphql-tools/schema": "^8.3.10",
103103
"@grpc/grpc-js": "^1.6.7",
104104
"@grpc/proto-loader": "^0.6.9",
105-
"@jest-runner/electron": "^3.0.1",
106-
"@kayahr/jest-electron-runner": "^29.9.0",
107105
"@mui/styled-engine": "^5.13.2",
108106
"@redux-devtools/extension": "^3.2.2",
109107
"@reduxjs/toolkit": "^1.8.1",
110-
"@testing-library/react": "^14.0.0",
111108
"@trpc/client": "^10.10.0",
112109
"@types/escape-html": "^1.0.2",
113110
"@uiw/codemirror-extensions-langs": "^4.19.9",
@@ -118,7 +115,6 @@
118115
"bulma": "^0.9.3",
119116
"bulma-checkradio": "^2.1.3",
120117
"bulma-switch": "^2.0.4",
121-
"chai": "^4.3.7",
122118
"classnames": "^2.3.1",
123119
"cookie-parser": "^1.4.6",
124120
"cors": "^2.8.5",
@@ -185,7 +181,8 @@
185181
"@mui/lab": "5.0.0-alpha.137",
186182
"@mui/material": "5.14.2",
187183
"@playwright/test": "^1.21.1",
188-
"@testing-library/jest-dom": "^5.16.4",
184+
"@testing-library/jest-dom": "^6.1.4",
185+
"@testing-library/react": "^14.0.0",
189186
"@types/cookie": "^0.5.1",
190187
"@types/node": "^17.0.28",
191188
"@types/react": "^18.0.8",
@@ -199,7 +196,8 @@
199196
"@typescript-eslint/eslint-plugin": "^5.21.0",
200197
"@typescript-eslint/parser": "^5.21.0",
201198
"babel-loader": "^8.2.5",
202-
"chai-http": "^4.3.0",
199+
"chai": "^4.3.10",
200+
"chai-http": "^4.4.0",
203201
"concurrently": "^8.0.1",
204202
"cross-env": "^7.0.3",
205203
"csp-html-webpack-plugin": "^5.1.0",
@@ -216,8 +214,9 @@
216214
"html-webpack-plugin": "^5.5.0",
217215
"istanbul": "^0.4.5",
218216
"jest": "^29.7.0",
217+
"jest-environment-jsdom": "^29.7.0",
219218
"mini-css-extract-plugin": "^2.6.0",
220-
"mocha": "^9.2.2",
219+
"mocha": "^10.2.0",
221220
"nodemon": "^2.0.22",
222221
"nyc": "^15.1.0",
223222
"playwright": "^1.21.1",

0 commit comments

Comments
 (0)