From de3e981985faa2fbec8a9b43388fdd8940786931 Mon Sep 17 00:00:00 2001 From: kay delaney <45561153+kaydelaney@users.noreply.github.com> Date: Tue, 17 May 2022 12:08:10 +0100 Subject: [PATCH] Chore: Upgrade typescript to 4.6.4 (#49016) --- .github/renovate.json5 | 1 - .yarn/sdks/prettier/package.json | 2 +- .yarn/sdks/typescript/lib/tsserver.js | 20 ++++- .yarn/sdks/typescript/lib/tsserverlibrary.js | 20 ++++- .yarn/sdks/typescript/package.json | 2 +- package.json | 4 +- packages/grafana-data/package.json | 4 +- packages/grafana-e2e-selectors/package.json | 4 +- packages/grafana-e2e/package.json | 4 +- packages/grafana-runtime/package.json | 4 +- packages/grafana-schema/package.json | 4 +- packages/grafana-toolkit/package.json | 4 +- packages/grafana-ui/package.json | 4 +- .../components/Forms/Legacy/Select/Select.tsx | 1 - packages/jaeger-ui-components/package.json | 4 +- .../internal/input-datasource/package.json | 2 +- yarn.lock | 85 ++++++++++--------- 17 files changed, 99 insertions(+), 70 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 047b72811cf..d147fcc0a76 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -28,7 +28,6 @@ "systemjs", "copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1 "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/prettier/package.json b/.yarn/sdks/prettier/package.json index 8fb580474c5..1e1d12a3b75 100644 --- a/.yarn/sdks/prettier/package.json +++ b/.yarn/sdks/prettier/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "2.5.1-sdk", + "version": "2.6.0-sdk", "main": "./index.js", "type": "commonjs" } diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js index a82ef796d81..830ad9f2c39 100644 --- a/.yarn/sdks/typescript/lib/tsserver.js +++ b/.yarn/sdks/typescript/lib/tsserver.js @@ -61,18 +61,26 @@ const moduleWrapper = tsserver => { // // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910 // - // Update Oct 8 2021: VSCode changed their format in 1.61. + // Update 2021-10-08: VSCode changed their format in 1.61. // Before | ^zip:/c:/foo/bar.zip/package.json // After | ^/zip//c:/foo/bar.zip/package.json // + // Update 2022-04-06: VSCode changed the format in 1.66. + // Before | ^/zip//c:/foo/bar.zip/package.json + // After | ^/zip/c:/foo/bar.zip/package.json + // case `vscode <1.61`: { str = `^zip:${str}`; } break; - case `vscode`: { + case `vscode <1.66`: { str = `^/zip/${str}`; } break; + case `vscode`: { + str = `^/zip${str}`; + } break; + // To make "go to definition" work, // We have to resolve the actual file system path from virtual path // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip) @@ -160,8 +168,12 @@ const moduleWrapper = tsserver => { typeof parsedMessage.arguments.hostInfo === `string` ) { hostInfo = parsedMessage.arguments.hostInfo; - if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) { - hostInfo += ` <1.61`; + if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) { + if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) { + hostInfo += ` <1.61`; + } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) { + hostInfo += ` <1.66`; + } } } diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js index 0d70146a5f9..0f7084cdf40 100644 --- a/.yarn/sdks/typescript/lib/tsserverlibrary.js +++ b/.yarn/sdks/typescript/lib/tsserverlibrary.js @@ -61,18 +61,26 @@ const moduleWrapper = tsserver => { // // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910 // - // Update Oct 8 2021: VSCode changed their format in 1.61. + // Update 2021-10-08: VSCode changed their format in 1.61. // Before | ^zip:/c:/foo/bar.zip/package.json // After | ^/zip//c:/foo/bar.zip/package.json // + // Update 2022-04-06: VSCode changed the format in 1.66. + // Before | ^/zip//c:/foo/bar.zip/package.json + // After | ^/zip/c:/foo/bar.zip/package.json + // case `vscode <1.61`: { str = `^zip:${str}`; } break; - case `vscode`: { + case `vscode <1.66`: { str = `^/zip/${str}`; } break; + case `vscode`: { + str = `^/zip${str}`; + } break; + // To make "go to definition" work, // We have to resolve the actual file system path from virtual path // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip) @@ -160,8 +168,12 @@ const moduleWrapper = tsserver => { typeof parsedMessage.arguments.hostInfo === `string` ) { hostInfo = parsedMessage.arguments.hostInfo; - if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) { - hostInfo += ` <1.61`; + if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) { + if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) { + hostInfo += ` <1.61`; + } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) { + hostInfo += ` <1.66`; + } } } diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json index 03b3aa3d057..b23cc3d477a 100644 --- a/.yarn/sdks/typescript/package.json +++ b/.yarn/sdks/typescript/package.json @@ -1,6 +1,6 @@ { "name": "typescript", - "version": "4.4.4-sdk", + "version": "4.6.4-sdk", "main": "./lib/typescript.js", "type": "commonjs" } diff --git a/package.json b/package.json index d2ad83020e3..b23790b0d99 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "ts-jest": "27.1.3", "ts-loader": "9.2.6", "ts-node": "10.7.0", - "typescript": "4.4.4", + "typescript": "4.6.4", "wait-on": "6.0.1", "webpack": "5.72.0", "webpack-bundle-analyzer": "4.5.0", @@ -386,7 +386,7 @@ "test": "link:./public/test", "tether-drop": "https://github.com/torkelo/drop", "tinycolor2": "1.4.2", - "tslib": "2.3.1", + "tslib": "2.4.0", "uplot": "1.6.20", "uuid": "8.3.2", "vendor": "link:./public/vendor", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 0c27fdb2d8a..55060930892 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -37,7 +37,7 @@ "react-dom": "17.0.2", "regenerator-runtime": "0.13.9", "rxjs": "7.5.5", - "tslib": "2.3.1", + "tslib": "2.4.0", "uplot": "1.6.20", "xss": "1.0.11" }, @@ -73,6 +73,6 @@ "rollup-plugin-terser": "7.0.2", "sinon": "13.0.1", "tinycolor2": "1.4.2", - "typescript": "4.4.4" + "typescript": "4.6.4" } } diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index d3897524868..fe807799289 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -35,7 +35,7 @@ "types": "src/index.ts", "dependencies": { "@grafana/tsconfig": "^1.2.0-rc1", - "tslib": "2.3.1", - "typescript": "4.4.4" + "tslib": "2.4.0", + "typescript": "4.6.4" } } diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index 2df6a77c89f..69815386966 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -65,8 +65,8 @@ "rimraf": "3.0.2", "tracelib": "1.0.1", "ts-loader": "6.2.1", - "tslib": "2.3.1", - "typescript": "4.4.4", + "tslib": "2.4.0", + "typescript": "4.6.4", "uuid": "8.3.2", "yaml": "^1.8.3" } diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index b26cf730416..28d0039cd57 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -32,7 +32,7 @@ "react-dom": "17.0.2", "rxjs": "7.5.5", "systemjs": "0.20.19", - "tslib": "2.3.1" + "tslib": "2.4.0" }, "devDependencies": { "@grafana/tsconfig": "^1.2.0-rc1", @@ -53,7 +53,7 @@ "rollup": "2.70.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "typescript": "4.4.4" + "typescript": "4.6.4" }, "types": "src/index.ts" } diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index 917785c200e..a552ebd1b89 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -31,9 +31,9 @@ "rollup": "2.70.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "typescript": "4.4.4" + "typescript": "4.6.4" }, "dependencies": { - "tslib": "2.3.1" + "tslib": "2.4.0" } } diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 276107db1f7..d0888482471 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -99,8 +99,8 @@ "ts-jest": "26.4.4", "ts-loader": "6.2.1", "ts-node": "9.0.0", - "tslib": "2.3.1", - "typescript": "4.4.3", + "tslib": "2.4.0", + "typescript": "4.6.4", "url-loader": "^2.0.1", "webpack": "4.41.5" } diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index fb98113d0b7..eb512c2816f 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -89,7 +89,7 @@ "slate": "0.47.8", "slate-plain-serializer": "0.7.10", "tinycolor2": "1.4.2", - "tslib": "2.3.1", + "tslib": "2.4.0", "uplot": "1.6.20", "uuid": "8.3.2" }, @@ -174,7 +174,7 @@ "style-loader": "3.3.1", "terser-webpack-plugin": "5.3.1", "ts-loader": "8.0.11", - "typescript": "4.4.4", + "typescript": "4.6.4", "webpack": "5.72.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 2baa2101721..53801abbd0c 100644 --- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx +++ b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx @@ -239,7 +239,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 1ede766e773..96bef0d2d30 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -22,7 +22,7 @@ "@types/tinycolor2": "1.4.3", "enzyme": "3.11.0", "sinon": "13.0.1", - "typescript": "4.4.4" + "typescript": "4.6.4" }, "dependencies": { "@emotion/css": "11.7.1", @@ -47,7 +47,7 @@ "react-icons": "2.2.7", "reselect": "4.1.5", "tinycolor2": "1.4.2", - "tslib": "2.3.1", + "tslib": "2.4.0", "tween-functions": "^1.2.0" } } diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json index df76caba401..6c0b9f5fe15 100644 --- a/plugins-bundled/internal/input-datasource/package.json +++ b/plugins-bundled/internal/input-datasource/package.json @@ -32,6 +32,6 @@ "react-dom": "17.0.1", "react-hook-form": "7.5.3", "react-router-dom": "^5.2.0", - "tslib": "2.3.1" + "tslib": "2.4.0" } } diff --git a/yarn.lock b/yarn.lock index 17f19e088d4..666d5cd8890 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4328,7 +4328,7 @@ __metadata: react-hook-form: 7.5.3 react-router-dom: ^5.2.0 ts-loader: 8.0.11 - tslib: 2.3.1 + tslib: 2.4.0 webpack: 5.58.1 languageName: unknown linkType: soft @@ -4408,8 +4408,8 @@ __metadata: rxjs: 7.5.5 sinon: 13.0.1 tinycolor2: 1.4.2 - tslib: 2.3.1 - typescript: 4.4.4 + tslib: 2.4.0 + typescript: 4.6.4 uplot: 1.6.20 xss: 1.0.11 languageName: unknown @@ -4427,8 +4427,8 @@ __metadata: rollup: 2.70.1 rollup-plugin-sourcemaps: 0.6.3 rollup-plugin-terser: 7.0.2 - tslib: 2.3.1 - typescript: 4.4.4 + tslib: 2.4.0 + typescript: 4.6.4 languageName: unknown linkType: soft @@ -4466,8 +4466,8 @@ __metadata: rollup-plugin-terser: 7.0.2 tracelib: 1.0.1 ts-loader: 6.2.1 - tslib: 2.3.1 - typescript: 4.4.4 + tslib: 2.4.0 + typescript: 4.6.4 uuid: 8.3.2 webpack: 5.72.0 yaml: ^1.8.3 @@ -4573,8 +4573,8 @@ __metadata: rollup-plugin-terser: 7.0.2 rxjs: 7.5.5 systemjs: 0.20.19 - tslib: 2.3.1 - typescript: 4.4.4 + tslib: 2.4.0 + typescript: 4.6.4 languageName: unknown linkType: soft @@ -4591,8 +4591,8 @@ __metadata: rollup: 2.70.1 rollup-plugin-sourcemaps: 0.6.3 rollup-plugin-terser: 7.0.2 - tslib: 2.3.1 - typescript: 4.4.4 + tslib: 2.4.0 + typescript: 4.6.4 languageName: unknown linkType: soft @@ -4702,8 +4702,8 @@ __metadata: ts-jest: 26.4.4 ts-loader: 6.2.1 ts-node: 9.0.0 - tslib: 2.3.1 - typescript: 4.4.3 + tslib: 2.4.0 + typescript: 4.6.4 url-loader: ^2.0.1 webpack: 4.41.5 bin: @@ -4861,8 +4861,8 @@ __metadata: terser-webpack-plugin: 5.3.1 tinycolor2: 1.4.2 ts-loader: 8.0.11 - tslib: 2.3.1 - typescript: 4.4.4 + tslib: 2.4.0 + typescript: 4.6.4 uplot: 1.6.20 uuid: 8.3.2 webpack: 5.72.0 @@ -4998,9 +4998,9 @@ __metadata: reselect: 4.1.5 sinon: 13.0.1 tinycolor2: 1.4.2 - tslib: 2.3.1 + tslib: 2.4.0 tween-functions: ^1.2.0 - typescript: 4.4.4 + typescript: 4.6.4 languageName: unknown linkType: soft @@ -21330,8 +21330,8 @@ __metadata: ts-jest: 27.1.3 ts-loader: 9.2.6 ts-node: 10.7.0 - tslib: 2.3.1 - typescript: 4.4.4 + tslib: 2.4.0 + typescript: 4.6.4 uplot: 1.6.20 uuid: 8.3.2 vendor: "link:./public/vendor" @@ -36297,10 +36297,10 @@ __metadata: languageName: node linkType: hard -"tslib@npm:2.3.1, tslib@npm:^2, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1": - version: 2.3.1 - resolution: "tslib@npm:2.3.1" - checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9 +"tslib@npm:2.4.0": + version: 2.4.0 + resolution: "tslib@npm:2.4.0" + checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113 languageName: node linkType: hard @@ -36311,6 +36311,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:^2, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1": + version: 2.3.1 + resolution: "tslib@npm:2.3.1" + checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9 + languageName: node + linkType: hard + "tslib@npm:~2.1.0": version: 2.1.0 resolution: "tslib@npm:2.1.0" @@ -36494,23 +36501,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.4.3": - version: 4.4.3 - resolution: "typescript@npm:4.4.3" +"typescript@npm:4.4.4": + version: 4.4.4 + resolution: "typescript@npm:4.4.4" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 05823f21796d450531a7e4ab299715d38fd9ded0e4ce7400876053f4b5166ca3dde7a68cecfe72d9086039f03c0b6edba36516fb10ed83c5837d9600532ea4c2 + checksum: 89ecb8436bb48ef5594d49289f5f89103071716b6e4844278f4fb3362856e31203e187a9c76d205c3f0b674d221a058fd28310dbcbcf5d95e9a57229bb5203f1 languageName: node linkType: hard -"typescript@npm:4.4.4": - version: 4.4.4 - resolution: "typescript@npm:4.4.4" +"typescript@npm:4.6.4": + version: 4.6.4 + resolution: "typescript@npm:4.6.4" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 89ecb8436bb48ef5594d49289f5f89103071716b6e4844278f4fb3362856e31203e187a9c76d205c3f0b674d221a058fd28310dbcbcf5d95e9a57229bb5203f1 + checksum: e7bfcc39cd4571a63a54e5ea21f16b8445268b9900bf55aee0e02ad981be576acc140eba24f1af5e3c1457767c96cea6d12861768fb386cf3ffb34013718631a languageName: node linkType: hard @@ -36534,23 +36541,23 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@4.4.3#~builtin": - version: 4.4.3 - resolution: "typescript@patch:typescript@npm%3A4.4.3#~builtin::version=4.4.3&hash=bda367" +"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=bda367" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 33a916819907e819430802c50405f18c187448d678696a81545f494a7ec16207f8c15340c945df62109bd1d951091a9f15f3d2eb931a3c889f962c8509017697 + checksum: 3d1b04449662193544b81d055479d03b4c5dca95f1a82f8922596f089d894c9fefbe16639d1d9dfe26a7054419645530cef44001bc17aed1fe1eb3c237e9b3c7 languageName: node linkType: hard -"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=bda367" +"typescript@patch:typescript@4.6.4#~builtin": + version: 4.6.4 + resolution: "typescript@patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=bda367" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 3d1b04449662193544b81d055479d03b4c5dca95f1a82f8922596f089d894c9fefbe16639d1d9dfe26a7054419645530cef44001bc17aed1fe1eb3c237e9b3c7 + checksum: 1cb434fbc637d347be90e3a0c6cd05e33c38f941713c8786d3031faf1842c2c148ba91d2fac01e7276b0ae3249b8633f1660e32686cc7a8c6a8fd5361dc52c66 languageName: node linkType: hard