Skip to content

Commit 659ceff

Browse files
committed
Merge branch 'dev' of https://github.com/oslabs-beta/Chronos into dev
merging :qw
2 parents 73a5997 + 9a4d7ca commit 659ceff

File tree

2 files changed

+240
-7
lines changed

2 files changed

+240
-7
lines changed

package-lock.json

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

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"name": "@chronosmicro/display",
33
"version": "8.0.1",
44
"description": "Chronos microservice metrics display",
5-
"main": "./build/Main.js",
5+
"main": "./build/electron/Main.js",
66
"directories": {
77
"doc": "docs",
88
"example": "examples"
99
},
1010
"dependencies": {
11+
"@chronosmicro/tracker": "^8.0.3",
1112
"@jest/types": "^29.5.0",
1213
"@material-ui/core": "^4.12.4",
1314
"@material-ui/data-grid": "^4.0.0-alpha.37",
@@ -45,7 +46,7 @@
4546
"babel-plugin-import": "^1.13.5",
4647
"cross-env": "^7.0.3",
4748
"css-loader": "^6.7.3",
48-
"electron": "^22.0.0",
49+
"electron": "^22.3.6",
4950
"electron-packager": "^17.1.1",
5051
"fs-extra": "^11.1.0",
5152
"html-webpack-plugin": "^5.5.0",

0 commit comments

Comments
 (0)