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

Chore: Update typescript to 4.9.3 (#60538)

Browse Source 
* Update typescript to 4.9.3

* Update from typescript changes
This commit is contained in:
Josh Hunt 2022-12-21 10:25:29 +00:00 committed by GitHub
parent 0e1700bcd3
commit 51f5334748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.yarn/sdks/integrations.yml vendored
View File

@ -2,5 +2,5 @@
# Manual changes might be lost!
integrations:
- vim
- vscode
- vim

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

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

2
devenv/docker/loadtest-ts/package.json
View File

@ -15,7 +15,7 @@
"babel-loader": "9.1.0",
"shortid": "2.2.16",
"ts-node": "10.9.1",
"typescript": "4.8.4",
"typescript": "4.9.3",
"webpack": "5.74.0",
"webpack-cli": "4.10.0",
"webpack-glob-entries": "1.0.1"

2
package.json
View File

@ -230,7 +230,7 @@
"ts-jest": "29.0.3",
"ts-loader": "9.3.1",
"ts-node": "10.9.1",
"typescript": "4.8.4",
"typescript": "4.9.3",
"wait-on": "6.0.1",
"webpack": "5.74.0",
"webpack-bundle-analyzer": "4.7.0",

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

@ -89,7 +89,7 @@
"rollup-plugin-esbuild": "5.0.0",
"rollup-plugin-node-externals": "^5.0.0",
"sinon": "14.0.1",
"typescript": "4.8.4"
"typescript": "4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",

22
packages/grafana-data/src/themes/colorManipulator.ts
View File

@ -32,19 +32,23 @@ export function hexToRgb(color: string) {
color = color.slice(1);
const re = new RegExp(`.{1,${color.length >= 6 ? 2 : 1}}`, 'g');
let colors = color.match(re);
const result = color.match(re);
if (!result) {
return '';
}
let colors = Array.from(result);
if (colors && colors[0].length === 1) {
if (colors[0].length === 1) {
colors = colors.map((n) => n + n);
}
return colors
? `rgb${colors.length === 4 ? 'a' : ''}(${colors
.map((n, index) => {
return index < 3 ? parseInt(n, 16) : Math.round((parseInt(n, 16) / 255) * 1000) / 1000;
})
.join(', ')})`
: '';
const segments = colors
.map((n, index) => {
return index < 3 ? parseInt(n, 16) : Math.round((parseInt(n, 16) / 255) * 1000) / 1000;
})
.join(', ');
return `rgb${colors.length === 4 ? 'a' : ''}(${segments})`;
}
function intToHex(int: number) {

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

@ -52,6 +52,6 @@
"dependencies": {
"@grafana/tsconfig": "^1.2.0-rc1",
"tslib": "2.4.1",
"typescript": "4.8.4"
"typescript": "4.9.3"
}
}

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

@ -81,7 +81,7 @@
"tracelib": "1.0.1",
"ts-loader": "8.4.0",
"tslib": "2.4.1",
"typescript": "4.8.4",
"typescript": "4.9.3",
"uuid": "9.0.0",
"yaml": "^2.0.0"
}

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

@ -74,7 +74,7 @@
"rollup-plugin-node-externals": "^5.0.0",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2",
"typescript": "4.8.4"
"typescript": "4.9.3"
},
"peerDependencies": {
"react": "17.0.2",

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

@ -47,7 +47,7 @@
"rollup-plugin-dts": "^5.0.0",
"rollup-plugin-esbuild": "5.0.0",
"rollup-plugin-node-externals": "^5.0.0",
"typescript": "4.8.4"
"typescript": "4.9.3"
},
"dependencies": {
"tslib": "2.4.1"

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

@ -121,7 +121,7 @@
"ts-loader": "^9.3.1",
"ts-node": "^9.1.0",
"tslib": "2.4.0",
"typescript": "4.8.2",
"typescript": "4.9.3",
"webpack": "^5.72.0"
}
}

2
packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
View File

