From 9eac9aefde431d427ffffb14cc1dde35ed0c4acd Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Thu, 17 Jun 2021 13:20:27 -0500
Subject: [PATCH] GraphNG: uPlot 1.6.13 (#35844)

---
 packages/grafana-ui/package.json                  |  2 +-
 .../components/uPlot/config/UPlotScaleBuilder.ts  |  2 +-
 public/test/jest-setup.ts                         | 15 +++++++++++++++
 yarn.lock                                         |  8 ++++----
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index f4a5a7bd31d..89f4603cc5f 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -72,7 +72,7 @@
     "react-transition-group": "4.4.1",
     "slate": "0.47.8",
     "tinycolor2": "1.4.1",
-    "uplot": "1.6.12"
+    "uplot": "1.6.13"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
index 9de444b9be5..1f7e5aee56b 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
@@ -64,7 +64,7 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
     const rangeFn = (u: uPlot, dataMin: number, dataMax: number, scaleKey: string) => {
       const scale = u.scales[scaleKey];
 
-      let minMax = [dataMin, dataMax];
+      let minMax: uPlot.Range.MinMax = [dataMin, dataMax];
 
       if (scale.distr === 1 || scale.distr === 2) {
         // @ts-ignore here we may use hardMin / hardMax to make sure any extra padding is computed from a more accurate delta
diff --git a/public/test/jest-setup.ts b/public/test/jest-setup.ts
index 88c2ab05fb7..70181239d87 100644
--- a/public/test/jest-setup.ts
+++ b/public/test/jest-setup.ts
@@ -6,6 +6,21 @@ import 'mutationobserver-shim';
 const global = window as any;
 global.$ = global.jQuery = $;
 
+// https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
+Object.defineProperty(global, 'matchMedia', {
+  writable: true,
+  value: jest.fn().mockImplementation((query) => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(), // deprecated
+    removeListener: jest.fn(), // deprecated
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});
+
 import '../vendor/flot/jquery.flot';
 import '../vendor/flot/jquery.flot.time';
 import angular from 'angular';
diff --git a/yarn.lock b/yarn.lock
index 8a9252f9e54..b944f3a48e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22152,10 +22152,10 @@ update-notifier@^2.5.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
-uplot@1.6.12:
-  version "1.6.12"
-  resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.12.tgz#a2741f224c3d3b4f4f25a53797c1687ddfef2989"
-  integrity sha512-afBjwy/9SM0E7w29Gen+wQ+UAe6ipiA2zE/s1dMCidMXQYvYkCpEgxLRkVA179/8eRJz+og2r7ZFS1HIzT75fQ==
+uplot@1.6.13:
+  version "1.6.13"
+  resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.13.tgz#21608f484792a837e7ff4610428881c1e2f2387f"
+  integrity sha512-O5NHrZwetCUMUrYMN2/OG6v0poPXtlb68XBCERHqvvePFJvFPIuJI/SxdyZOygKzh0pAjMTX0xz3S0msAsPX0w==
 
 upper-case@^1.1.1:
   version "1.1.3"