From b7175560da73b15481aafff6ea91bbfa82aa00e1 Mon Sep 17 00:00:00 2001 From: M-ZubairAhmed Date: Sat, 8 Apr 2023 06:13:06 +0530 Subject: [PATCH] MM-51831 : Add ESLint rule to "channels/components" to error out if "compass-components" package is used (#22754) --- webapp/channels/.eslintrc.json | 21 ++++++++++++++----- .../activity_and_insights_link.tsx | 2 +- .../time_frame_dropdown.tsx | 2 +- .../app_bar/app_bar_marketplace.tsx | 2 +- .../compass_theme_provider.tsx | 2 +- .../custom_status/date_time_input.tsx | 2 +- .../dnd_custom_time_picker_modal.tsx | 2 +- .../global_search_nav/global_search_nav.tsx | 2 +- .../user_guide_dropdown.tsx | 2 +- .../history_buttons/history_buttons.tsx | 2 +- .../product_branding.test.tsx | 2 +- .../product_branding/product_branding.tsx | 4 ++-- .../product_menu/product_menu.tsx | 2 +- .../product_menu_item/product_menu_item.tsx | 2 +- .../product_menu_list/product_menu_list.tsx | 2 +- .../at_mentions_button.test.tsx | 2 +- .../at_mentions_button/at_mentions_button.tsx | 2 +- .../saved_posts_button.test.tsx | 2 +- .../saved_posts_button/saved_posts_button.tsx | 2 +- .../settings_button/settings_button.tsx | 2 +- .../src/components/info_toast/info_toast.tsx | 2 +- .../onboarding_tasklist.tsx | 2 +- .../onboarding_tasklist_animations.tsx | 2 +- .../edited_post_item/edited_post_item.tsx | 2 +- .../post_edited_indicator.tsx | 2 +- .../sidebar_header/sidebar_header.test.tsx | 2 +- .../sidebar/sidebar_header/sidebar_header.tsx | 4 ++-- .../status_dropdown/status_dropdown.tsx | 8 +++---- .../command_provider/command_provider.tsx | 2 +- webapp/channels/src/types/store/plugins.ts | 2 +- 30 files changed, 50 insertions(+), 39 deletions(-) diff --git a/webapp/channels/.eslintrc.json b/webapp/channels/.eslintrc.json index 94df6239d0..cdc3b7bf18 100644 --- a/webapp/channels/.eslintrc.json +++ b/webapp/channels/.eslintrc.json @@ -80,11 +80,22 @@ "react/style-prop-object": [2, { "allow": ["Timestamp"] }], - "no-restricted-imports": ["error", { - "paths": [ - {"name": "react-bootstrap", "importNames": ["OverlayTrigger"], "message": "Please use OverlayTrigger from '/components/overlay_trigger' instead"} - ] - }], + "no-restricted-imports": [ + "error", + { + "patterns": [ + { + "group": ["react-bootstrap"], + "importNames": ["OverlayTrigger"], + "message": "Please use OverlayTrigger from '/components/overlay_trigger' instead." + }, + { + "group": ["@mattermost/compass-components/*"], + "message": "compass-components is now archived" + } + ] + } + ], "max-lines": ["warn", {"max": 800, "skipBlankLines": true, "skipComments": true}], "formatjs/no-multiple-whitespaces": ["error"] }, diff --git a/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx b/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx index 602594d002..3f9ff03968 100644 --- a/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx +++ b/webapp/channels/src/components/activity_and_insights/activity_and_insights_link/activity_and_insights_link.tsx @@ -6,7 +6,7 @@ import {Link, useRouteMatch, useLocation, matchPath} from 'react-router-dom'; import {useIntl} from 'react-intl'; import {useDispatch, useSelector} from 'react-redux'; import classNames from 'classnames'; -import Icon from '@mattermost/compass-components/foundations/icon'; +import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports import {insightsAreEnabled} from 'mattermost-redux/selectors/entities/preferences'; import {getIsRhsOpen, getRhsState} from 'selectors/rhs'; diff --git a/webapp/channels/src/components/activity_and_insights/insights/time_frame_dropdown/time_frame_dropdown.tsx b/webapp/channels/src/components/activity_and_insights/insights/time_frame_dropdown/time_frame_dropdown.tsx index 86d356932e..501da6d717 100644 --- a/webapp/channels/src/components/activity_and_insights/insights/time_frame_dropdown/time_frame_dropdown.tsx +++ b/webapp/channels/src/components/activity_and_insights/insights/time_frame_dropdown/time_frame_dropdown.tsx @@ -5,7 +5,7 @@ import React, {memo, useCallback} from 'react'; import ReactSelect, {ValueType} from 'react-select'; -import Icon from '@mattermost/compass-components/foundations/icon/Icon'; +import Icon from '@mattermost/compass-components/foundations/icon/Icon'; // eslint-disable-line no-restricted-imports import {trackEvent} from 'actions/telemetry_actions'; diff --git a/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx b/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx index b50ec6832f..457a1b83e2 100644 --- a/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx +++ b/webapp/channels/src/components/app_bar/app_bar_marketplace.tsx @@ -6,7 +6,7 @@ import {useDispatch} from 'react-redux'; import {useIntl} from 'react-intl'; import {Tooltip} from 'react-bootstrap'; -import Icon from '@mattermost/compass-components/foundations/icon'; +import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports import {openModal} from 'actions/views/modals'; diff --git a/webapp/channels/src/components/compass_theme_provider/compass_theme_provider.tsx b/webapp/channels/src/components/compass_theme_provider/compass_theme_provider.tsx index c8081975c2..60d6cbf20f 100644 --- a/webapp/channels/src/components/compass_theme_provider/compass_theme_provider.tsx +++ b/webapp/channels/src/components/compass_theme_provider/compass_theme_provider.tsx @@ -3,7 +3,7 @@ import React, {useState, useEffect} from 'react'; -import ThemeProvider, {lightTheme} from '@mattermost/compass-components/utilities/theme'; +import ThemeProvider, {lightTheme} from '@mattermost/compass-components/utilities/theme'; // eslint-disable-line no-restricted-imports import {Theme} from 'mattermost-redux/selectors/entities/preferences'; diff --git a/webapp/channels/src/components/custom_status/date_time_input.tsx b/webapp/channels/src/components/custom_status/date_time_input.tsx index d5837f4e3a..8dde00eded 100644 --- a/webapp/channels/src/components/custom_status/date_time_input.tsx +++ b/webapp/channels/src/components/custom_status/date_time_input.tsx @@ -9,7 +9,7 @@ import {DateTime} from 'luxon'; import moment, {Moment} from 'moment-timezone'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import MenuWrapper from 'components/widgets/menu/menu_wrapper'; import Input from 'components/widgets/inputs/input/input'; diff --git a/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx b/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx index f77f62b31c..8e83fb47cd 100644 --- a/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx +++ b/webapp/channels/src/components/dnd_custom_time_picker_modal/dnd_custom_time_picker_modal.tsx @@ -5,7 +5,7 @@ import React from 'react'; import {FormattedMessage} from 'react-intl'; import {DayPickerProps} from 'react-day-picker'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import classNames from 'classnames'; diff --git a/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx b/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx index 8b611b05b7..a3bcbd7155 100644 --- a/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx +++ b/webapp/channels/src/components/global_header/center_controls/global_search_nav/global_search_nav.tsx @@ -4,7 +4,7 @@ import React, {useEffect} from 'react'; import {useDispatch, useSelector} from 'react-redux'; -import Flex from '@mattermost/compass-components/utilities/layout/Flex'; +import Flex from '@mattermost/compass-components/utilities/layout/Flex'; // eslint-disable-line no-restricted-imports import {closeRightHandSide, showMentions} from 'actions/views/rhs'; import Search from 'components/search'; diff --git a/webapp/channels/src/components/global_header/center_controls/user_guide_dropdown/user_guide_dropdown.tsx b/webapp/channels/src/components/global_header/center_controls/user_guide_dropdown/user_guide_dropdown.tsx index 1768074838..fbaed140d0 100644 --- a/webapp/channels/src/components/global_header/center_controls/user_guide_dropdown/user_guide_dropdown.tsx +++ b/webapp/channels/src/components/global_header/center_controls/user_guide_dropdown/user_guide_dropdown.tsx @@ -3,7 +3,7 @@ import React from 'react'; import {FormattedMessage, injectIntl, WrappedComponentProps} from 'react-intl'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {trackEvent} from 'actions/telemetry_actions'; diff --git a/webapp/channels/src/components/global_header/left_controls/history_buttons/history_buttons.tsx b/webapp/channels/src/components/global_header/left_controls/history_buttons/history_buttons.tsx index c926cbf543..2a1ba532d6 100644 --- a/webapp/channels/src/components/global_header/left_controls/history_buttons/history_buttons.tsx +++ b/webapp/channels/src/components/global_header/left_controls/history_buttons/history_buttons.tsx @@ -5,7 +5,7 @@ import React, {useEffect, useState, useCallback} from 'react'; import {useHistory} from 'react-router-dom'; import styled from 'styled-components'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {trackEvent} from 'actions/telemetry_actions'; import * as Utils from 'utils/utils'; diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx index 68c3fe95b0..e29079c6c4 100644 --- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx +++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.test.tsx @@ -3,7 +3,7 @@ import React from 'react'; import {shallow} from 'enzyme'; -import Icon from '@mattermost/compass-components/foundations/icon'; +import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports import {TopLevelProducts} from 'utils/constants'; diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx index b1ed4593b9..628e26b3d7 100644 --- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx +++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding/product_branding.tsx @@ -3,8 +3,8 @@ import React from 'react'; import styled from 'styled-components'; -import Icon from '@mattermost/compass-components/foundations/icon'; -import Heading from '@mattermost/compass-components/components/heading'; +import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports +import Heading from '@mattermost/compass-components/components/heading'; // eslint-disable-line no-restricted-imports import {useCurrentProduct} from 'utils/products'; diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu.tsx index 6ff1b8e8f3..ac553166a1 100644 --- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu.tsx +++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu.tsx @@ -6,7 +6,7 @@ import {useIntl} from 'react-intl'; import styled from 'styled-components'; import {useDispatch, useSelector} from 'react-redux'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {getConfig} from 'mattermost-redux/selectors/entities/general'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx index bc55c398a5..99223e409f 100644 --- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx +++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_item/product_menu_item.tsx @@ -7,7 +7,7 @@ import {Link} from 'react-router-dom'; import styled from 'styled-components'; -import Icon, {TIconGlyph} from '@mattermost/compass-components/foundations/icon'; +import Icon, {TIconGlyph} from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports export interface ProductMenuItemProps { destination: string; diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx index 6609d55afe..13804b0b16 100644 --- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx +++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_menu_list/product_menu_list.tsx @@ -4,7 +4,7 @@ import React, {useEffect} from 'react'; import {useIntl} from 'react-intl'; -import Icon from '@mattermost/compass-components/foundations/icon'; +import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports import {Permissions} from 'mattermost-redux/constants'; diff --git a/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.test.tsx b/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.test.tsx index ba55064117..2fe430a990 100644 --- a/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.test.tsx +++ b/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.test.tsx @@ -4,7 +4,7 @@ import React from 'react'; import {shallow} from 'enzyme'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {GlobalState} from 'types/store'; diff --git a/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.tsx b/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.tsx index d77592c8ca..7841e77919 100644 --- a/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.tsx +++ b/webapp/channels/src/components/global_header/right_controls/at_mentions_button/at_mentions_button.tsx @@ -4,7 +4,7 @@ import React from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; import {useDispatch, useSelector} from 'react-redux'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {closeRightHandSide, showMentions} from 'actions/views/rhs'; import OverlayTrigger from 'components/overlay_trigger'; diff --git a/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.test.tsx b/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.test.tsx index 6cc0285606..77c44f100e 100644 --- a/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.test.tsx +++ b/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.test.tsx @@ -4,7 +4,7 @@ import React from 'react'; import {shallow} from 'enzyme'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {GlobalState} from 'types/store'; diff --git a/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.tsx b/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.tsx index 378a88d422..335b226866 100644 --- a/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.tsx +++ b/webapp/channels/src/components/global_header/right_controls/saved_posts_button/saved_posts_button.tsx @@ -5,7 +5,7 @@ import React from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; import {useDispatch, useSelector} from 'react-redux'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {closeRightHandSide, showFlaggedPosts} from 'actions/views/rhs'; import OverlayTrigger from 'components/overlay_trigger'; diff --git a/webapp/channels/src/components/global_header/right_controls/settings_button/settings_button.tsx b/webapp/channels/src/components/global_header/right_controls/settings_button/settings_button.tsx index 414f6ebc14..90fbce399c 100644 --- a/webapp/channels/src/components/global_header/right_controls/settings_button/settings_button.tsx +++ b/webapp/channels/src/components/global_header/right_controls/settings_button/settings_button.tsx @@ -4,7 +4,7 @@ import React from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import OverlayTrigger from 'components/overlay_trigger'; import Tooltip from 'components/tooltip'; diff --git a/webapp/channels/src/components/info_toast/info_toast.tsx b/webapp/channels/src/components/info_toast/info_toast.tsx index 0d64902786..c258917d24 100644 --- a/webapp/channels/src/components/info_toast/info_toast.tsx +++ b/webapp/channels/src/components/info_toast/info_toast.tsx @@ -6,7 +6,7 @@ import classNames from 'classnames'; import {CSSTransition} from 'react-transition-group'; import {useIntl} from 'react-intl'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import './info_toast.scss'; type Props = { diff --git a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx index 5670c46ed3..5a13d35521 100644 --- a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx +++ b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist.tsx @@ -5,7 +5,7 @@ import React, {useRef, useCallback, useEffect, useState} from 'react'; import {useDispatch, useSelector} from 'react-redux'; import styled, {css} from 'styled-components'; -import Icon from '@mattermost/compass-components/foundations/icon/Icon'; +import Icon from '@mattermost/compass-components/foundations/icon/Icon'; // eslint-disable-line no-restricted-imports import {FormattedMessage} from 'react-intl'; diff --git a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_animations.tsx b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_animations.tsx index a631691f87..bfd3716b46 100644 --- a/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_animations.tsx +++ b/webapp/channels/src/components/onboarding_tasklist/onboarding_tasklist_animations.tsx @@ -3,7 +3,7 @@ import React from 'react'; import styled from 'styled-components'; -import StatusIcon from '@mattermost/compass-components/components/status-icon'; +import StatusIcon from '@mattermost/compass-components/components/status-icon'; // eslint-disable-line no-restricted-imports const Animation = styled.div` position: absolute; diff --git a/webapp/channels/src/components/post_edit_history/edited_post_item/edited_post_item.tsx b/webapp/channels/src/components/post_edit_history/edited_post_item/edited_post_item.tsx index 0d0f9c60eb..e12dabadab 100644 --- a/webapp/channels/src/components/post_edit_history/edited_post_item/edited_post_item.tsx +++ b/webapp/channels/src/components/post_edit_history/edited_post_item/edited_post_item.tsx @@ -6,7 +6,7 @@ import React, {memo, useCallback, useState} from 'react'; import {defineMessages, useIntl} from 'react-intl'; import classNames from 'classnames'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {CheckIcon} from '@mattermost/compass-icons/components'; import {Post} from '@mattermost/types/posts'; diff --git a/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx b/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx index a22bff878f..c4a337fb98 100644 --- a/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx +++ b/webapp/channels/src/components/post_view/post_edited_indicator/post_edited_indicator.tsx @@ -3,7 +3,7 @@ import React, {MouseEvent} from 'react'; import {useIntl} from 'react-intl'; -import Icon from '@mattermost/compass-components/foundations/icon'; +import Icon from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports import {getDateForTimezone} from 'mattermost-redux/utils/timezone_utils'; import {isSameDay, isWithinLastWeek, isYesterday} from 'utils/datetime'; diff --git a/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.test.tsx b/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.test.tsx index ae81c42d64..3761685c7c 100644 --- a/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.test.tsx +++ b/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.test.tsx @@ -3,7 +3,7 @@ import React from 'react'; import {shallow} from 'enzyme'; -import IconButton from '@mattermost/compass-components/components/icon-button'; +import IconButton from '@mattermost/compass-components/components/icon-button'; // eslint-disable-line no-restricted-imports import {FileSizes} from 'utils/file_utils'; import {CloudProducts} from 'utils/constants'; diff --git a/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.tsx b/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.tsx index c9a8ecd589..b25bbd2c4a 100644 --- a/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.tsx +++ b/webapp/channels/src/components/sidebar/sidebar_header/sidebar_header.tsx @@ -5,8 +5,8 @@ import React, {useCallback, useState} from 'react'; import {useDispatch, useSelector} from 'react-redux'; import styled from 'styled-components'; -import Flex from '@mattermost/compass-components/utilities/layout/Flex'; -import Heading from '@mattermost/compass-components/components/heading'; +import Flex from '@mattermost/compass-components/utilities/layout/Flex'; // eslint-disable-line no-restricted-imports +import Heading from '@mattermost/compass-components/components/heading'; // eslint-disable-line no-restricted-imports import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams'; import {GlobalState} from 'types/store'; diff --git a/webapp/channels/src/components/status_dropdown/status_dropdown.tsx b/webapp/channels/src/components/status_dropdown/status_dropdown.tsx index b361ea5c58..3afb723ad8 100644 --- a/webapp/channels/src/components/status_dropdown/status_dropdown.tsx +++ b/webapp/channels/src/components/status_dropdown/status_dropdown.tsx @@ -5,10 +5,10 @@ import React, {ReactNode} from 'react'; import {IntlShape, injectIntl, FormattedDate, FormattedMessage, FormattedTime} from 'react-intl'; import classNames from 'classnames'; -import StatusIcon from '@mattermost/compass-components/components/status-icon'; -import Text from '@mattermost/compass-components/components/text'; -import Icon from '@mattermost/compass-components/foundations/icon/Icon'; -import {TUserStatus} from '@mattermost/compass-components/shared'; +import StatusIcon from '@mattermost/compass-components/components/status-icon'; // eslint-disable-line no-restricted-imports +import Text from '@mattermost/compass-components/components/text'; // eslint-disable-line no-restricted-imports +import Icon from '@mattermost/compass-components/foundations/icon/Icon'; // eslint-disable-line no-restricted-imports +import {TUserStatus} from '@mattermost/compass-components/shared'; // eslint-disable-line no-restricted-imports import {ActionFunc} from 'mattermost-redux/types/actions'; diff --git a/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx b/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx index 15b6d6ad37..0a5e73b6f2 100644 --- a/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx +++ b/webapp/channels/src/components/suggestion/command_provider/command_provider.tsx @@ -5,7 +5,7 @@ import React from 'react'; import {Store} from 'redux'; -import Icon from '@mattermost/compass-components/foundations/icon/Icon'; +import Icon from '@mattermost/compass-components/foundations/icon/Icon'; // eslint-disable-line no-restricted-imports import {Client4} from 'mattermost-redux/client'; import {appsEnabled} from 'mattermost-redux/selectors/entities/apps'; diff --git a/webapp/channels/src/types/store/plugins.ts b/webapp/channels/src/types/store/plugins.ts index 7583a4a8da..ba2c17594e 100644 --- a/webapp/channels/src/types/store/plugins.ts +++ b/webapp/channels/src/types/store/plugins.ts @@ -3,7 +3,7 @@ import React from 'react'; -import {TIconGlyph} from '@mattermost/compass-components/foundations/icon'; +import {TIconGlyph} from '@mattermost/compass-components/foundations/icon'; // eslint-disable-line no-restricted-imports import {ProductScope} from '@mattermost/types/products';