apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Chore: Set tsconfig target to ES6 (#44842)

Browse Source 
* 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 <marcus.andersson@grafana.com>
pull/45240/head
Jack Westbrook 3 years ago committed by GitHub
parent 57ecabf319
commit 979907e9dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 42 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 2
      packages/grafana-data/package.json
  3. 2
      packages/grafana-e2e-selectors/package.json
  4. 2
      packages/grafana-e2e/package.json
  5. 2
      packages/grafana-runtime/package.json
  6. 2
      packages/grafana-schema/package.json
  7. 2
      packages/grafana-toolkit/package.json
  8. 2
      packages/grafana-ui/package.json
  9. 2
      packages/jaeger-ui-components/package.json
  10. 9
      public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts
  11. 2
      public/app/plugins/datasource/opentsdb/specs/query_ctrl.test.ts
  12. 12
      public/app/plugins/panel/graph/specs/graph.test.ts
  13. 33
      yarn.lock

2
package.json
Unescape View File

@ -87,7 +87,7 @@
"@grafana/e2e": "workspace:*", "@grafana/e2e": "workspace:*",
"@grafana/eslint-config": "2.5.2", "@grafana/eslint-config": "2.5.2",
"@grafana/toolkit": "workspace:*", "@grafana/toolkit": "workspace:*",
"@grafana/tsconfig": "^1.1.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@lingui/cli": "3.13.2", "@lingui/cli": "3.13.2",
"@lingui/macro": "3.13.2", "@lingui/macro": "3.13.2",
"@microsoft/api-extractor": "7.19.4", "@microsoft/api-extractor": "7.19.4",

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

@ -42,7 +42,7 @@
"xss": "1.0.10" "xss": "1.0.10"
}, },
"devDependencies": { "devDependencies": {
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-commonjs": "21.0.1",
"@rollup/plugin-json": "4.1.0", "@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.1.3", "@rollup/plugin-node-resolve": "13.1.3",

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

@ -34,7 +34,7 @@
}, },
"types": "src/index.ts", "types": "src/index.ts",
"dependencies": { "dependencies": {
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"tslib": "2.3.1", "tslib": "2.3.1",
"typescript": "4.4.4" "typescript": "4.4.4"
} }

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

@ -49,7 +49,7 @@
"@babel/preset-env": "7.16.11", "@babel/preset-env": "7.16.11",
"@cypress/webpack-preprocessor": "5.11.0", "@cypress/webpack-preprocessor": "5.11.0",
"@grafana/e2e-selectors": "8.5.0-pre", "@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", "@mochajs/json-file-reporter": "^1.2.0",
"babel-loader": "8.2.3", "babel-loader": "8.2.3",
"blink-diff": "1.0.13", "blink-diff": "1.0.13",

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

