From 979907e9ddcd0b39d97c8ef36aa35b506d06d15c Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Thu, 10 Feb 2022 14:37:39 +0100 Subject: [PATCH] Chore: Set tsconfig target to ES6 (#44842) * chore(tsconfig): update grafana/tsconfig to 1.2.0 for outputting es6 * rewrote the unsubscription part to use first(). * test: update failing tests to work with es6 output * removed bug where we dispatch a promise instead of an array of ritch history. Co-authored-by: Marcus Andersson --- 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-toolkit/package.json | 2 +- packages/grafana-ui/package.json | 2 +- packages/jaeger-ui-components/package.json | 2 +- .../DashboardQueryRunner.test.ts | 27 +++++++-------- .../opentsdb/specs/query_ctrl.test.ts | 2 +- .../plugins/panel/graph/specs/graph.test.ts | 12 +++---- yarn.lock | 33 ++++++++----------- 13 files changed, 42 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index 0dc754d3e3d..dd43ae867c0 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "@grafana/e2e": "workspace:*", "@grafana/eslint-config": "2.5.2", "@grafana/toolkit": "workspace:*", - "@grafana/tsconfig": "^1.1.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@lingui/cli": "3.13.2", "@lingui/macro": "3.13.2", "@microsoft/api-extractor": "7.19.4", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 802d0ccd62c..c211247abac 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -42,7 +42,7 @@ "xss": "1.0.10" }, "devDependencies": { - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.1.3", diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 79eee7b2cc5..6a6bd64642e 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -34,7 +34,7 @@ }, "types": "src/index.ts", "dependencies": { - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "tslib": "2.3.1", "typescript": "4.4.4" } diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index 585a06c4c6c..0b574b21fd7 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -49,7 +49,7 @@ "@babel/preset-env": "7.16.11", "@cypress/webpack-preprocessor": "5.11.0", "@grafana/e2e-selectors": "8.5.0-pre", - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", "babel-loader": "8.2.3", "blink-diff": "1.0.13", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 5e52c1a8d2f..5d7b4315ec1 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -35,7 +35,7 @@ "tslib": "2.3.1" }, "devDependencies": { - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-node-resolve": "13.1.3", "@testing-library/dom": "8.11.3", diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index e42c7d55dcd..178defa6c1f 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -22,7 +22,7 @@ "typecheck": "tsc --noEmit" }, "devDependencies": { - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.1.3", diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 538e012ec23..46e3f49526a 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -30,7 +30,7 @@ "@babel/preset-env": "7.13.12", "@grafana/data": "8.5.0-pre", "@grafana/eslint-config": "2.5.2", - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@grafana/ui": "8.5.0-pre", "@jest/core": "26.6.3", "@rushstack/eslint-patch": "1.0.6", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index b1f5a9d6d6a..149fac977ac 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -95,7 +95,7 @@ }, "devDependencies": { "@babel/core": "7.17.0", - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@mdx-js/react": "1.6.22", "@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-image": "2.1.1", diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index f519fff869b..ce1308cecb6 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -9,7 +9,7 @@ "typecheck": "tsc --noEmit" }, "devDependencies": { - "@grafana/tsconfig": "^1.0.0-rc1", + "@grafana/tsconfig": "^1.2.0-rc1", "@types/classnames": "^2.2.7", "@types/deep-freeze": "^0.1.1", "@types/grafana__slate-react": "npm:@types/slate-react@0.22.5", diff --git a/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts b/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts index 92756edcc55..e68011186a4 100644 --- a/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts +++ b/public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts @@ -1,5 +1,5 @@ import { throwError } from 'rxjs'; -import { delay } from 'rxjs/operators'; +import { delay, first } from 'rxjs/operators'; import { setDataSourceSrv } from '@grafana/runtime'; import { AlertState, AlertStateInfo } from '@grafana/data'; @@ -60,18 +60,19 @@ function expectOnResults(args: { expect: (results: DashboardQueryRunnerResult) => void; }) { const { runner, done, panelId, expect: expectCallback } = args; - const subscription = runner.getResult(panelId).subscribe({ - next: (value) => { - try { - expectCallback(value); - subscription?.unsubscribe(); - done(); - } catch (err) { - subscription?.unsubscribe(); - done.fail(err); - } - }, - }); + runner + .getResult(panelId) + .pipe(first()) + .subscribe({ + next: (value) => { + try { + expectCallback(value); + done(); + } catch (err) { + done.fail(err); + } + }, + }); } describe('DashboardQueryRunnerImpl', () => { diff --git a/public/app/plugins/datasource/opentsdb/specs/query_ctrl.test.ts b/public/app/plugins/datasource/opentsdb/specs/query_ctrl.test.ts index e57447076f2..17d0d48f11d 100644 --- a/public/app/plugins/datasource/opentsdb/specs/query_ctrl.test.ts +++ b/public/app/plugins/datasource/opentsdb/specs/query_ctrl.test.ts @@ -17,7 +17,7 @@ describe('OpenTsQueryCtrl', () => { refresh: () => {}, }; - OpenTsQueryCtrl.prototype = Object.assign(OpenTsQueryCtrl.prototype, ctx); + Object.assign(OpenTsQueryCtrl.prototype, ctx); beforeEach(() => { ctx.ctrl = new OpenTsQueryCtrl({}, {} as any); diff --git a/public/app/plugins/panel/graph/specs/graph.test.ts b/public/app/plugins/panel/graph/specs/graph.test.ts index 105b1c47769..f29b64dad65 100644 --- a/public/app/plugins/panel/graph/specs/graph.test.ts +++ b/public/app/plugins/panel/graph/specs/graph.test.ts @@ -10,11 +10,9 @@ import { dateTime, EventBusSrv } from '@grafana/data'; import { DashboardModel } from '../../../../features/dashboard/state'; jest.mock('../event_manager', () => ({ - EventManager: () => { - return { - on: () => {}, - addFlotEvents: () => {}, - }; + EventManager: class EventManagerMock { + on() {} + addFlotEvents() {} }, })); @@ -47,7 +45,7 @@ describe('grafanaGraph', () => { lightTheme: false, }, }; - GraphCtrl.prototype = { + Object.assign(GraphCtrl.prototype, { ...MetricsPanelCtrl.prototype, ...PanelCtrl.prototype, ...GraphCtrl.prototype, @@ -96,7 +94,7 @@ describe('grafanaGraph', () => { annotationsSrv: { getAnnotations: () => Promise.resolve({}), }, - } as any; + }) as any; ctx.data = []; ctx.data.push( diff --git a/yarn.lock b/yarn.lock index bc6af7bd5a0..5d6994f7a34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3970,7 +3970,7 @@ __metadata: dependencies: "@braintree/sanitize-url": 5.0.2 "@grafana/schema": 8.5.0-pre - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-json": 4.1.0 "@rollup/plugin-node-resolve": 13.1.3 @@ -4025,7 +4025,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors" dependencies: - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-node-resolve": 13.1.3 "@types/node": 16.11.22 @@ -4046,7 +4046,7 @@ __metadata: "@babel/preset-env": 7.16.11 "@cypress/webpack-preprocessor": 5.11.0 "@grafana/e2e-selectors": 8.5.0-pre - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@mochajs/json-file-reporter": ^1.2.0 "@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-node-resolve": 13.1.3 @@ -4127,7 +4127,7 @@ __metadata: dependencies: "@grafana/data": 8.5.0-pre "@grafana/e2e-selectors": 8.5.0-pre - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@grafana/ui": 8.5.0-pre "@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-node-resolve": 13.1.3 @@ -4161,7 +4161,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana/schema@workspace:packages/grafana-schema" dependencies: - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-json": 4.1.0 "@rollup/plugin-node-resolve": 13.1.3 @@ -4212,7 +4212,7 @@ __metadata: "@babel/preset-env": 7.13.12 "@grafana/data": 8.5.0-pre "@grafana/eslint-config": 2.5.2 - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@grafana/ui": 8.5.0-pre "@jest/core": 26.6.3 "@rushstack/eslint-patch": 1.0.6 @@ -4290,17 +4290,10 @@ __metadata: languageName: unknown linkType: soft -"@grafana/tsconfig@npm:^1.0.0-rc1": - version: 1.0.0-rc1 - resolution: "@grafana/tsconfig@npm:1.0.0-rc1" - checksum: addb8b27fe2d1fb525c535a7eb38c8066a07638cb26cd4bc5b2e781ac542ba3dca3e82b87141218c44879894e37303e491e09a40c4bd25434b4554c51ce7f9e3 - languageName: node - linkType: hard - -"@grafana/tsconfig@npm:^1.1.0-rc1": - version: 1.1.0-rc1 - resolution: "@grafana/tsconfig@npm:1.1.0-rc1" - checksum: cc66393faffe4574d63c35a8516b53bab0025c320d89d3acd559647cf2ce81384bbcfb250837e588e39b1abefda7b279e2877cf18bae8ddb0dd6254d5e9688f2 +"@grafana/tsconfig@npm:^1.2.0-rc1": + version: 1.2.0-rc1 + resolution: "@grafana/tsconfig@npm:1.2.0-rc1" + checksum: 621a400a762b97a33aade0c03eb8e7bdd1aa1635fab9eb2c03cd7cb7d80fb56e0fbdfc68b74a2abafacc623ad118e2ccaaf46164ee577b9c9c186a83a923d01d languageName: node linkType: hard @@ -4316,7 +4309,7 @@ __metadata: "@grafana/e2e-selectors": 8.5.0-pre "@grafana/schema": 8.5.0-pre "@grafana/slate-react": 0.22.10-grafana - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@mdx-js/react": 1.6.22 "@monaco-editor/react": 4.3.1 "@popperjs/core": 2.11.2 @@ -4551,7 +4544,7 @@ __metadata: dependencies: "@emotion/css": 11.7.1 "@grafana/data": 8.5.0-pre - "@grafana/tsconfig": ^1.0.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@grafana/ui": 8.5.0-pre "@types/classnames": ^2.2.7 "@types/deep-freeze": ^0.1.1 @@ -20321,7 +20314,7 @@ __metadata: "@grafana/schema": "workspace:*" "@grafana/slate-react": 0.22.10-grafana "@grafana/toolkit": "workspace:*" - "@grafana/tsconfig": ^1.1.0-rc1 + "@grafana/tsconfig": ^1.2.0-rc1 "@grafana/ui": "workspace:*" "@jaegertracing/jaeger-ui-components": "workspace:*" "@kusto/monaco-kusto": 4.1.3