diff --git a/package.json b/package.json index 6e25e11cf37..76f8850f9c8 100644 --- a/package.json +++ b/package.json @@ -129,14 +129,14 @@ "sinon": "1.17.6", "style-loader": "0.23.1", "terser-webpack-plugin": "1.2.3", - "ts-jest": "24.0.2", - "ts-loader": "6.0.4", - "ts-node": "8.1.0", - "tslib": "1.9.3", - "tslint": "5.14.0", + "ts-jest": "24.1.0", + "ts-loader": "6.1.1", + "ts-node": "8.4.1", + "tslib": "1.10.0", + "tslint": "5.20.0", "tslint-loader": "3.5.4", - "tslint-react": "3.6.0", - "typescript": "3.5.3", + "tslint-react": "4.1.0", + "typescript": "3.6.3", "webpack": "4.29.6", "webpack-bundle-analyzer": "3.3.2", "webpack-cleanup-plugin": "0.5.1", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 170215e468e..8900d34ecab 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -38,7 +38,7 @@ "rollup-plugin-typescript2": "0.19.3", "rollup-plugin-visualizer": "0.9.2", "sinon": "1.17.6", - "typescript": "3.5.3" + "typescript": "3.6.3" }, "types": "src/index.ts" } diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 3614065777f..a8ae0ca262a 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -37,7 +37,7 @@ "rollup-plugin-terser": "4.0.4", "rollup-plugin-typescript2": "0.19.3", "rollup-plugin-visualizer": "0.9.2", - "typescript": "3.5.3" + "typescript": "3.6.3" }, "types": "src/index.ts" } diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index cae530db5a6..f192addf498 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -84,13 +84,13 @@ "simple-git": "^1.112.0", "style-loader": "^0.23.1", "terser-webpack-plugin": "^1.3.0", - "ts-jest": "24.0.2", - "ts-loader": "6.0.4", - "ts-node": "^8.2.0", + "ts-jest": "24.1.0", + "ts-loader": "6.1.1", + "ts-node": "8.4.1", "tslib": "1.10.0", - "tslint": "5.14.0", + "tslint": "5.20.0", "tslint-config-prettier": "^1.18.0", - "typescript": "3.5.3", + "typescript": "3.6.3", "url-loader": "^2.0.1", "webpack": "4.35.0" }, diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index ac98227b8ed..2a14230f074 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -86,7 +86,7 @@ "rollup-plugin-terser": "4.0.4", "rollup-plugin-typescript2": "0.19.3", "rollup-plugin-visualizer": "0.9.2", - "typescript": "3.5.3" + "typescript": "3.6.3" }, "types": "src/index.ts" } diff --git a/public/app/features/datasources/utils/passwordHandlers.test.ts b/public/app/features/datasources/utils/passwordHandlers.test.ts index f1bf86f34eb..a83cffb6c8c 100644 --- a/public/app/features/datasources/utils/passwordHandlers.test.ts +++ b/public/app/features/datasources/utils/passwordHandlers.test.ts @@ -1,9 +1,6 @@ import { createResetHandler, PasswordFieldEnum, Ctrl } from './passwordHandlers'; - describe('createResetHandler', () => { - Object.keys(PasswordFieldEnum).forEach(fieldKey => { - const field: any = PasswordFieldEnum[fieldKey as any]; - + Object.values(PasswordFieldEnum).forEach(field => { it(`should reset existing ${field} field`, () => { const event: any = { preventDefault: () => {}, diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index deeb4445869..45503d50e7b 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -2,7 +2,6 @@ import React, { ComponentClass } from 'react'; import { hot } from 'react-hot-loader'; import { css } from 'emotion'; -// @ts-ignore import { connect } from 'react-redux'; import { AutoSizer } from 'react-virtualized'; import memoizeOne from 'memoize-one'; @@ -352,7 +351,7 @@ export class Explore extends React.PureComponent { const ensureQueriesMemoized = memoizeOne(ensureQueries); const getTimeRangeFromUrlMemoized = memoizeOne(getTimeRangeFromUrl); -function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) { +function mapStateToProps(state: StoreState, { exploreId }: ExploreProps): Partial { const explore = state.explore; const { split } = explore; const item: ExploreItemState = explore[exploreId]; @@ -430,7 +429,7 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) { }; } -const mapDispatchToProps = { +const mapDispatchToProps: Partial = { changeSize, initializeExplore, modifyQueries, @@ -444,6 +443,7 @@ const mapDispatchToProps = { }; export default hot(module)( + // @ts-ignore connect( mapStateToProps, mapDispatchToProps diff --git a/yarn.lock b/yarn.lock index 5226dd7760c..3f5d4316867 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7188,7 +7188,7 @@ diff@^2.0.2: version "2.2.3" resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99" -diff@^3.1.0, diff@^3.2.0: +diff@^3.2.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -11481,7 +11481,7 @@ lodash.keys@^3.1.2: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash.memoize@^4.1.2: +lodash.memoize@4.x, lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -17734,6 +17734,22 @@ ts-jest@24.0.2: semver "^5.5" yargs-parser "10.x" +ts-jest@24.1.0: + version "24.1.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.1.0.tgz#2eaa813271a2987b7e6c3fefbda196301c131734" + integrity sha512-HEGfrIEAZKfu1pkaxB9au17b1d9b56YZSqz5eCVE8mX68+5reOvlM93xGOzzCREIov9mdH7JBG+s0UyNAqr0tQ== + dependencies: + bs-logger "0.x" + buffer-from "1.x" + fast-json-stable-stringify "2.x" + json5 "2.x" + lodash.memoize "4.x" + make-error "1.x" + mkdirp "0.x" + resolve "1.x" + semver "^5.5" + yargs-parser "10.x" + ts-loader@6.0.4: version "6.0.4" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.0.4.tgz#bc331ad91a887a60632d94c9f79448666f2c4b63" @@ -17745,12 +17761,24 @@ ts-loader@6.0.4: micromatch "^4.0.0" semver "^6.0.0" -ts-node@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.1.0.tgz#8c4b37036abd448577db22a061fd7a67d47e658e" +ts-loader@6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.1.1.tgz#f30c68aa1ce59fa266f0bb70a36959ca68f40ddc" + integrity sha512-AoOek8ZWJlWwTRH5ttNmZPBRcASUJZc8wc8E/2PGOXef96H97J8KaLXaW/zUnvyFjvCoRBhTGh9ZIMKL1arcCA== + dependencies: + chalk "^2.3.0" + enhanced-resolve "^4.0.0" + loader-utils "^1.0.2" + micromatch "^4.0.0" + semver "^6.0.0" + +ts-node@8.4.1: + version "8.4.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.4.1.tgz#270b0dba16e8723c9fa4f9b4775d3810fd994b4f" + integrity sha512-5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw== dependencies: arg "^4.1.0" - diff "^3.1.0" + diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.6" yn "^3.0.0" @@ -17790,11 +17818,12 @@ tslint-loader@3.5.4: rimraf "^2.4.4" semver "^5.3.0" -tslint-react@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.6.0.tgz#7f462c95c4a0afaae82507f06517ff02942196a1" +tslint-react@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-4.1.0.tgz#7153b724a8cfbea52423d0ffa469e8eba3bcc834" + integrity sha512-Y7CbFn09X7Mpg6rc7t/WPbmjx9xPI8p1RsQyiGCLWgDR6sh3+IBSlT+bEkc0PSZcWwClOkqq2wPsID8Vep6szQ== dependencies: - tsutils "^2.13.1" + tsutils "^3.9.1" tslint@5.14.0: version "5.14.0" @@ -17814,12 +17843,38 @@ tslint@5.14.0: tslib "^1.8.0" tsutils "^2.29.0" -tsutils@^2.13.1, tsutils@^2.29.0: +tslint@5.20.0: + version "5.20.0" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.0.tgz#fac93bfa79568a5a24e7be9cdde5e02b02d00ec1" + integrity sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g== + dependencies: + "@babel/code-frame" "^7.0.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^4.0.1" + glob "^7.1.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + mkdirp "^0.5.1" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.8.0" + tsutils "^2.29.0" + +tsutils@^2.29.0: version "2.29.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" dependencies: tslib "^1.8.1" +tsutils@^3.9.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" + integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== + dependencies: + tslib "^1.8.1" + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -17868,10 +17923,10 @@ typeface-oswald@0.0.54: version "0.0.54" resolved "https://registry.yarnpkg.com/typeface-oswald/-/typeface-oswald-0.0.54.tgz#1e253011622cdd50f580c04e7d625e7f449763d7" -typescript@3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977" - integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g== +typescript@3.6.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da" + integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw== ua-parser-js@^0.7.18: version "0.7.19"