From 5b0fe1a50096600260239f7f1a0ab44b0ad6b0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 25 Feb 2021 16:16:32 +0100
Subject: [PATCH] GrafanaUI: Fixes typescript error for missing css prop
 (#31479)

---
 package.json                     |  2 +-
 packages/grafana-ui/package.json |  2 +-
 packages/grafana-ui/src/index.ts |  3 +++
 yarn.lock                        | 12 ------------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index b271246952c..6c6f9f9bc11 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
     "@babel/preset-env": "7.8.4",
     "@babel/preset-react": "7.8.3",
     "@babel/preset-typescript": "7.8.3",
-    "@emotion/core": "10.0.27",
     "@grafana/api-documenter": "7.11.2",
     "@grafana/api-extractor": "7.10.1",
     "@grafana/eslint-config": "2.2.1",
@@ -200,6 +199,7 @@
     "zone.js": "0.7.8"
   },
   "dependencies": {
+    "@emotion/core": "10.0.27",
     "@grafana/slate-react": "0.22.9-grafana",
     "@popperjs/core": "2.5.4",
     "@reduxjs/toolkit": "1.5.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index c38eeaec9db..19f3f88785a 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -26,7 +26,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@emotion/core": "^10.0.27",
+    "@emotion/core": "10.0.27",
     "@grafana/data": "7.5.0-pre.0",
     "@grafana/e2e-selectors": "7.5.0-pre.0",
     "@grafana/slate-react": "0.22.9-grafana",
diff --git a/packages/grafana-ui/src/index.ts b/packages/grafana-ui/src/index.ts
index bbaef99deb6..0ab360617a7 100644
--- a/packages/grafana-ui/src/index.ts
+++ b/packages/grafana-ui/src/index.ts
@@ -1,3 +1,6 @@
+// Needed for emotion types
+import '@emotion/core';
+
 /**
  * A library containing the different design components of the Grafana ecosystem.
  *
diff --git a/yarn.lock b/yarn.lock
index b4acf0f614e..25920bdd548 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3136,18 +3136,6 @@
     "@emotion/sheet" "0.9.4"
     "@emotion/utils" "0.11.3"
 
-"@emotion/core@^10.0.27":
-  version "10.0.28"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.28.tgz#bb65af7262a234593a9e952c041d0f1c9b9bef3d"
-  integrity sha512-pH8UueKYO5jgg0Iq+AmCLxBsvuGtvlmiDCOuv8fGNYn3cowFpLN98L8zO56U0H1PjDIyAlXymgL3Wu7u7v6hbA==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    "@emotion/cache" "^10.0.27"
-    "@emotion/css" "^10.0.27"
-    "@emotion/serialize" "^0.11.15"
-    "@emotion/sheet" "0.9.4"
-    "@emotion/utils" "0.11.3"
-
 "@emotion/core@^10.0.9":
   version "10.0.21"
   resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.21.tgz#2e8398d2b92fd90d4ed6ac4d0b66214971de3458"