@ -40,7 +40,7 @@ const checkoutBranch = async (branchName: string): Promise<Command> => {
};
const gitUrlParse = (url: string): { owner: string; name: string } => {
let matchResult: RegExpMatchArray | null = [];
let matchResult: string[] | null = [];
if (url.match(/^git@github.com/)) {
// We have an ssh style url.

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

@ -190,7 +190,7 @@
"storybook-addon-turbo-build": "1.1.0",
"storybook-dark-mode": "2.0.4",
"style-loader": "3.3.1",
"typescript": "4.8.4",
"typescript": "4.9.3",
"webpack": "5.74.0"
},
"peerDependencies": {

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

@ -27,7 +27,7 @@
"@types/tinycolor2": "1.4.3",
"enzyme": "3.11.0",
"sinon": "14.0.1",
"typescript": "4.8.4"
"typescript": "4.9.3"
},
"dependencies": {
"@emotion/css": "11.10.5",

7
public/app/features/variables/adhoc/AdHocVariableEditor.test.tsx
View File

@ -38,12 +38,7 @@ jest.mock('@grafana/runtime/src/services/dataSourceSrv', () => {
});
const props = {
extended: {
dataSources: [
{ text: 'Prometheus', value: null }, // default datasource
{ text: 'Loki', value: { type: 'loki-ds', uid: 'abc' } },
],
},
extended: {},
variable: adHocBuilder().withId('adhoc').withRootStateKey('key').withName('adhoc').build(),
onPropChange: jest.fn(),

2
public/app/plugins/datasource/testdata/runStreams.ts vendored
View File

@ -188,7 +188,7 @@ export function runFetchStream(
data.refId = target.refId;
data.name = target.alias || 'Fetch ' + target.refId;
let reader: ReadableStreamReader<Uint8Array>;
let reader: ReadableStreamDefaultReader<Uint8Array>;
const csv = new CSVReader({
callback: {
onHeader: (fields: Field[]) => {

58
yarn.lock
View File

@ -4843,7 +4843,7 @@ __metadata:
sinon: 14.0.1
tinycolor2: 1.4.2
tslib: 2.4.1
typescript: 4.8.4
typescript: 4.9.3
uplot: 1.6.23
xss: 1.0.14
peerDependencies:
@ -4867,7 +4867,7 @@ __metadata:
rollup-plugin-esbuild: 5.0.0
rollup-plugin-node-externals: ^5.0.0
tslib: 2.4.1
typescript: 4.8.4
typescript: 4.9.3
languageName: unknown
linkType: soft
@ -4906,7 +4906,7 @@ __metadata:
tracelib: 1.0.1
ts-loader: 8.4.0
tslib: 2.4.1
typescript: 4.8.4
typescript: 4.9.3
uuid: 9.0.0
webpack: 5.74.0
yaml: ^2.0.0
@ -5051,7 +5051,7 @@ __metadata:
rxjs: 7.5.7
systemjs: 0.20.19
tslib: 2.4.1
typescript: 4.8.4
typescript: 4.9.3
peerDependencies:
react: 17.0.2
react-dom: 17.0.2
@ -5074,7 +5074,7 @@ __metadata:
rollup-plugin-esbuild: 5.0.0
rollup-plugin-node-externals: ^5.0.0
tslib: 2.4.1
typescript: 4.8.4
typescript: 4.9.3
languageName: unknown
linkType: soft
@ -5164,7 +5164,7 @@ __metadata:
ts-loader: ^9.3.1
ts-node: ^9.1.0
tslib: 2.4.0
typescript: 4.8.2
typescript: 4.9.3
webpack: ^5.72.0
bin:
grafana-toolkit: ./bin/grafana-toolkit.js
@ -5321,7 +5321,7 @@ __metadata:
style-loader: 3.3.1
tinycolor2: 1.4.2
tslib: 2.4.1
typescript: 4.8.4
typescript: 4.9.3
uplot: 1.6.23
uuid: 9.0.0
webpack: 5.74.0
@ -5502,7 +5502,7 @@ __metadata:
tinycolor2: 1.4.2
tslib: 2.4.1
tween-functions: ^1.2.0
typescript: 4.8.4
typescript: 4.9.3
languageName: unknown
linkType: soft
@ -22187,7 +22187,7 @@ __metadata:
ts-loader: 9.3.1
ts-node: 10.9.1
tslib: 2.4.1
typescript: 4.8.4
typescript: 4.9.3
uplot: 1.6.23
uuid: 9.0.0
vendor: "link:./public/vendor"
@ -37633,16 +37633,6 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:4.8.2":
version: 4.8.2
resolution: "typescript@npm:4.8.2"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 7f5b81d0d558c9067f952c7af52ab7f19c2e70a916817929e4a5b256c93990bf3178eccb1ac8a850bc75df35f6781b6f4cb3370ce20d8b1ded92ed462348f628
languageName: node
linkType: hard
"typescript@npm:4.8.4, typescript@npm:^3 || ^4":
version: 4.8.4
resolution: "typescript@npm:4.8.4"
@ -37653,6 +37643,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:4.9.3":
version: 4.9.3
resolution: "typescript@npm:4.9.3"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 17b8f816050b412403e38d48eef0e893deb6be522d6dc7caf105e54a72e34daf6835c447735fd2b28b66784e72bfbf87f627abb4818a8e43d1fa8106396128dc
languageName: node
linkType: hard
"typescript@npm:>=2.7":
version: 4.7.4
resolution: "typescript@npm:4.7.4"
@ -37683,16 +37683,6 @@ __metadata:
languageName: node
linkType: hard
"typescript@patch:typescript@4.8.2#~builtin<compat/typescript>":
version: 4.8.2
resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin<compat/typescript>::version=4.8.2&hash=aae4e6"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 5cb0f02f414f5405f4b0e7ee1fd7fa9177b6a8783c9017b6cad85f56ce4c4f93e0e6f2ce37e863cb597d44227cd009474c9fbd85bf7a50004e5557426cb58079
languageName: node
linkType: hard
"typescript@patch:typescript@4.8.4#~builtin<compat/typescript>, typescript@patch:typescript@^3 || ^4#~builtin<compat/typescript>":
version: 4.8.4
resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=0102e9"
@ -37703,6 +37693,16 @@ __metadata:
languageName: node
linkType: hard
"typescript@patch:typescript@4.9.3#~builtin<compat/typescript>":
version: 4.9.3
resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=d73830"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 67ca21a387c0572f1c04936e638dde7782c5aa520c3754aadc7cc9b7c915da9ebc3e27c601bfff4ccb7d7264e82dce6d277ada82ec09dc75024349e0ef64926d
languageName: node
linkType: hard
"typescript@patch:typescript@>=2.7#~builtin<compat/typescript>":
version: 4.7.4
resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=65a307"