IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade typescript to 4.6.4 (#49016)

Browse Source
This commit is contained in:
kay delaney 2022-05-17 12:08:10 +01:00 committed by GitHub
parent f252e89339
commit de3e981985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 103 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/renovate.json5 vendored
View File

@ -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/**"],

2
.yarn/sdks/prettier/package.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "2.5.1-sdk",
"version": "2.6.0-sdk",
"main": "./index.js",
"type": "commonjs"
}

20
.yarn/sdks/typescript/lib/tsserver.js vendored
View File

@ -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`;
}
}
}

20
.yarn/sdks/typescript/lib/tsserverlibrary.js vendored
View File

@ -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`;
}
}
}

2
.yarn/sdks/typescript/package.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "4.4.4-sdk",
"version": "4.6.4-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}

4
package.json
View File

@ -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",

4
packages/grafana-data/package.json
View File

@ -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"
}
}

4
packages/grafana-e2e-selectors/package.json
View File

@ -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"
}
}

4
packages/grafana-e2e/package.json
View File

@ -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"
}

4
packages/grafana-runtime/package.json
View File

@ -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"
}

4
packages/grafana-schema/package.json
View File

@ -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"
}
}

4
packages/grafana-toolkit/package.json
View File

@ -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"
}

4
packages/grafana-ui/package.json
View File

@ -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"
},

1
packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx
View File

@ -239,7 +239,6 @@ export class AsyncSelect<T> extends PureComponent<AsyncProps<T>> {
getOptionLabel={getOptionLabel}
getOptionValue={getOptionValue}
menuShouldScrollIntoView={false}
//@ts-expect-error
onChange={onChange}
loadOptions={loadOptions}
isLoading={isLoading}

4
packages/jaeger-ui-components/package.json
View File

@ -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"
}
}

2
plugins-bundled/internal/input-datasource/package.json
View File

@ -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"
}
}

93
yarn.lock
View File

@ -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,16 +36501,6 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:4.4.3":
version: 4.4.3
resolution: "typescript@npm:4.4.3"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 05823f21796d450531a7e4ab299715d38fd9ded0e4ce7400876053f4b5166ca3dde7a68cecfe72d9086039f03c0b6edba36516fb10ed83c5837d9600532ea4c2
languageName: node
linkType: hard
"typescript@npm:4.4.4":
version: 4.4.4
resolution: "typescript@npm:4.4.4"
@ -36514,6 +36511,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:4.6.4":
version: 4.6.4
resolution: "typescript@npm:4.6.4"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: e7bfcc39cd4571a63a54e5ea21f16b8445268b9900bf55aee0e02ad981be576acc140eba24f1af5e3c1457767c96cea6d12861768fb386cf3ffb34013718631a
languageName: node
linkType: hard
"typescript@npm:>=2.7":
version: 4.5.5
resolution: "typescript@npm:4.5.5"
@ -36534,16 +36541,6 @@ __metadata:
languageName: node
linkType: hard
"typescript@patch:typescript@4.4.3#~builtin<compat/typescript>":
version: 4.4.3
resolution: "typescript@patch:typescript@npm%3A4.4.3#~builtin<compat/typescript>::version=4.4.3&hash=bda367"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 33a916819907e819430802c50405f18c187448d678696a81545f494a7ec16207f8c15340c945df62109bd1d951091a9f15f3d2eb931a3c889f962c8509017697
languageName: node
linkType: hard
"typescript@patch:typescript@4.4.4#~builtin<compat/typescript>":
version: 4.4.4
resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=bda367"
@ -36554,6 +36551,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@patch:typescript@4.6.4#~builtin<compat/typescript>":
version: 4.6.4
resolution: "typescript@patch:typescript@npm%3A4.6.4#~builtin<compat/typescript>::version=4.6.4&hash=bda367"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 1cb434fbc637d347be90e3a0c6cd05e33c38f941713c8786d3031faf1842c2c148ba91d2fac01e7276b0ae3249b8633f1660e32686cc7a8c6a8fd5361dc52c66
languageName: node
linkType: hard
"typescript@patch:typescript@>=2.7#~builtin<compat/typescript>":
version: 4.5.5
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=bda367"