diff --git a/package.json b/package.json index 8e53525d566..ac64f90fa16 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "@types/logfmt": "^1.2.1", "@types/lru-cache": "^5.1.0", "@types/mousetrap": "1.6.3", - "@types/node": "13.7.0", + "@types/node": "14.17.27", "@types/papaparse": "5.2.0", "@types/pluralize": "^0.0.29", "@types/prismjs": "1.16.0", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index fff69c9c6e0..b66359958f9 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -42,7 +42,7 @@ "@types/jquery": "3.3.38", "@types/lodash": "4.14.123", "@types/marked": "1.1.0", - "@types/node": "10.14.1", + "@types/node": "14.17.27", "@types/papaparse": "5.2.0", "@types/react": "17.0.30", "@types/rollup-plugin-visualizer": "4.2.1", diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 55a0992670b..2240d60ba10 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@rollup/plugin-commonjs": "16.0.0", "@rollup/plugin-node-resolve": "10.0.0", - "@types/node": "13.7.7", + "@types/node": "14.17.27", "@types/rollup-plugin-visualizer": "4.2.1", "@types/systemjs": "^0.20.6", "rollup": "2.33.3", diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index ac8b2e3ce1b..180dfad5559 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@rollup/plugin-commonjs": "16.0.0", "@rollup/plugin-node-resolve": "10.0.0", - "@types/node": "13.7.7", + "@types/node": "14.17.27", "@types/rollup-plugin-visualizer": "4.2.1", "date-fns": "2.21.3", "rollup": "2.33.3", diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 4dc0cf4f823..c262da91434 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -37,7 +37,7 @@ "@types/fs-extra": "^9.0.13", "@types/inquirer": "^6.0.3", "@types/jest": "26.0.15", - "@types/node": "^12.0.4", + "@types/node": "^14.0.0", "@types/prettier": "^2.4.0", "@types/react-dev-utils": "^9.0.4", "@types/rimraf": "^3.0.0", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 2d3025fec34..25b1c2ed97d 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -100,7 +100,7 @@ "@types/jquery": "3.3.38", "@types/lodash": "4.14.123", "@types/mock-raf": "1.0.2", - "@types/node": "10.14.1", + "@types/node": "14.17.27", "@types/papaparse": "5.2.0", "@types/react": "17.0.30", "@types/react-beautiful-dnd": "13.1.1", diff --git a/public/test/jest-shim.ts b/public/test/jest-shim.ts index 1343887f8b6..5b01becaaae 100644 --- a/public/test/jest-shim.ts +++ b/public/test/jest-shim.ts @@ -1,5 +1,3 @@ -declare var global: NodeJS.Global; - (global as any).requestAnimationFrame = (callback: any) => { setTimeout(callback, 0); }; diff --git a/yarn.lock b/yarn.lock index 8b24e22fe10..b1458067172 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2383,7 +2383,7 @@ __metadata: "@types/jquery": 3.3.38 "@types/lodash": 4.14.123 "@types/marked": 1.1.0 - "@types/node": 10.14.1 + "@types/node": 14.17.27 "@types/papaparse": 5.2.0 "@types/react": 17.0.30 "@types/rollup-plugin-visualizer": 4.2.1 @@ -2413,7 +2413,7 @@ __metadata: "@grafana/tsconfig": ^1.0.0-rc1 "@rollup/plugin-commonjs": 16.0.0 "@rollup/plugin-node-resolve": 10.0.0 - "@types/node": 13.7.7 + "@types/node": 14.17.27 "@types/rollup-plugin-visualizer": 4.2.1 "@types/systemjs": ^0.20.6 commander: 5.0.0 @@ -2440,7 +2440,7 @@ __metadata: "@mochajs/json-file-reporter": ^1.2.0 "@rollup/plugin-commonjs": 16.0.0 "@rollup/plugin-node-resolve": 10.0.0 - "@types/node": 13.7.7 + "@types/node": 14.17.27 "@types/rollup-plugin-visualizer": 4.2.1 blink-diff: 1.0.13 commander: 5.0.0 @@ -2573,7 +2573,7 @@ __metadata: "@types/fs-extra": ^9.0.13 "@types/inquirer": ^6.0.3 "@types/jest": 26.0.15 - "@types/node": ^12.0.4 + "@types/node": ^14.0.0 "@types/prettier": ^2.4.0 "@types/react-dev-utils": ^9.0.4 "@types/rimraf": ^3.0.0 @@ -2684,7 +2684,7 @@ __metadata: "@types/jquery": 3.3.38 "@types/lodash": 4.14.123 "@types/mock-raf": 1.0.2 - "@types/node": 10.14.1 + "@types/node": 14.17.27 "@types/papaparse": 5.2.0 "@types/react": 17.0.30 "@types/react-beautiful-dnd": 13.1.1 @@ -7767,13 +7767,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:10.14.1": - version: 10.14.1 - resolution: "@types/node@npm:10.14.1" - checksum: be0881716c81f6355035fe64fa16d6830e3f27f1e657738c46dd5605d6c4248681ceb64f8df738bf3e2107df608c4a057668dd618fa32e5697be3959fa056c4c - languageName: node - linkType: hard - "@types/node@npm:12.20.24": version: 12.20.24 resolution: "@types/node@npm:12.20.24" @@ -7781,24 +7774,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:13.7.0": - version: 13.7.0 - resolution: "@types/node@npm:13.7.0" - checksum: ccc4eb30fd225dfdbf15307704b4acdb34fe57b13ff0942b1122723fe27b218d8d30915d7ff61f63e58a8213304ec3bd58bbb9cb0bcf13e687e57f5b25af6ec6 - languageName: node - linkType: hard - -"@types/node@npm:13.7.7": - version: 13.7.7 - resolution: "@types/node@npm:13.7.7" - checksum: 834f382e965ddf6eb8aed11a949e48254cdcd7b29fa41e226c1b3d54f820e0e09cebb78db7ad20e6c18d688b7337b4376c6e08b598f49ac985ec6b07c524931a - languageName: node - linkType: hard - -"@types/node@npm:^12.0.4": - version: 12.20.28 - resolution: "@types/node@npm:12.20.28" - checksum: 09811db5eabb02062cc04ab887cf20dcae87e904ccbe4d1767ebd8c88ab31eeea9c62f6c94b16f52230a4e2f1ab0d8a411e3b3cb744c7d0e6fbc4fa5f0f25ba8 +"@types/node@npm:14.17.27, @types/node@npm:^14.0.0": + version: 14.17.27 + resolution: "@types/node@npm:14.17.27" + checksum: 4f7eeaa329f4b2b9ff4bb0bb4582ad92e328a4e66f62d5b96ac4e3b51210ed092bb56726c30643beb860f6df633a29e08ed94adad2d573c85b4794d0bf0bbc06 languageName: node linkType: hard @@ -17673,7 +17652,7 @@ fsevents@~2.1.2: "@types/logfmt": ^1.2.1 "@types/lru-cache": ^5.1.0 "@types/mousetrap": 1.6.3 - "@types/node": 13.7.0 + "@types/node": 14.17.27 "@types/ol": ^6.5.1 "@types/papaparse": 5.2.0 "@types/pluralize": ^0.0.29