Преглед изворни кода

Chore: Lock dependencies (#16644)

* fix: Lock version of dependencies

* fix: Lock version of devDependencies

* fix: Lock down grafana/ui npm versions + regenerate lockfile

* fix: Back some versions i tried to bump

* fix: Bump react and react-dom to latest

* chore: Remove types/react from resolutions

* fix: Lock eventemitter3 version in package.json
Johannes Schill пре 6 година
родитељ
комит
4606a6a894
4 измењених фајлова са 500 додато и 619 уклоњено
  1. 136 137
      package.json
  2. 53 53
      packages/grafana-ui/package.json
  3. 2 2
      public/app/plugins/datasource/stackdriver/datasource.ts
  4. 309 427
      yarn.lock

+ 136 - 137
package.json

@@ -11,122 +11,122 @@
     "url": "http://github.com/grafana/grafana.git"
   },
   "devDependencies": {
-    "@babel/core": "^7.3.4",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/preset-env": "^7.3.4",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/preset-typescript": "^7.3.3",
-    "@emotion/core": "^10.0.10",
-    "@rtsao/plugin-proposal-class-properties": "^7.0.1-patch.1",
-    "@types/angular": "^1.6.6",
-    "@types/chalk": "^2.2.0",
-    "@types/classnames": "^2.2.6",
-    "@types/clipboard": "^2.0.1",
-    "@types/commander": "^2.12.2",
-    "@types/d3": "^4.10.1",
-    "@types/enzyme": "^3.1.13",
-    "@types/inquirer": "^0.0.43",
-    "@types/jest": "^24.0.11",
-    "@types/jquery": "^1.10.35",
+    "@babel/core": "7.4.3",
+    "@babel/plugin-syntax-dynamic-import": "7.2.0",
+    "@babel/preset-env": "7.4.2",
+    "@babel/preset-react": "7.0.0",
+    "@babel/preset-typescript": "7.3.3",
+    "@emotion/core": "10.0.10",
+    "@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
+    "@types/angular": "1.6.54",
+    "@types/chalk": "2.2.0",
+    "@types/classnames": "2.2.7",
+    "@types/clipboard": "2.0.1",
+    "@types/commander": "2.12.2",
+    "@types/d3": "4.13.1",
+    "@types/enzyme": "3.9.0",
+    "@types/inquirer": "0.0.43",
+    "@types/jest": "24.0.11",
+    "@types/jquery": "1.10.35",
     "@types/lodash": "4.14.123",
-    "@types/node": "^8.0.31",
-    "@types/papaparse": "^4.5.9",
-    "@types/react": "^16.8.8",
-    "@types/react-dom": "^16.8.2",
-    "@types/react-grid-layout": "^0.16.6",
-    "@types/react-select": "^2.0.4",
-    "@types/react-transition-group": "^2.0.15",
-    "@types/react-virtualized": "^9.18.12",
+    "@types/node": "11.13.4",
+    "@types/papaparse": "4.5.9",
+    "@types/react": "16.8.13",
+    "@types/react-dom": "16.8.4",
+    "@types/react-grid-layout": "0.16.7",
+    "@types/react-select": "2.0.15",
+    "@types/react-transition-group": "2.0.16",
+    "@types/react-virtualized": "9.18.12",
     "@types/react-window": "1.7.0",
     "angular-mocks": "1.6.6",
-    "autoprefixer": "^9.4.10",
-    "axios": "^0.18.0",
-    "babel-core": "^7.0.0-bridge",
-    "babel-jest": "^24.6.0",
-    "babel-loader": "^8.0.4",
-    "babel-plugin-angularjs-annotate": "^0.10.0",
-    "chalk": "^2.4.2",
-    "clean-webpack-plugin": "^2.0.0",
-    "concurrently": "^4.1.0",
-    "css-loader": "^2.1.1",
-    "enzyme": "^3.6.0",
-    "enzyme-adapter-react-16": "^1.5.0",
-    "enzyme-to-json": "^3.3.4",
-    "es6-promise": "^3.0.2",
-    "es6-shim": "^0.35.3",
-    "execa": "^1.0.0",
-    "expect.js": "~0.2.0",
+    "autoprefixer": "9.5.0",
+    "axios": "0.18.0",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-jest": "24.6.0",
+    "babel-loader": "8.0.5",
+    "babel-plugin-angularjs-annotate": "0.10.0",
+    "chalk": "2.4.2",
+    "clean-webpack-plugin": "2.0.0",
+    "concurrently": "4.1.0",
+    "css-loader": "2.1.1",
+    "enzyme": "3.9.0",
+    "enzyme-adapter-react-16": "1.11.2",
+    "enzyme-to-json": "3.3.5",
+    "es6-promise": "3.3.1",
+    "es6-shim": "0.35.5",
+    "execa": "1.0.0",
+    "expect.js": "0.2.0",
     "expose-loader": "0.7.5",
-    "file-loader": "^3.0.1",
-    "fork-ts-checker-webpack-plugin": "^1.0.0",
-    "gaze": "^1.1.2",
-    "glob": "~7.1.3",
+    "file-loader": "3.0.1",
+    "fork-ts-checker-webpack-plugin": "1.0.0",
+    "gaze": "1.1.3",
+    "glob": "7.1.3",
     "grunt": "1.0.1",
-    "grunt-angular-templates": "^1.1.0",
-    "grunt-cli": "~1.2.0",
-    "grunt-contrib-clean": "~1.0.0",
-    "grunt-contrib-compress": "^1.3.0",
-    "grunt-contrib-copy": "~1.0.0",
-    "grunt-exec": "^1.0.1",
-    "grunt-newer": "^1.3.0",
-    "grunt-notify": "^0.4.5",
-    "grunt-postcss": "^0.8.0",
-    "grunt-sass-lint": "^0.2.4",
+    "grunt-angular-templates": "1.1.0",
+    "grunt-cli": "1.2.0",
+    "grunt-contrib-clean": "1.0.0",
+    "grunt-contrib-compress": "1.4.3",
+    "grunt-contrib-copy": "1.0.0",
+    "grunt-exec": "1.0.1",
+    "grunt-newer": "1.3.0",
+    "grunt-notify": "0.4.5",
+    "grunt-postcss": "0.8.0",
+    "grunt-sass-lint": "0.2.4",
     "grunt-usemin": "3.1.1",
-    "grunt-webpack": "^3.0.2",
+    "grunt-webpack": "3.1.3",
     "html-loader": "0.5.5",
-    "html-webpack-harddisk-plugin": "^1.0.1",
-    "html-webpack-plugin": "^3.2.0",
-    "husky": "^1.3.1",
-    "inquirer": "^6.2.2",
-    "jest": "^24.6.0",
-    "jest-date-mock": "^1.0.6",
-    "lint-staged": "^8.1.3",
+    "html-webpack-harddisk-plugin": "1.0.1",
+    "html-webpack-plugin": "3.2.0",
+    "husky": "1.3.1",
+    "inquirer": "6.2.2",
+    "jest": "24.6.0",
+    "jest-date-mock": "1.0.7",
+    "lint-staged": "8.1.5",
     "load-grunt-tasks": "3.5.2",
-    "mini-css-extract-plugin": "^0.5.0",
-    "mocha": "^4.0.1",
-    "monaco-editor": "^0.15.6",
-    "ng-annotate-loader": "^0.6.1",
-    "ng-annotate-webpack-plugin": "^0.3.0",
-    "ngtemplate-loader": "^2.0.1",
-    "node-sass": "^4.11.0",
-    "npm": "^6.9.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "ora": "^3.2.0",
-    "phantomjs-prebuilt": "^2.1.15",
-    "postcss-browser-reporter": "^0.5.0",
-    "postcss-loader": "^3.0.0",
-    "postcss-reporter": "^6.0.1",
+    "mini-css-extract-plugin": "0.5.0",
+    "mocha": "4.1.0",
+    "monaco-editor": "0.15.6",
+    "ng-annotate-loader": "0.6.1",
+    "ng-annotate-webpack-plugin": "0.3.0",
+    "ngtemplate-loader": "2.0.1",
+    "node-sass": "4.11.0",
+    "npm": "6.9.0",
+    "optimize-css-assets-webpack-plugin": "5.0.1",
+    "ora": "3.2.0",
+    "phantomjs-prebuilt": "2.1.16",
+    "postcss-browser-reporter": "0.5.0",
+    "postcss-loader": "3.0.0",
+    "postcss-reporter": "6.0.1",
     "prettier": "1.16.4",
-    "react-hooks-testing-library": "^0.3.7",
-    "react-hot-loader": "^4.3.6",
-    "react-test-renderer": "^16.5.0",
-    "redux-mock-store": "^1.5.3",
-    "regexp-replace-loader": "^1.0.1",
-    "rimraf": "^2.6.3",
-    "sass-lint": "^1.10.2",
+    "react-hooks-testing-library": "0.3.7",
+    "react-hot-loader": "4.8.0",
+    "react-test-renderer": "16.8.4",
+    "redux-mock-store": "1.5.3",
+    "regexp-replace-loader": "1.0.1",
+    "rimraf": "2.6.3",
+    "sass-lint": "1.12.1",
     "sass-loader": "7.1.0",
-    "semver": "^5.6.0",
+    "semver": "5.7.0",
     "sinon": "1.17.6",
     "style-loader": "0.23.1",
     "systemjs": "0.20.19",
-    "systemjs-plugin-css": "^0.1.36",
-    "terser-webpack-plugin": "^1.2.3",
-    "ts-jest": "^24.0.1",
+    "systemjs-plugin-css": "0.1.37",
+    "terser-webpack-plugin": "1.2.3",
+    "ts-jest": "24.0.1",
     "ts-loader": "5.3.3",
     "ts-node": "8.0.2",
     "tslib": "1.9.3",
     "tslint": "5.14.0",
-    "tslint-loader": "^3.5.3",
-    "tslint-react": "^3.6.0",
+    "tslint-loader": "3.5.4",
+    "tslint-react": "3.6.0",
     "typescript": "3.4.1",
     "webpack": "4.29.6",
     "webpack-bundle-analyzer": "3.1.0",
-    "webpack-cleanup-plugin": "^0.5.1",
+    "webpack-cleanup-plugin": "0.5.1",
     "webpack-cli": "3.2.3",
     "webpack-dev-server": "3.2.1",
     "webpack-merge": "4.2.1",
-    "zone.js": "^0.7.2"
+    "zone.js": "0.7.8"
   },
   "scripts": {
     "dev": "webpack --progress --colors --mode development --config scripts/webpack/webpack.dev.js",
@@ -172,64 +172,63 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/polyfill": "^7.0.0",
+    "@babel/polyfill": "7.2.5",
     "@torkelo/react-select": "2.4.1",
-    "@types/reselect": "^2.2.0",
+    "@types/reselect": "2.2.0",
     "angular": "1.6.6",
     "angular-bindonce": "0.3.1",
     "angular-native-dragdrop": "1.2.2",
     "angular-route": "1.6.6",
     "angular-sanitize": "1.6.6",
-    "baron": "^3.0.3",
-    "brace": "^0.10.0",
+    "baron": "3.0.3",
+    "brace": "0.10.0",
     "calculate-size": "1.1.1",
-    "classnames": "^2.2.6",
-    "clipboard": "^2.0.4",
-    "d3": "^4.11.0",
-    "d3-scale-chromatic": "^1.3.0",
-    "eventemitter3": "^2.0.3",
-    "file-saver": "^1.3.3",
-    "immutable": "^3.8.2",
-    "jquery": "^3.2.1",
-    "lodash": "^4.17.10",
-    "moment": "^2.22.2",
-    "mousetrap": "^1.6.0",
-    "mousetrap-global-bind": "^1.1.0",
-    "nodemon": "^1.18.10",
-    "papaparse": "^4.6.3",
-    "prismjs": "^1.6.0",
-    "prop-types": "^15.6.2",
-    "rc-cascader": "^0.14.0",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4",
+    "classnames": "2.2.6",
+    "clipboard": "2.0.4",
+    "d3": "4.13.0",
+    "d3-scale-chromatic": "1.3.3",
+    "eventemitter3": "2.0.3",
+    "file-saver": "1.3.8",
+    "immutable": "3.8.2",
+    "jquery": "3.3.1",
+    "lodash": "4.17.10",
+    "moment": "2.24.0",
+    "mousetrap": "1.6.3",
+    "mousetrap-global-bind": "1.1.0",
+    "nodemon": "1.18.10",
+    "papaparse": "4.6.3",
+    "prismjs": "1.16.0",
+    "prop-types": "15.7.2",
+    "rc-cascader": "0.14.0",
+    "react": "16.8.6",
+    "react-dom": "16.8.6",
     "react-grid-layout": "0.16.6",
     "react-highlight-words": "0.11.0",
-    "react-popper": "^1.3.0",
-    "react-redux": "^5.0.7",
-    "react-sizeme": "^2.3.6",
-    "react-table": "^6.8.6",
-    "react-transition-group": "^2.2.1",
-    "react-virtualized": "^9.21.0",
+    "react-popper": "1.3.3",
+    "react-redux": "5.1.1",
+    "react-sizeme": "2.5.2",
+    "react-table": "6.9.2",
+    "react-transition-group": "2.6.1",
+    "react-virtualized": "9.21.0",
     "react-window": "1.7.1",
-    "redux": "^4.0.0",
-    "redux-logger": "^3.0.6",
-    "redux-thunk": "^2.3.0",
-    "remarkable": "^1.7.1",
-    "reselect": "^4.0.0",
+    "redux": "4.0.1",
+    "redux-logger": "3.0.6",
+    "redux-thunk": "2.3.0",
+    "remarkable": "1.7.1",
+    "reselect": "4.0.0",
     "rst2html": "github:thoward/rst2html#990cb89",
-    "rxjs": "^6.3.3",
-    "slate": "^0.33.4",
-    "slate-plain-serializer": "^0.5.10",
-    "slate-prism": "^0.5.0",
-    "slate-react": "^0.12.4",
-    "tether": "^1.4.0",
+    "rxjs": "6.4.0",
+    "slate": "0.33.8",
+    "slate-plain-serializer": "0.5.41",
+    "slate-prism": "0.5.0",
+    "slate-react": "0.12.11",
+    "tether": "1.4.5",
     "tether-drop": "https://github.com/torkelo/drop/tarball/master",
-    "tinycolor2": "^1.4.1",
-    "xss": "^1.0.3"
+    "tinycolor2": "1.4.1",
+    "xss": "1.0.3"
   },
   "resolutions": {
-    "caniuse-db": "1.0.30000772",
-    "**/@types/react": "16.8.8"
+    "caniuse-db": "1.0.30000772"
   },
   "workspaces": {
     "packages": [

+ 53 - 53
packages/grafana-ui/package.json

@@ -20,63 +20,63 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@torkelo/react-select": "2.1.1",
-    "@types/react-color": "^2.14.0",
-    "classnames": "^2.2.5",
-    "d3": "^5.7.0",
-    "jquery": "^3.2.1",
-    "lodash": "^4.17.10",
-    "moment": "^2.22.2",
-    "papaparse": "^4.6.3",
-    "react": "^16.8.4",
-    "react-calendar": "^2.18.1",
-    "react-color": "^2.17.0",
-    "react-custom-scrollbars": "^4.2.1",
-    "react-dom": "^16.8.4",
+    "@types/react-color": "2.17.0",
+    "classnames": "2.2.6",
+    "d3": "5.9.1",
+    "jquery": "3.3.1",
+    "lodash": "4.17.11",
+    "moment": "2.24.0",
+    "papaparse": "4.6.3",
+    "react": "16.8.6",
+    "react-calendar": "2.18.1",
+    "react-color": "2.17.0",
+    "react-custom-scrollbars": "4.2.1",
+    "react-dom": "16.8.6",
     "react-highlight-words": "0.11.0",
-    "react-popper": "^1.3.0",
-    "react-storybook-addon-props-combinations": "^1.1.0",
-    "react-transition-group": "^2.2.1",
-    "react-virtualized": "^9.21.0",
-    "tether": "^1.4.0",
+    "react-popper": "1.3.3",
+    "react-storybook-addon-props-combinations": "1.1.0",
+    "react-transition-group": "2.6.1",
+    "react-virtualized": "9.21.0",
+    "tether": "1.4.5",
     "tether-drop": "https://github.com/torkelo/drop/tarball/master",
-    "tinycolor2": "^1.4.1"
+    "tinycolor2": "1.4.1"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^5.0.5",
-    "@storybook/addon-info": "^5.0.5",
-    "@storybook/addon-knobs": "^5.0.5",
-    "@storybook/react": "^5.0.5",
-    "@storybook/theming": "^5.0.5",
-    "@types/classnames": "^2.2.6",
-    "@types/d3": "^5.7.0",
-    "@types/jest": "^23.3.2",
-    "@types/jquery": "^1.10.35",
-    "@types/lodash": "^4.14.119",
-    "@types/node": "^10.12.18",
-    "@types/papaparse": "^4.5.9",
-    "@types/pretty-format": "^20.0.1",
-    "@types/react": "^16.8.8",
-    "@types/react-custom-scrollbars": "^4.0.5",
-    "@types/react-test-renderer": "^16.0.3",
-    "@types/react-transition-group": "^2.0.15",
-    "@types/storybook__addon-actions": "^3.4.1",
-    "@types/storybook__addon-info": "^4.1.1",
-    "@types/storybook__addon-knobs": "^4.0.0",
-    "@types/storybook__react": "^4.0.0",
-    "@types/tether-drop": "^1.4.8",
-    "@types/tinycolor2": "^1.4.1",
-    "awesome-typescript-loader": "^5.2.1",
-    "pretty-format": "^24.5.0",
-    "react-docgen-typescript-loader": "^3.0.0",
-    "react-docgen-typescript-webpack-plugin": "^1.1.0",
-    "react-test-renderer": "^16.7.0",
-    "rollup": "^1.1.2",
-    "rollup-plugin-commonjs": "^9.2.0",
-    "rollup-plugin-node-resolve": "^4.0.0",
-    "rollup-plugin-sourcemaps": "^0.4.2",
-    "rollup-plugin-terser": "^4.0.4",
-    "rollup-plugin-typescript2": "^0.19.2",
-    "rollup-plugin-visualizer": "^0.9.2",
+    "@storybook/addon-actions": "5.0.6",
+    "@storybook/addon-info": "5.0.6",
+    "@storybook/addon-knobs": "5.0.6",
+    "@storybook/react": "5.0.6",
+    "@storybook/theming": "5.0.6",
+    "@types/classnames": "2.2.7",
+    "@types/d3": "5.7.1",
+    "@types/jest": "23.3.14",
+    "@types/jquery": "1.10.35",
+    "@types/lodash": "4.14.123",
+    "@types/node": "10.14.1",
+    "@types/papaparse": "4.5.9",
+    "@types/pretty-format": "20.0.1",
+    "@types/react": "16.8.13",
+    "@types/react-custom-scrollbars": "4.0.5",
+    "@types/react-test-renderer": "16.8.1",
+    "@types/react-transition-group": "2.0.16",
+    "@types/storybook__addon-actions": "3.4.2",
+    "@types/storybook__addon-info": "4.1.1",
+    "@types/storybook__addon-knobs": "4.0.4",
+    "@types/storybook__react": "4.0.1",
+    "@types/tether-drop": "1.4.8",
+    "@types/tinycolor2": "1.4.1",
+    "awesome-typescript-loader": "5.2.1",
+    "pretty-format": "24.5.0",
+    "react-docgen-typescript-loader": "3.0.1",
+    "react-docgen-typescript-webpack-plugin": "1.1.0",
+    "react-test-renderer": "16.8.4",
+    "rollup": "1.6.0",
+    "rollup-plugin-commonjs": "9.2.1",
+    "rollup-plugin-node-resolve": "4.0.1",
+    "rollup-plugin-sourcemaps": "0.4.2",
+    "rollup-plugin-terser": "4.0.4",
+    "rollup-plugin-typescript2": "0.19.3",
+    "rollup-plugin-visualizer": "0.9.2",
     "typescript": "3.4.1"
   },
   "resolutions": {

+ 2 - 2
public/app/plugins/datasource/stackdriver/datasource.ts

@@ -112,12 +112,12 @@ export default class StackdriverDatasource implements DataSourceApi<StackdriverQ
     const result = [];
     const data = await this.getTimeSeries(options);
     if (data.results) {
-      Object['values'](data.results).forEach(queryRes => {
+      Object['values'](data.results).forEach((queryRes: any) => {
         if (!queryRes.series) {
           return;
         }
         const unit = this.resolvePanelUnitFromTargets(options.targets);
-        queryRes.series.forEach(series => {
+        queryRes.series.forEach((series: any) => {
           let timeSerie: any = {
             target: series.name,
             datapoints: series.points,

Разлика између датотеке није приказан због своје велике величине
+ 309 - 427
yarn.lock


Неке датотеке нису приказане због велике количине промена