Skip to content

Commit f2d9ea5

Browse files
authored
Merge branch 'master' into update_to_react_18_mui_6
2 parents 79aad2e + 87d926f commit f2d9ea5

File tree

8 files changed

+460
-640
lines changed

8 files changed

+460
-640
lines changed

.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
}
3737
],
3838
"import/no-cycle": "error",
39+
"import/no-named-as-default": 0,
3940
"prettier/prettier": [
4041
"error",
4142
{

package-lock.json

Lines changed: 36 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@diamondlightsource/cs-web-lib",
3-
"version": "0.3.2",
3+
"version": "0.4.0",
44
"description": "Control system web library",
55
"main": "dist/cjs/index.js",
66
"scripts": {
@@ -68,6 +68,7 @@
6868
"vite-plugin-node-polyfills": "^0.22.0",
6969
"vitest": "^2.1.4",
7070
"vitest-canvas-mock": "^0.3.3",
71+
"vitest-websocket-mock": "^0.4.0",
7172
"xml-js": "^1.6.11"
7273
},
7374
"peerDependencies": {

src/connection/coniql.test.ts

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

0 commit comments

Comments
 (0)