From 645467493df74d9569cd27d8ffd3da993ab5595c Mon Sep 17 00:00:00 2001 From: Mathieu Suen Date: Thu, 2 Dec 2021 14:23:51 +0100 Subject: [PATCH] SONAR-15743 Upgrade to emotion 11 --- server/sonar-web/package.json | 5 +- .../js/components/controls/GlobalMessages.tsx | 2 +- .../__tests__/GlobalMessages-test.tsx | 2 +- .../__snapshots__/BoxedTabs-test.tsx.snap | 7 + .../GlobalMessages-test.tsx.snap | 4 +- .../src/main/js/components/ui/Alert.tsx | 2 +- .../__snapshots__/Alert-test.tsx.snap | 2 +- server/sonar-web/yarn.lock | 379 ++++++++++-------- 8 files changed, 230 insertions(+), 173 deletions(-) diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json index 86ff408abfa..93e1af6f6d7 100644 --- a/server/sonar-web/package.json +++ b/server/sonar-web/package.json @@ -5,8 +5,8 @@ "repository": "SonarSource/sonarqube", "license": "LGPL-3.0", "dependencies": { - "@emotion/core": "10.0.28", - "@emotion/styled": "10.0.27", + "@emotion/react": "^11.7.0", + "@emotion/styled": "11.6.0", "classnames": "2.2.6", "clipboard": "2.0.6", "core-js": "3.6.4", @@ -60,6 +60,7 @@ "@babel/plugin-transform-react-jsx-source": "7.8.3", "@babel/preset-env": "7.9.0", "@babel/preset-react": "7.8.3", + "@emotion/jest": "^11.6.0", "@types/classnames": "2.2.10", "@types/clipboard": "2.0.1", "@types/d3-array": "1.2.4", diff --git a/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx b/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx index 5a68bf9d649..d44af072978 100644 --- a/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx +++ b/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { keyframes } from '@emotion/core'; +import { keyframes } from '@emotion/react'; import styled from '@emotion/styled'; import * as React from 'react'; import { colors, sizes, zIndexes } from '../../app/theme'; diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/GlobalMessages-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/GlobalMessages-test.tsx index a2a914febfa..186e28959a6 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/GlobalMessages-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/GlobalMessages-test.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { shallow } from 'enzyme'; -import { matchers } from 'jest-emotion'; +import { matchers } from '@emotion/jest'; import * as React from 'react'; import { colors } from '../../../app/theme'; import GlobalMessages, { GlobalMessagesProps } from '../GlobalMessages'; diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap b/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap index 22d8f761533..d0209f9ec9d 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap @@ -101,6 +101,7 @@ exports[`should render correctly 1`] = ` +
@@ -110,6 +111,7 @@ exports[`should render correctly 1`] = ` onClick={[Function]} type="button" > +