From f74b21c119ba63848d036be666e1b282fd61e89f Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Thu, 13 Jan 2022 10:08:38 +0000 Subject: [PATCH] Dependencies: downgrade typescript to 4.4.4 for now (#43970) * Downgrade typescript to 4.5.2 for now * Downgrade to 4.4.4 instead :( * kick drone * Update .github/renovate.json5 Co-authored-by: Jack Westbrook Co-authored-by: Jack Westbrook --- .github/renovate.json5 | 1 + .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 +- yarn.lock | 40 ++++++++++++++----- 12 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index faeff874218..d822f274f90 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -22,6 +22,7 @@ "slate-plain-serializer", "systemjs", "ts-loader", // we should remove ts-loader and use babel-loader instead + "typescript", // >4.5.x doesn't seem to work on windows with pnp currently. probably similar to https://github.com/yarnpkg/berry/issues/3722 "ora" // we should bump this once we move to esm modules ], "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"], diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json index fae7e416784..03b3aa3d057 100644 --- a/.yarn/sdks/typescript/package.json +++ b/.yarn/sdks/typescript/package.json @@ -1,6 +1,6 @@ { "name": "typescript", - "version": "4.5.4-sdk", + "version": "4.4.4-sdk", "main": "./lib/typescript.js", "type": "commonjs" } diff --git a/package.json b/package.json index e334e87a948..3cea6ab5740 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,7 @@ "ts-jest": "27.1.2", "ts-loader": "9.2.6", "ts-node": "10.4.0", - "typescript": "4.5.4", + "typescript": "4.4.4", "wait-on": "6.0.0", "webpack": "5.66.0", "webpack-bundle-analyzer": "4.5.0", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 047ceef1562..b208e17a390 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.2", - "typescript": "4.5.4" + "typescript": "4.4.4" } } diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index cbdda684be3..a347292cf74 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.5.4" + "typescript": "4.4.4" } } diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index ad965d1c0c8..8887d6cb067 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -66,7 +66,7 @@ "tracelib": "1.0.1", "ts-loader": "6.2.1", "tslib": "2.3.1", - "typescript": "4.5.4", + "typescript": "4.4.4", "uuid": "8.3.2", "yaml": "^1.8.3" } diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 9a573c347e2..75153cdb225 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.5.4" + "typescript": "4.4.4" }, "types": "src/index.ts" } diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index 174aff5e0c7..cd6d0da2ddf 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.5.4" + "typescript": "4.4.4" }, "dependencies": { "tslib": "2.3.1" diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 5aa1434199c..9d9f37526eb 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -171,7 +171,7 @@ "style-loader": "3.3.1", "terser-webpack-plugin": "5.3.0", "ts-loader": "8.0.11", - "typescript": "4.5.4", + "typescript": "4.4.4", "webpack": "5.66.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 348914dc44e..b80e61ffb30 100644 --- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx +++ b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx @@ -237,6 +237,7 @@ 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 b69e41c3726..718eba8c75a 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -24,7 +24,7 @@ "@types/tinycolor2": "1.4.3", "enzyme": "3.11.0", "sinon": "12.0.1", - "typescript": "4.5.4" + "typescript": "4.4.4" }, "dependencies": { "@emotion/css": "11.7.1", diff --git a/yarn.lock b/yarn.lock index 3f86aeecb8d..f8e6a8836e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3747,7 +3747,7 @@ __metadata: sinon: 12.0.1 tinycolor2: 1.4.2 tslib: 2.3.1 - typescript: 4.5.4 + typescript: 4.4.4 uplot: 1.6.18 xss: 1.0.10 languageName: unknown @@ -3766,7 +3766,7 @@ __metadata: rollup-plugin-sourcemaps: 0.6.3 rollup-plugin-terser: 7.0.2 tslib: 2.3.1 - typescript: 4.5.4 + typescript: 4.4.4 languageName: unknown linkType: soft @@ -3805,7 +3805,7 @@ __metadata: tracelib: 1.0.1 ts-loader: 6.2.1 tslib: 2.3.1 - typescript: 4.5.4 + typescript: 4.4.4 uuid: 8.3.2 webpack: 5.66.0 yaml: ^1.8.3 @@ -3878,7 +3878,7 @@ __metadata: rxjs: 7.5.1 systemjs: 0.20.19 tslib: 2.3.1 - typescript: 4.5.4 + typescript: 4.4.4 languageName: unknown linkType: soft @@ -3896,7 +3896,7 @@ __metadata: rollup-plugin-sourcemaps: 0.6.3 rollup-plugin-terser: 7.0.2 tslib: 2.3.1 - typescript: 4.5.4 + typescript: 4.4.4 languageName: unknown linkType: soft @@ -4163,7 +4163,7 @@ __metadata: tinycolor2: 1.4.2 ts-loader: 8.0.11 tslib: 2.3.1 - typescript: 4.5.4 + typescript: 4.4.4 uplot: 1.6.18 uuid: 8.3.2 webpack: 5.66.0 @@ -4286,7 +4286,7 @@ __metadata: tinycolor2: 1.4.2 tslib: 2.3.1 tween-functions: ^1.2.0 - typescript: 4.5.4 + typescript: 4.4.4 languageName: unknown linkType: soft @@ -20026,7 +20026,7 @@ __metadata: ts-loader: 9.2.6 ts-node: 10.4.0 tslib: 2.3.1 - typescript: 4.5.4 + typescript: 4.4.4 uplot: 1.6.18 uuid: 8.3.2 vendor: "link:./public/vendor" @@ -34570,7 +34570,17 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.5.4, typescript@npm:~4.5.2": +"typescript@npm:4.4.4": + version: 4.4.4 + resolution: "typescript@npm:4.4.4" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 89ecb8436bb48ef5594d49289f5f89103071716b6e4844278f4fb3362856e31203e187a9c76d205c3f0b674d221a058fd28310dbcbcf5d95e9a57229bb5203f1 + languageName: node + linkType: hard + +"typescript@npm:~4.5.2": version: 4.5.4 resolution: "typescript@npm:4.5.4" bin: @@ -34600,7 +34610,17 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@4.5.4#~builtin, typescript@patch:typescript@~4.5.2#~builtin": +"typescript@patch:typescript@4.4.4#~builtin": + version: 4.4.4 + resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin::version=4.4.4&hash=493e53" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: bd629ad0da4a15d79aaad56baf3ee7d96f6a181760d430ae77f8c5325df7bffd9edee57544a3970e3651e8b796fe03a5838a7eb39c6d46cc3866c0b23d36a0dd + languageName: node + linkType: hard + +"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: