From 846c6ce758cb9694cd94b641da2aed3e97d46289 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 16:16:13 +0000 Subject: [PATCH] Update dependency typescript to v4.5.4 (#43756) * Update dependency typescript to v4.5.4 * Changes needed to support new TypeScript version * kick drone Co-authored-by: Renovate Bot Co-authored-by: Ashley Harrison --- .yarn/sdks/typescript/package.json | 2 +- package.json | 2 +- packages/grafana-data/package.json | 2 +- packages/grafana-e2e-selectors/package.json | 2 +- packages/grafana-e2e/package.json | 2 +- packages/grafana-runtime/package.json | 2 +- packages/grafana-schema/package.json | 2 +- packages/grafana-ui/package.json | 2 +- .../components/Forms/Legacy/Select/Select.tsx | 1 - packages/jaeger-ui-components/package.json | 2 +- public/test/core/redux/reduxTester.ts | 17 ++++++++++++---- yarn.lock | 20 +++++++++---------- 12 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json index 1a105129e53..fae7e416784 100644 --- a/.yarn/sdks/typescript/package.json +++ b/.yarn/sdks/typescript/package.json @@ -1,6 +1,6 @@ { "name": "typescript", - "version": "4.4.3-sdk", + "version": "4.5.4-sdk", "main": "./lib/typescript.js", "type": "commonjs" } diff --git a/package.json b/package.json index a290b50e8cd..eaa0eb94b06 100644 --- a/package.json +++ b/package.json @@ -220,7 +220,7 @@ "ts-jest": "27.1.2", "ts-loader": "9.2.6", "ts-node": "10.4.0", - "typescript": "4.4.3", + "typescript": "4.5.4", "wait-on": "6.0.0", "webpack": "5.65.0", "webpack-bundle-analyzer": "4.5.0", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 4802545a663..6afdd8d7b47 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -72,6 +72,6 @@ "rollup-plugin-terser": "7.0.2", "sinon": "12.0.1", "tinycolor2": "1.4.1", - "typescript": "4.4.3" + "typescript": "4.5.4" } } diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 77c9791670a..27f43fab774 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -36,6 +36,6 @@ "dependencies": { "@grafana/tsconfig": "^1.0.0-rc1", "tslib": "2.3.1", - "typescript": "4.4.3" + "typescript": "4.5.4" } } diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index 7e287f16701..45cb0930cd7 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -59,7 +59,7 @@ "rimraf": "3.0.1", "ts-loader": "6.2.1", "tslib": "2.3.1", - "typescript": "4.4.3", + "typescript": "4.5.4", "uuid": "8.3.0", "yaml": "^1.8.3" } diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 6d2b08030bd..f7047b3a77e 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -53,7 +53,7 @@ "rollup": "2.63.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "typescript": "4.4.3" + "typescript": "4.5.4" }, "types": "src/index.ts" } diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index 30c95ce44cf..0f85c0d7395 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -31,7 +31,7 @@ "rollup": "2.63.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "typescript": "4.4.3" + "typescript": "4.5.4" }, "dependencies": { "tslib": "2.3.1" diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index e6a96ebeb0b..f4ccb9bce69 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -173,7 +173,7 @@ "style-loader": "3.3.0", "terser-webpack-plugin": "5.3.0", "ts-loader": "8.0.11", - "typescript": "4.4.3", + "typescript": "4.5.4", "webpack": "5.65.0", "webpack-filter-warnings-plugin": "1.2.1" }, diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx index b80e61ffb30..348914dc44e 100644 --- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx +++ b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx @@ -237,7 +237,6 @@ export class AsyncSelect extends PureComponent> { getOptionLabel={getOptionLabel} getOptionValue={getOptionValue} menuShouldScrollIntoView={false} - //@ts-expect-error onChange={onChange} loadOptions={loadOptions} isLoading={isLoading} diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index d73e25e8bf0..2e967f5f01e 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -24,7 +24,7 @@ "@types/tinycolor2": "1.4.2", "enzyme": "3.11.0", "sinon": "12.0.1", - "typescript": "4.4.3" + "typescript": "4.5.4" }, "dependencies": { "@emotion/css": "11.1.3", diff --git a/public/test/core/redux/reduxTester.ts b/public/test/core/redux/reduxTester.ts index 9616d14909e..aed5c9237d7 100644 --- a/public/test/core/redux/reduxTester.ts +++ b/public/test/core/redux/reduxTester.ts @@ -1,9 +1,18 @@ import { Dispatch, Middleware, MiddlewareAPI } from 'redux'; import thunk, { ThunkMiddleware } from 'redux-thunk'; -import { AnyAction, configureStore, EnhancedStore, Reducer, getDefaultMiddleware } from '@reduxjs/toolkit'; +import { + AnyAction, + configureStore, + EnhancedStore, + Reducer, + getDefaultMiddleware, + CombinedState, + PreloadedState, +} from '@reduxjs/toolkit'; import { StoreState } from '../../../app/types'; import { setStore } from '../../../app/store/store'; +import { NoInfer } from '@reduxjs/toolkit/dist/tsHelpers'; export interface ReduxTesterGiven { givenRootReducer: (rootReducer: Reducer) => ReduxTesterWhen; @@ -29,7 +38,7 @@ export interface ReduxTesterThen { } export interface ReduxTesterArguments { - preloadedState?: State; + preloadedState?: PreloadedState>>; debug?: boolean; } @@ -46,7 +55,7 @@ export const reduxTester = (args?: ReduxTesterArguments): ReduxTes return next(action); }; - const preloadedState = args?.preloadedState ?? (({} as unknown) as State); + const preloadedState = args?.preloadedState ?? (({} as unknown) as PreloadedState>>); const debug = args?.debug ?? false; let store: EnhancedStore | null = null; @@ -57,7 +66,7 @@ export const reduxTester = (args?: ReduxTesterArguments): ReduxTes } as any); const givenRootReducer = (rootReducer: Reducer): ReduxTesterWhen => { - store = configureStore({ + store = configureStore>>({ reducer: rootReducer, middleware: ([...defaultMiddleware, logActionsMiddleWare, thunk] as unknown) as [ThunkMiddleware], preloadedState, diff --git a/yarn.lock b/yarn.lock index cf70c1c79da..2cf46a584a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3473,7 +3473,7 @@ __metadata: sinon: 12.0.1 tinycolor2: 1.4.1 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.5.4 uplot: 1.6.16 xss: 1.0.10 languageName: unknown @@ -3492,7 +3492,7 @@ __metadata: rollup-plugin-sourcemaps: 0.6.3 rollup-plugin-terser: 7.0.2 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.5.4 languageName: unknown linkType: soft @@ -3525,7 +3525,7 @@ __metadata: rollup-plugin-terser: 7.0.2 ts-loader: 6.2.1 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.5.4 uuid: 8.3.0 webpack: 5.65.0 yaml: ^1.8.3 @@ -3598,7 +3598,7 @@ __metadata: rxjs: 7.5.1 systemjs: 0.20.19 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.5.4 languageName: unknown linkType: soft @@ -3616,7 +3616,7 @@ __metadata: rollup-plugin-sourcemaps: 0.6.3 rollup-plugin-terser: 7.0.2 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.5.4 languageName: unknown linkType: soft @@ -3885,7 +3885,7 @@ __metadata: tinycolor2: 1.4.1 ts-loader: 8.0.11 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.5.4 uplot: 1.6.18 uuid: 8.3.0 webpack: 5.65.0 @@ -4008,7 +4008,7 @@ __metadata: tinycolor2: 1.4.1 tslib: 2.3.1 tween-functions: ^1.2.0 - typescript: 4.4.3 + typescript: 4.5.4 languageName: unknown linkType: soft @@ -19729,7 +19729,7 @@ __metadata: ts-loader: 9.2.6 ts-node: 10.4.0 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.5.4 uplot: 1.6.18 uuid: 8.3.0 vendor: "link:./public/vendor" @@ -34377,7 +34377,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:~4.5.2": +"typescript@npm:4.5.4, typescript@npm:~4.5.2": version: 4.5.4 resolution: "typescript@npm:4.5.4" bin: @@ -34407,7 +34407,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@~4.5.2#~builtin": +"typescript@patch:typescript@4.5.4#~builtin, typescript@patch:typescript@~4.5.2#~builtin": version: 4.5.4 resolution: "typescript@patch:typescript@npm%3A4.5.4#~builtin::version=4.5.4&hash=493e53" bin: