Merge branch 'master' into chore/vuln-deps-google-analytics

contentful · Sep 27, 2024 · 230abd0 · 230abd0
2 parents 3711911 + 065dea2
commit 230abd0
Show file tree

Hide file tree

Showing 15 changed files with 212 additions and 190 deletions.
diff --git a/apps/microsoft-teams/frontend/package-lock.json b/apps/microsoft-teams/frontend/package-lock.json
diff --git a/apps/microsoft-teams/frontend/package.json b/apps/microsoft-teams/frontend/package.json
@@ -11,8 +11,8 @@
     "@contentful/f36-tokens": "4.0.5",
     "@contentful/integration-frontend-toolkit": "^1.5.1",
     "@contentful/react-apps-toolkit": "1.2.16",
+    "@emotion/css": "^11.13.0",
     "contentful-management": "10.38.3",
-    "emotion": "10.0.27",
     "fuse.js": "^7.0.0",
     "lodash": "^4.17.21",
     "react": "18.2.0",

diff --git a/apps/microsoft-teams/frontend/src/components/config/AccessSection/AccessSection.styles.ts b/apps/microsoft-teams/frontend/src/components/config/AccessSection/AccessSection.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 
 export const styles = {
   logo: css(`

diff --git a/...rosoft-teams/frontend/src/components/config/AccessSectionCard/AccessSectionCard.styles.ts b/...rosoft-teams/frontend/src/components/config/AccessSectionCard/AccessSectionCard.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/...icrosoft-teams/frontend/src/components/config/ChannelSelection/ChannelSelection.styles.ts b/...icrosoft-teams/frontend/src/components/config/ChannelSelection/ChannelSelection.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 
 export const styles = {
   logo: css(`

diff --git a/...eams/frontend/src/components/config/ChannelSelectionModal/ChannelSelectionModal.styles.ts b/...eams/frontend/src/components/config/ChannelSelectionModal/ChannelSelectionModal.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/apps/microsoft-teams/frontend/src/components/config/ConfigPage/ConfigPage.styles.ts b/apps/microsoft-teams/frontend/src/components/config/ConfigPage/ConfigPage.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/...-teams/frontend/src/components/config/ContentTypeSelection/ContentTypeSelection.styles.ts b/...-teams/frontend/src/components/config/ContentTypeSelection/ContentTypeSelection.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 
 export const styles = {
   input: css({

diff --git a/...ntend/src/components/config/ContentTypeSelectionModal/ContentTypeSelectionModal.styles.ts b/...ntend/src/components/config/ContentTypeSelectionModal/ContentTypeSelectionModal.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/apps/microsoft-teams/frontend/src/components/config/EmptyState/EmptyState.styles.ts b/apps/microsoft-teams/frontend/src/components/config/EmptyState/EmptyState.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 
 export const styles = {
   emptyContent: css({

diff --git a/apps/microsoft-teams/frontend/src/components/config/ModalHeader/ModalHeader.styles.ts b/apps/microsoft-teams/frontend/src/components/config/ModalHeader/ModalHeader.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/...-teams/frontend/src/components/config/NotificationEditMode/NotificationEditMode.styles.ts b/...-teams/frontend/src/components/config/NotificationEditMode/NotificationEditMode.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/...end/src/components/config/NotificationEditModeFooter/NotificationEditModeFooter.styles.ts b/...end/src/components/config/NotificationEditModeFooter/NotificationEditModeFooter.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/...-teams/frontend/src/components/config/NotificationViewMode/NotificationViewMode.styles.ts b/...-teams/frontend/src/components/config/NotificationViewMode/NotificationViewMode.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {

diff --git a/...-teams/frontend/src/components/config/NotificationsSection/NotificationsSection.styles.ts b/...-teams/frontend/src/components/config/NotificationsSection/NotificationsSection.styles.ts
@@ -1,4 +1,4 @@
-import { css } from 'emotion';
+import { css } from '@emotion/css';
 import tokens from '@contentful/f36-tokens';
 
 export const styles = {