Merge remote-tracking branch 'origin/master' into pages-url-params

# Conflicts:
#	src/renderer/components/layout/sidebar.tsx
This commit is contained in:
Roman committed 2020-12-18 15:48:10 +02:00
commit 69e5e5eaab
49 files changed
+655 -447

No files matched your search

+2 -1
View File
@@ -5362,7 +5362,8 @@
"semver": {
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
"dev": true
},
"serialize-javascript": {
"version": "4.0.0",
@@ -12,14 +12,13 @@
"dev": "npm run build --watch",
"test": "jest --passWithNoTests --env=jsdom src $@"
},
"dependencies": {
"semver": "^7.3.2"
},
"dependencies": {},
"devDependencies": {
"@k8slens/extensions": "file:../../src/extensions/npm/extensions",
"jest": "^26.6.3",
"mobx": "^5.15.5",
"react": "^16.13.1",
"semver": "^7.3.2",
"ts-loader": "^8.0.4",
"typescript": "^4.0.3",
"webpack": "^4.44.2"
+1
View File
@@ -74,6 +74,7 @@ export class Tracker extends Util.Singleton {
}
reportPeriodically() {
this.reportData();
this.reportInterval = setInterval(() => {
this.reportData();
}, 60 * 60 * 1000); // report every 1h