From 4be2657ba95a80b6407e7ec93906ad5de75e349e Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Sat, 2 Mar 2019 21:00:28 +0100
Subject: [PATCH] FIX circular dep

---
 .babelrc.js                  | 4 ++--
 app/angular/tsconfig.json    | 2 +-
 lib/theming/src/animation.ts | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.babelrc.js b/.babelrc.js
index cd09f8fea3e7..91bbb47f6752 100644
--- a/.babelrc.js
+++ b/.babelrc.js
@@ -12,7 +12,7 @@ module.exports = {
     '@babel/plugin-syntax-dynamic-import',
     ['@babel/plugin-proposal-object-rest-spread', { loose: true, useBuiltIns: true }],
     'babel-plugin-macros',
-    ['babel-plugin-emotion', { sourceMap: true, autoLabel: true }],
+    ['emotion', { sourceMap: true, autoLabel: true }],
   ],
   env: {
     test: {
@@ -65,7 +65,7 @@ module.exports = {
         ],
       ],
       plugins: [
-        'babel-plugin-emotion',
+        'emotion',
         'babel-plugin-macros',
         ['@babel/plugin-proposal-decorators', { legacy: true }],
         ['@babel/plugin-proposal-class-properties', { loose: true }],
diff --git a/app/angular/tsconfig.json b/app/angular/tsconfig.json
index 1ffe0ff1249e..43d967f45391 100644
--- a/app/angular/tsconfig.json
+++ b/app/angular/tsconfig.json
@@ -6,7 +6,7 @@
   "compileOnSave": false,
   "compilerOptions": {
     "rootDir": "./src",
-    "types": ["webpack-env"],
+    "types": ["webpack-env", "jest"],
     "outDir": "./dist",
     "resolveJsonModule": true
   }
diff --git a/lib/theming/src/animation.ts b/lib/theming/src/animation.ts
index bda09e7fd97b..c92be3f7cc97 100644
--- a/lib/theming/src/animation.ts
+++ b/lib/theming/src/animation.ts
@@ -1,5 +1,4 @@
 import { css, keyframes } from '@emotion/core';
-import { color } from './base';
 
 export const easing = {
   rubber: 'cubic-bezier(0.175, 0.885, 0.335, 1.05)',
@@ -34,7 +33,6 @@ const jiggle = keyframes`
 
 const inlineGlow = css`
   animation: ${glow} 1.5s ease-in-out infinite;
-  background: ${color.border};
   color: transparent;
   cursor: progress;
 `;