@ -35,7 +35,7 @@
"tslib": "2.3.1" "tslib": "2.3.1"
}, },
"devDependencies": { "devDependencies": {
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-commonjs": "21.0.1",
"@rollup/plugin-node-resolve": "13.1.3", "@rollup/plugin-node-resolve": "13.1.3",
"@testing-library/dom": "8.11.3", "@testing-library/dom": "8.11.3",

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

@ -22,7 +22,7 @@
"typecheck": "tsc --noEmit" "typecheck": "tsc --noEmit"
}, },
"devDependencies": { "devDependencies": {
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-commonjs": "21.0.1",
"@rollup/plugin-json": "4.1.0", "@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.1.3", "@rollup/plugin-node-resolve": "13.1.3",

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

@ -30,7 +30,7 @@
"@babel/preset-env": "7.13.12", "@babel/preset-env": "7.13.12",
"@grafana/data": "8.5.0-pre", "@grafana/data": "8.5.0-pre",
"@grafana/eslint-config": "2.5.2", "@grafana/eslint-config": "2.5.2",
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@grafana/ui": "8.5.0-pre", "@grafana/ui": "8.5.0-pre",
"@jest/core": "26.6.3", "@jest/core": "26.6.3",
"@rushstack/eslint-patch": "1.0.6", "@rushstack/eslint-patch": "1.0.6",

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

@ -95,7 +95,7 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.17.0", "@babel/core": "7.17.0",
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@mdx-js/react": "1.6.22", "@mdx-js/react": "1.6.22",
"@rollup/plugin-commonjs": "21.0.1", "@rollup/plugin-commonjs": "21.0.1",
"@rollup/plugin-image": "2.1.1", "@rollup/plugin-image": "2.1.1",

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

@ -9,7 +9,7 @@
"typecheck": "tsc --noEmit" "typecheck": "tsc --noEmit"
}, },
"devDependencies": { "devDependencies": {
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@types/classnames": "^2.2.7", "@types/classnames": "^2.2.7",
"@types/deep-freeze": "^0.1.1", "@types/deep-freeze": "^0.1.1",
"@types/grafana__slate-react": "npm:@types/slate-react@0.22.5", "@types/grafana__slate-react": "npm:@types/slate-react@0.22.5",

9
public/app/features/query/state/DashboardQueryRunner/DashboardQueryRunner.test.ts
Unescape View File

@ -1,5 +1,5 @@
import { throwError } from 'rxjs'; import { throwError } from 'rxjs';
import { delay } from 'rxjs/operators'; import { delay, first } from 'rxjs/operators';
import { setDataSourceSrv } from '@grafana/runtime'; import { setDataSourceSrv } from '@grafana/runtime';
import { AlertState, AlertStateInfo } from '@grafana/data'; import { AlertState, AlertStateInfo } from '@grafana/data';
@ -60,14 +60,15 @@ function expectOnResults(args: {
expect: (results: DashboardQueryRunnerResult) => void; expect: (results: DashboardQueryRunnerResult) => void;
}) { }) {
const { runner, done, panelId, expect: expectCallback } = args; const { runner, done, panelId, expect: expectCallback } = args;
const subscription = runner.getResult(panelId).subscribe({ runner
.getResult(panelId)
.pipe(first())
.subscribe({
next: (value) => { next: (value) => {
try { try {
expectCallback(value); expectCallback(value);
subscription?.unsubscribe();
done(); done();
} catch (err) { } catch (err) {
subscription?.unsubscribe();
done.fail(err); done.fail(err);
} }
}, },

2
public/app/plugins/datasource/opentsdb/specs/query_ctrl.test.ts
Unescape View File

@ -17,7 +17,7 @@ describe('OpenTsQueryCtrl', () => {
refresh: () => {}, refresh: () => {},
}; };
OpenTsQueryCtrl.prototype = Object.assign(OpenTsQueryCtrl.prototype, ctx); Object.assign(OpenTsQueryCtrl.prototype, ctx);
beforeEach(() => { beforeEach(() => {
ctx.ctrl = new OpenTsQueryCtrl({}, {} as any); ctx.ctrl = new OpenTsQueryCtrl({}, {} as any);

12
public/app/plugins/panel/graph/specs/graph.test.ts
Unescape View File

@ -10,11 +10,9 @@ import { dateTime, EventBusSrv } from '@grafana/data';
import { DashboardModel } from '../../../../features/dashboard/state'; import { DashboardModel } from '../../../../features/dashboard/state';
jest.mock('../event_manager', () => ({ jest.mock('../event_manager', () => ({
EventManager: () => { EventManager: class EventManagerMock {
return { on() {}
on: () => {}, addFlotEvents() {}
addFlotEvents: () => {},
};
}, },
})); }));
@ -47,7 +45,7 @@ describe('grafanaGraph', () => {
lightTheme: false, lightTheme: false,
}, },
}; };
GraphCtrl.prototype = { Object.assign(GraphCtrl.prototype, {
...MetricsPanelCtrl.prototype, ...MetricsPanelCtrl.prototype,
...PanelCtrl.prototype, ...PanelCtrl.prototype,
...GraphCtrl.prototype, ...GraphCtrl.prototype,
@ -96,7 +94,7 @@ describe('grafanaGraph', () => {
annotationsSrv: { annotationsSrv: {
getAnnotations: () => Promise.resolve({}), getAnnotations: () => Promise.resolve({}),
}, },
} as any; }) as any;
ctx.data = []; ctx.data = [];
ctx.data.push( ctx.data.push(

33
yarn.lock
Unescape View File

@ -3970,7 +3970,7 @@ __metadata:
dependencies: dependencies:
"@braintree/sanitize-url": 5.0.2 "@braintree/sanitize-url": 5.0.2
"@grafana/schema": 8.5.0-pre "@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-commonjs": 21.0.1
"@rollup/plugin-json": 4.1.0 "@rollup/plugin-json": 4.1.0
"@rollup/plugin-node-resolve": 13.1.3 "@rollup/plugin-node-resolve": 13.1.3
@ -4025,7 +4025,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors" resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
dependencies: dependencies:
"@grafana/tsconfig": ^1.0.0-rc1 "@grafana/tsconfig": ^1.2.0-rc1
"@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-commonjs": 21.0.1
"@rollup/plugin-node-resolve": 13.1.3 "@rollup/plugin-node-resolve": 13.1.3
"@types/node": 16.11.22 "@types/node": 16.11.22
@ -4046,7 +4046,7 @@ __metadata:
"@babel/preset-env": 7.16.11 "@babel/preset-env": 7.16.11
"@cypress/webpack-preprocessor": 5.11.0 "@cypress/webpack-preprocessor": 5.11.0
"@grafana/e2e-selectors": 8.5.0-pre "@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 "@mochajs/json-file-reporter": ^1.2.0
"@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-commonjs": 21.0.1
"@rollup/plugin-node-resolve": 13.1.3 "@rollup/plugin-node-resolve": 13.1.3
@ -4127,7 +4127,7 @@ __metadata:
dependencies: dependencies:
"@grafana/data": 8.5.0-pre "@grafana/data": 8.5.0-pre
"@grafana/e2e-selectors": 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 "@grafana/ui": 8.5.0-pre
"@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-commonjs": 21.0.1
"@rollup/plugin-node-resolve": 13.1.3 "@rollup/plugin-node-resolve": 13.1.3
@ -4161,7 +4161,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@grafana/schema@workspace:packages/grafana-schema" resolution: "@grafana/schema@workspace:packages/grafana-schema"
dependencies: dependencies:
"@grafana/tsconfig": ^1.0.0-rc1 "@grafana/tsconfig": ^1.2.0-rc1
"@rollup/plugin-commonjs": 21.0.1 "@rollup/plugin-commonjs": 21.0.1
"@rollup/plugin-json": 4.1.0 "@rollup/plugin-json": 4.1.0
"@rollup/plugin-node-resolve": 13.1.3 "@rollup/plugin-node-resolve": 13.1.3
@ -4212,7 +4212,7 @@ __metadata:
"@babel/preset-env": 7.13.12 "@babel/preset-env": 7.13.12
"@grafana/data": 8.5.0-pre "@grafana/data": 8.5.0-pre
"@grafana/eslint-config": 2.5.2 "@grafana/eslint-config": 2.5.2
"@grafana/tsconfig": ^1.0.0-rc1 "@grafana/tsconfig": ^1.2.0-rc1
"@grafana/ui": 8.5.0-pre "@grafana/ui": 8.5.0-pre
"@jest/core": 26.6.3 "@jest/core": 26.6.3
"@rushstack/eslint-patch": 1.0.6 "@rushstack/eslint-patch": 1.0.6
@ -4290,17 +4290,10 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@grafana/tsconfig@npm:^1.0.0-rc1": "@grafana/tsconfig@npm:^1.2.0-rc1":
version: 1.0.0-rc1 version: 1.2.0-rc1
resolution: "@grafana/tsconfig@npm:1.0.0-rc1" resolution: "@grafana/tsconfig@npm:1.2.0-rc1"
checksum: addb8b27fe2d1fb525c535a7eb38c8066a07638cb26cd4bc5b2e781ac542ba3dca3e82b87141218c44879894e37303e491e09a40c4bd25434b4554c51ce7f9e3 checksum: 621a400a762b97a33aade0c03eb8e7bdd1aa1635fab9eb2c03cd7cb7d80fb56e0fbdfc68b74a2abafacc623ad118e2ccaaf46164ee577b9c9c186a83a923d01d
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
languageName: node languageName: node
linkType: hard linkType: hard
@ -4316,7 +4309,7 @@ __metadata:
"@grafana/e2e-selectors": 8.5.0-pre "@grafana/e2e-selectors": 8.5.0-pre
"@grafana/schema": 8.5.0-pre "@grafana/schema": 8.5.0-pre
"@grafana/slate-react": 0.22.10-grafana "@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 "@mdx-js/react": 1.6.22
"@monaco-editor/react": 4.3.1 "@monaco-editor/react": 4.3.1
"@popperjs/core": 2.11.2 "@popperjs/core": 2.11.2
@ -4551,7 +4544,7 @@ __metadata:
dependencies: dependencies:
"@emotion/css": 11.7.1 "@emotion/css": 11.7.1
"@grafana/data": 8.5.0-pre "@grafana/data": 8.5.0-pre
"@grafana/tsconfig": ^1.0.0-rc1 "@grafana/tsconfig": ^1.2.0-rc1
"@grafana/ui": 8.5.0-pre "@grafana/ui": 8.5.0-pre
"@types/classnames": ^2.2.7 "@types/classnames": ^2.2.7
"@types/deep-freeze": ^0.1.1 "@types/deep-freeze": ^0.1.1
@ -20321,7 +20314,7 @@ __metadata:
"@grafana/schema": "workspace:*" "@grafana/schema": "workspace:*"
"@grafana/slate-react": 0.22.10-grafana "@grafana/slate-react": 0.22.10-grafana
"@grafana/toolkit": "workspace:*" "@grafana/toolkit": "workspace:*"
"@grafana/tsconfig": ^1.1.0-rc1 "@grafana/tsconfig": ^1.2.0-rc1
"@grafana/ui": "workspace:*" "@grafana/ui": "workspace:*"
"@jaegertracing/jaeger-ui-components": "workspace:*" "@jaegertracing/jaeger-ui-components": "workspace:*"
"@kusto/monaco-kusto": 4.1.3 "@kusto/monaco-kusto": 4.1.3

Write Preview
Loading…
Cancel
Save