diff --git a/package.json b/package.json index e144e978095..48843eeca06 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "@types/slate": "0.47.1", "@types/slate-plain-serializer": "0.6.1", "@types/slate-react": "0.22.5", - "@types/testing-library__jest-dom": "^5.9.2", + "@types/testing-library__jest-dom": "5.9.5", "@types/testing-library__react-hooks": "^3.2.0", "@types/tinycolor2": "1.4.2", "@typescript-eslint/eslint-plugin": "4.0.1", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index a72437fc971..720b286c70e 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -27,8 +27,8 @@ "apache-arrow": "0.16.0", "eventemitter3": "4.0.7", "lodash": "4.17.19", - "rxjs": "6.6.3", "marked": "1.2.2", + "rxjs": "6.6.3", "xss": "1.0.6" }, "devDependencies": { @@ -37,11 +37,11 @@ "@rollup/plugin-json": "4.0.3", "@rollup/plugin-node-resolve": "7.1.1", "@types/braintree__sanitize-url": "4.0.0", - "@types/jest": "23.3.14", + "@types/jest": "26.0.0", "@types/jquery": "3.3.38", "@types/lodash": "4.14.123", - "@types/node": "10.14.1", "@types/marked": "1.1.0", + "@types/node": "10.14.1", "@types/papaparse": "5.2.0", "@types/react": "16.8.16", "@types/rollup-plugin-visualizer": "2.6.0", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 2d2cfbce43e..cd441ceb0ce 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -31,7 +31,7 @@ "@grafana/tsconfig": "^1.0.0-rc1", "@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-node-resolve": "7.1.1", - "@types/jest": "23.3.14", + "@types/jest": "26.0.0", "@types/rollup-plugin-visualizer": "2.6.0", "@types/systemjs": "^0.20.6", "lodash": "4.17.19", diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 7541bd1c59b..8f25f1b6f54 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -37,7 +37,7 @@ "@types/expect-puppeteer": "3.3.1", "@types/fs-extra": "^8.1.0", "@types/inquirer": "^6.0.3", - "@types/jest": "24.0.13", + "@types/jest": "26.0.0", "@types/node": "^12.0.4", "@types/prettier": "^1.16.4", "@types/puppeteer-core": "1.9.0", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 28cbe50b65e..c2e774ad268 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -86,7 +86,7 @@ "@types/classnames": "2.2.7", "@types/common-tags": "^1.8.0", "@types/d3": "5.7.2", - "@types/jest": "23.3.14", + "@types/jest": "26.0.0", "@types/jquery": "3.3.38", "@types/lodash": "4.14.123", "@types/node": "10.14.1", diff --git a/yarn.lock b/yarn.lock index 3019d212e38..121ab6f80cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6550,13 +6550,6 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest-diff@*": - version "24.3.0" - resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-24.3.0.tgz#29e237a3d954babfe6e23cc59b57ecd8ca8d858d" - integrity sha512-vx1CRDeDUwQ0Pc7v+hS61O1ETA81kD04IMEC0hS1kPyVtHDdZrokAvpF7MT9VI/fVSzicelUZNCepDvhRV1PeA== - dependencies: - jest-diff "*" - "@types/jest@*": version "26.0.15" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe" @@ -6565,18 +6558,6 @@ jest-diff "^26.0.0" pretty-format "^26.0.0" -"@types/jest@23.3.14": - version "23.3.14" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.14.tgz#37daaf78069e7948520474c87b80092ea912520a" - integrity sha512-Q5hTcfdudEL2yOmluA1zaSyPbzWPmJ3XfSWeP3RyoYvS9hnje1ZyagrZOuQ6+1nQC1Gw+7gap3pLNL3xL6UBug== - -"@types/jest@24.0.13": - version "24.0.13" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.13.tgz#10f50b64cb05fb02411fbba49e9042a3a11da3f9" - integrity sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww== - dependencies: - "@types/jest-diff" "*" - "@types/jest@26.0.0": version "26.0.0" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.0.tgz#a6d7573dffa9c68cbbdf38f2e0de26f159e11134" @@ -7138,20 +7119,13 @@ resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370" integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ== -"@types/testing-library__jest-dom@^5.9.1": +"@types/testing-library__jest-dom@5.9.5", "@types/testing-library__jest-dom@^5.9.1": version "5.9.5" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz#5bf25c91ad2d7b38f264b12275e5c92a66d849b0" integrity sha512-ggn3ws+yRbOHog9GxnXiEZ/35Mow6YtPZpd7Z5mKDeZS/o7zx3yAle0ov/wjhVB5QT4N2Dt+GNoGCdqkBGCajQ== dependencies: "@types/jest" "*" -"@types/testing-library__jest-dom@^5.9.2": - version "5.9.2" - resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.2.tgz#59e4771a1cf87d51e89a5cc8195cd3b647cba322" - integrity sha512-K7nUSpH/5i8i0NagTJ+uFUDRueDlnMNhJtMjMwTGPPSqyImbWC/hgKPDCKt6Phu2iMJg2kWqlax+Ucj2DKMwpA== - dependencies: - "@types/jest" "*" - "@types/testing-library__react-hooks@^3.0.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.1.0.tgz#04d174ce767fbcce3ccb5021d7f156e1b06008a9" @@ -9541,11 +9515,6 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-db@1.0.30000772: - version "1.0.30000772" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000772.tgz#51aae891768286eade4a3d8319ea76d6a01b512b" - integrity sha1-UarokXaChureSj2DGep21qAbUSs= - caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001093: version "1.0.30001104" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001104.tgz#4e3d5b3b1dd3c3529f10cb7f519c62ba3e579f5d" @@ -16463,16 +16432,6 @@ jest-date-mock@1.0.8: resolved "https://registry.yarnpkg.com/jest-date-mock/-/jest-date-mock-1.0.8.tgz#13468c0352c5a3614c6b356dbc6b88eb37d9e0b3" integrity sha512-0Lyp+z9xvuNmLbK+5N6FOhSiBeux05Lp5bbveFBmYo40Aggl2wwxFoIrZ+rOWC8nDNcLeBoDd2miQdEDSf3iQw== -jest-diff@*, jest-diff@^26.0.0: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" - integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== - dependencies: - chalk "^4.0.0" - diff-sequences "^26.6.2" - jest-get-type "^26.3.0" - pretty-format "^26.6.2" - jest-diff@^25.2.1, jest-diff@^25.5.0: version "25.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" @@ -16483,6 +16442,16 @@ jest-diff@^25.2.1, jest-diff@^25.5.0: jest-get-type "^25.2.6" pretty-format "^25.5.0" +jest-diff@^26.0.0: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== + dependencies: + chalk "^4.0.0" + diff-sequences "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + jest-diff@^26.5.2: version "26.5.2" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.2.tgz#8e26cb32dc598e8b8a1b9deff55316f8313c8053"