Merge branch 'master' into backend

This commit is contained in:
Alexander Zobnin
2020-05-28 12:02:36 +03:00
100 changed files with 4537 additions and 3689 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "grafana-zabbix",
"private": false,
"version": "3.10.5",
"version": "3.11.0",
"description": "Zabbix plugin for Grafana",
"homepage": "http://grafana-zabbix.org",
"scripts": {
@@ -30,10 +30,11 @@
"@babel/preset-env": "^7.8.3",
"@babel/preset-react": "^7.8.3",
"@emotion/core": "^10.0.27",
"@grafana/data": "canary",
"@grafana/runtime": "canary",
"@grafana/toolkit": "canary",
"@grafana/ui": "canary",
"@grafana/data": "^6.7.3",
"@grafana/runtime": "^6.7.3",
"@grafana/ui": "^6.7.3",
"@grafana/toolkit": "^6.7.3",
"@popperjs/core": "^2.4.0",
"@types/classnames": "^2.2.9",
"@types/grafana": "github:CorpGlory/types-grafana",
"@types/jest": "^23.1.1",
@@ -69,24 +70,26 @@
"jshint-stylish": "^2.1.0",
"load-grunt-tasks": "~3.2.0",
"lodash": "~4.17.13",
"memoize-one": "^5.1.1",
"moment": "~2.21.0",
"ng-annotate-webpack-plugin": "^0.3.0",
"node-sass": "^4.13.0",
"prop-types": "^15.6.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-popper": "^1.3.2",
"react-table": "^6.8.6",
"react": "16.12.0",
"react-dom": "16.12.0",
"react-popper": "^2.2.3",
"react-table-6": "^6.8.6",
"react-test-renderer": "^16.7.0",
"react-transition-group": "^2.5.2",
"rst2html": "github:thoward/rst2html#990cb89",
"sass-loader": "^8.0.0",
"semver": "^7.3.2",
"style-loader": "^0.23.1",
"tether-drop": "^1.4.2",
"ts-jest": "^24.2.0",
"ts-loader": "^6.2.0",
"tslint": "5.20.1",
"typescript": "3.7.2",
"typescript": "^3.9.2",
"webpack": "4.29.6",
"webpack-cli": "3.2.3"
},