MM-52873 : Switch to npm's 'reselect' for Playbooks (#23396)

webapp/channels/jest.config.js

@@ -26,7 +26,6 @@ const config = {
         '^mattermost-redux/test/(.*)$':
             '<rootDir>/src/packages/mattermost-redux/test/$1',
         '^mattermost-redux/(.*)$': '<rootDir>/src/packages/mattermost-redux/src/$1',
-        '^reselect$': '<rootDir>/src/packages/reselect/src',
         '^.+\\.(jpg|jpeg|png|apng|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
             'identity-obj-proxy',
         '^.+\\.(css|less|scss)$': 'identity-obj-proxy',

webapp/channels/src/actions/telemetry_actions.jsx

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {getSortedTrackedSelectors} from 'reselect';
-
 import {Client4} from 'mattermost-redux/client';
 import {Preferences} from 'mattermost-redux/constants';
+import {getSortedTrackedSelectors} from 'mattermost-redux/selectors/create_selector';
 import {getConfig, isPerformanceDebuggingEnabled} from 'mattermost-redux/selectors/entities/general';
 import {getBool} from 'mattermost-redux/selectors/entities/preferences';
 

webapp/channels/src/actions/views/create_comment.tsx

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {Post} from '@mattermost/types/posts';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {

webapp/channels/src/components/actions_menu/selectors.ts

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {AppBinding} from '@mattermost/types/apps';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {AppBindingLocations} from 'mattermost-redux/constants/apps';
 import {makeAppBindingsSelector, makeRHSAppBindingSelector} from 'mattermost-redux/selectors/entities/apps';
 

webapp/channels/src/components/admin_console/compliance_reports/index.ts

@@ -4,9 +4,8 @@
 import {connect} from 'react-redux';
 import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux';
 
-import {createSelector} from 'reselect';
-
 import {createComplianceReport, getComplianceReports} from 'mattermost-redux/actions/admin';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getComplianceReports as selectComplianceReports, getConfig} from 'mattermost-redux/selectors/entities/admin';
 import {getLicense} from 'mattermost-redux/selectors/entities/general';
 

webapp/channels/src/components/admin_console/custom_plugin_settings/index.ts

@@ -3,8 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getRoles} from 'mattermost-redux/selectors/entities/roles';
 import {appsFeatureFlagEnabled} from 'mattermost-redux/selectors/entities/apps';
 import {isCurrentLicenseCloud} from 'mattermost-redux/selectors/entities/cloud';

webapp/channels/src/components/admin_console/filter/team_filter_dropdown/index.tsx

@@ -4,12 +4,11 @@
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux';
 
-import {createSelector} from 'reselect';
-
 import {GenericAction, ActionFunc} from 'mattermost-redux/types/actions';
 import {TeamSearchOpts} from '@mattermost/types/teams';
 import {getTeams as fetchTeams, searchTeams} from 'mattermost-redux/actions/teams';
 import {getTeams} from 'mattermost-redux/selectors/entities/teams';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import {GlobalState} from 'types/store';
 

webapp/channels/src/components/admin_console/filter/team_filter_dropdown/team_filter_dropdown.tsx

@@ -4,10 +4,10 @@
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
-import {createSelector} from 'reselect';
-
 import {Team, TeamSearchOpts} from '@mattermost/types/teams';
+
 import {debounce} from 'mattermost-redux/actions/helpers';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import LoadingSpinner from 'components/widgets/loading/loading_spinner';
 import InfiniteScroll from 'components/gif_picker/components/InfiniteScroll';

webapp/channels/src/components/admin_console/group_settings/groups_list/index.ts

@@ -4,12 +4,11 @@
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux';
 
-import {createSelector} from 'reselect';
+import {GlobalState} from '@mattermost/types/store';
 
 import {linkLdapGroup, unlinkLdapGroup, getLdapGroups as fetchLdapGroups} from 'mattermost-redux/actions/admin';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getLdapGroups, getLdapGroupsCount} from 'mattermost-redux/selectors/entities/admin';
-
-import {GlobalState} from '@mattermost/types/store';
 import {ActionFunc} from 'mattermost-redux/types/actions';
 
 import GroupsList from './groups_list';

webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/index.ts

@@ -4,19 +4,15 @@
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux';
 
-import {createSelector} from 'reselect';
-
 import {ServerError} from '@mattermost/types/errors';
 import {UserProfile, UsersStats, GetFilteredUsersStatsOpts} from '@mattermost/types/users';
-
-import {filterProfilesStartingWithTerm, profileListToMap} from 'mattermost-redux/utils/user_utils';
-
-import {ActionResult, ActionFunc, GenericAction} from 'mattermost-redux/types/actions';
 import {ChannelStats} from '@mattermost/types/channels';
 
+import {filterProfilesStartingWithTerm, profileListToMap} from 'mattermost-redux/utils/user_utils';
+import {ActionResult, ActionFunc, GenericAction} from 'mattermost-redux/types/actions';
 import {getChannelStats} from 'mattermost-redux/actions/channels';
 import {getFilteredUsersStats} from 'mattermost-redux/actions/users';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getChannelMembersInChannels, getAllChannelStats, getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {makeGetProfilesInChannel, makeSearchProfilesInChannel, filterProfiles, getFilteredUsersStats as selectFilteredUsersStats} from 'mattermost-redux/selectors/entities/users';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';

webapp/channels/src/components/admin_console/team_channel_settings/channel/list/index.ts

@@ -4,12 +4,12 @@
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux';
 
-import {createSelector} from 'reselect';
+import {ChannelWithTeamData, ChannelSearchOpts} from '@mattermost/types/channels';
 
 import {getAllChannelsWithCount as getData, searchAllChannels} from 'mattermost-redux/actions/channels';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getAllChannels} from 'mattermost-redux/selectors/entities/channels';
 import {GenericAction, ActionFunc, ActionResult} from 'mattermost-redux/types/actions';
-import {ChannelWithTeamData, ChannelSearchOpts} from '@mattermost/types/channels';
 
 import {GlobalState} from 'types/store';
 import {Constants} from 'utils/constants';

webapp/channels/src/components/admin_console/team_channel_settings/team/list/index.ts

@@ -4,10 +4,9 @@
 import {connect} from 'react-redux';
 import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux';
 
-import {createSelector} from 'reselect';
-
 import {getTeams as fetchTeams, searchTeams} from 'mattermost-redux/actions/teams';
 import {getTeams} from 'mattermost-redux/selectors/entities/teams';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import {ActionFunc} from 'mattermost-redux/types/actions';
 

webapp/channels/src/components/channel_header_dropdown/index.ts

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import {
     getUser,

webapp/channels/src/components/channel_header_mobile/index.ts

@@ -6,8 +6,7 @@ import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch} from 'redux';
 import {withRouter, matchPath} from 'react-router-dom';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 import {
     getCurrentChannel,

webapp/channels/src/components/channel_members_rhs/index.ts

@@ -4,7 +4,7 @@
 import {connect} from 'react-redux';
 import {AnyAction, bindActionCreators, Dispatch} from 'redux';
 
-import {createSelector} from 'reselect';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import {
     getCurrentChannel,

webapp/channels/src/components/channel_select/index.ts

@@ -3,8 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getMyChannels} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUserLocale} from 'mattermost-redux/selectors/entities/i18n';
 import {sortChannelsByTypeAndDisplayName} from 'mattermost-redux/utils/channel_utils';

webapp/channels/src/components/markdown/index.ts

@@ -3,14 +3,14 @@
 
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
 import {Preferences} from 'mattermost-redux/constants';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getChannelNameToDisplayNameMap} from 'mattermost-redux/selectors/entities/channels';
 import {getAutolinkedUrlSchemes, getConfig, getManagedResourcePaths} from 'mattermost-redux/selectors/entities/general';
 import {getBool} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
 import {getAllUserMentionKeys} from 'mattermost-redux/selectors/entities/search';
+import {getPost} from 'mattermost-redux/selectors/entities/posts';
 
 import {GlobalState} from 'types/store';
 import {getEmojiMap} from 'selectors/emojis';
@@ -18,8 +18,6 @@ import {getEmojiMap} from 'selectors/emojis';
 import {getSiteURL} from 'utils/url';
 import {ChannelNamesMap, MentionKey} from 'utils/text_formatting';
 
-import {getPost} from 'mattermost-redux/selectors/entities/posts';
-
 import Markdown from './markdown';
 
 type Props = {

webapp/channels/src/components/member_list_channel/index.ts

@@ -4,8 +4,7 @@
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {searchProfilesInCurrentChannel, getProfilesInCurrentChannel} from 'mattermost-redux/selectors/entities/users';
 import {getMembersInCurrentChannel, getCurrentChannelStats, getCurrentChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getMembersInCurrentTeam} from 'mattermost-redux/selectors/entities/teams';

webapp/channels/src/components/more_channels/index.ts

@@ -4,8 +4,7 @@
 import {connect} from 'react-redux';
 import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {RequestStatus} from 'mattermost-redux/constants';
 import {Channel} from '@mattermost/types/channels';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';

webapp/channels/src/components/more_direct_channels/list/index.ts

@@ -3,8 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getAllChannels, getChannelsWithUserProfiles} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 

webapp/channels/src/components/new_replies_banner/index.ts

@@ -4,11 +4,10 @@
 import {bindActionCreators, Dispatch} from 'redux';
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
 import {Post} from '@mattermost/types/posts';
-import {GenericAction} from 'mattermost-redux/types/actions';
 
+import {GenericAction} from 'mattermost-redux/types/actions';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetPostsForThread} from 'mattermost-redux/selectors/entities/posts';
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 

webapp/channels/src/components/post_markdown/index.ts

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {
     getMyGroupMentionKeysForChannel,

webapp/channels/src/components/post_view/reaction/index.ts

@@ -4,8 +4,7 @@
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch} from 'redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {removeReaction} from 'mattermost-redux/actions/posts';
 import {getMissingProfilesByIds} from 'mattermost-redux/actions/users';
 

webapp/channels/src/components/post_view/reaction/reaction_tooltip/index.ts

@@ -3,8 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentUserId, makeGetProfilesForReactions} from 'mattermost-redux/selectors/entities/users';
 import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
 

webapp/channels/src/components/rename_channel_modal/index.ts

@@ -4,8 +4,7 @@
 import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux';
 import {connect} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {patchChannel} from 'mattermost-redux/actions/channels';
 import {getTeam} from 'mattermost-redux/selectors/entities/teams';
 import {GlobalState} from '@mattermost/types/store';

webapp/channels/src/components/system_notice/index.ts

@@ -4,8 +4,7 @@
 import {connect} from 'react-redux';
 import {bindActionCreators, Dispatch} from 'redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetCategory} from 'mattermost-redux/selectors/entities/preferences';
 import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
 import {haveISystemPermission} from 'mattermost-redux/selectors/entities/roles';

webapp/channels/src/components/toast_wrapper/index.ts

@@ -7,8 +7,7 @@ import {withRouter} from 'react-router-dom';
 
 import {GlobalState} from 'types/store/index';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {Posts} from 'mattermost-redux/constants';
 import {getAllPosts, getPostIdsInChannel} from 'mattermost-redux/selectors/entities/posts';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';

webapp/channels/src/components/user_group_popover/group_member_list/index.ts

@@ -18,7 +18,7 @@ import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities
 import {openDirectChannelToUserId} from 'actions/channel_actions';
 import {closeRightHandSide} from 'actions/views/rhs';
 
-import {createSelector} from 'reselect';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {displayUsername} from 'mattermost-redux/utils/user_utils';
 
 import GroupMemberList, {GroupMember} from './group_member_list';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/admin.ts

@@ -1,14 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {DataRetentionCustomPolicies, DataRetentionCustomPolicy} from '@mattermost/types/data_retention';
 import {PluginStatusRedux} from '@mattermost/types/plugins';
 
 import {GlobalState} from '@mattermost/types/store';
 import {LogObject} from '@mattermost/types/admin';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
+
 export function getLogs(state: GlobalState) {
     return state.entities.admin.logs;
 }

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/apps.ts

@@ -1,12 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {GlobalState} from '@mattermost/types/store';
 import {AppBinding} from '@mattermost/types/apps';
 import {ClientConfig} from '@mattermost/types/config';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {AppBindingLocations} from 'mattermost-redux/constants/apps';
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/bots.ts

@@ -1,11 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {Bot} from '@mattermost/types/bots';
 import {GlobalState} from '@mattermost/types/store';
+
 import {getUsers} from 'mattermost-redux/selectors/entities/common';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 export const ExternalBotAccountNames: string[] = ['mattermost-advisor'];
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts

@@ -3,8 +3,7 @@
 
 import shallowEquals from 'shallow-equals';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {General, Preferences} from 'mattermost-redux/constants';
 import {CategoryTypes} from 'mattermost-redux/constants/channel_categories';
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channels.ts

@@ -50,8 +50,7 @@ import {
 
 import {createIdsSelector} from 'mattermost-redux/utils/helpers';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {
     Channel,
     ChannelMemberCountsByGroup,

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/common.ts

@@ -1,14 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {ChannelMembership, Channel} from '@mattermost/types/channels';
 import {TeamMembership} from '@mattermost/types/teams';
 import {GlobalState} from '@mattermost/types/store';
 import {UserProfile} from '@mattermost/types/users';
 import {RelationOneToOne, IDMappedObjects} from '@mattermost/types/utilities';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
+
 const CALLS_PLUGIN = 'plugins-com.mattermost.calls';
 
 type CallsConfig = {

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/emojis.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
 import {CustomEmoji} from '@mattermost/types/emojis';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/files.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentUserLocale} from 'mattermost-redux/selectors/entities/i18n';
 
 import {FileInfo, FileSearchResultItem} from '@mattermost/types/files';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/general.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {General} from 'mattermost-redux/constants';
 
 import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts

@@ -1,15 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {GlobalState} from '@mattermost/types/store';
 import {Group, GroupSource} from '@mattermost/types/groups';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {filterGroupsMatchingTerm, sortGroups} from 'mattermost-redux/utils/group_utils';
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getTeam} from 'mattermost-redux/selectors/entities/teams';
 import {UserMentionKey} from 'mattermost-redux/selectors/entities/users';
-import {GlobalState} from '@mattermost/types/store';
 
 import {getCurrentUserLocale} from './i18n';
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/insights.ts

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import {GlobalState} from '@mattermost/types/store';
 import {TimeFrame, TimeFrames, TopReaction} from '@mattermost/types/insights';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/integrations.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 
 import {OutgoingWebhook, Command} from '@mattermost/types/integrations';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/jobs.ts

@@ -1,12 +1,12 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {JobType, Job, JobsByType} from '@mattermost/types/jobs';
 import {GlobalState} from '@mattermost/types/store';
 import {IDMappedObjects} from '@mattermost/types/utilities';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
+
 export function getAllJobs(state: GlobalState): IDMappedObjects<Job> {
     return state.entities.jobs.jobs;
 }

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {Posts, Preferences} from 'mattermost-redux/constants';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/common';
 import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
 import {getUsers, getCurrentUserId, getUserStatuses} from 'mattermost-redux/selectors/entities/users';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {General, Preferences} from 'mattermost-redux/constants';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getConfig, getFeatureFlagValue, getLicense} from 'mattermost-redux/selectors/entities/general';
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 import {isGuest} from 'mattermost-redux/utils/user_utils';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/common';
 import {
     getMySystemPermissions,

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles_helpers.ts

@@ -1,14 +1,13 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
-import {getCurrentUser} from 'mattermost-redux/selectors/entities/common';
-
 import {Role} from '@mattermost/types/roles';
 import {GlobalState} from '@mattermost/types/store';
 import {UserProfile} from '@mattermost/types/users';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
+import {getCurrentUser} from 'mattermost-redux/selectors/entities/common';
+
 export type PermissionsOptions = {
     channel?: string;
     team?: string;

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/schemes.ts

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {ScopeTypes} from 'mattermost-redux/constants/schemes';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getAllChannels} from 'mattermost-redux/selectors/entities/channels';
 import {getTeams} from 'mattermost-redux/selectors/entities/teams';
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/search.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getCurrentUserMentionKeys, UserMentionKey} from 'mattermost-redux/selectors/entities/users';
 import {getMyGroupMentionKeys} from 'mattermost-redux/selectors/entities/groups';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/teams.ts

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {Permissions} from 'mattermost-redux/constants';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getConfig, isCompatibleWithJoinViewTeamPermissions} from 'mattermost-redux/selectors/entities/general';
 import {haveISystemPermission} from 'mattermost-redux/selectors/entities/roles_helpers';
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/threads.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 
 import {GlobalState} from '@mattermost/types/store';

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/timezone.ts

@@ -5,7 +5,8 @@ import timezones from 'timezones.json';
 
 import {GlobalState} from '@mattermost/types/store';
 import {UserProfile} from '@mattermost/types/users';
-import {createSelector} from 'reselect';
+
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import {getTimezoneLabel, getUserCurrentTimezone} from 'mattermost-redux/utils/timezone_utils';
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/typing.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getUsers} from 'mattermost-redux/selectors/entities/common';
 import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
 

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/users.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {
     getCurrentChannelId,
     getCurrentUser,

webapp/channels/src/packages/mattermost-redux/src/selectors/entities/utils.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getMyChannelMemberships, getAllDmChannels} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUserId, getUserStatuses} from 'mattermost-redux/selectors/entities/users';
 

webapp/channels/src/packages/mattermost-redux/src/utils/helpers.ts

@@ -3,7 +3,7 @@
 
 import shallowEqual from 'shallow-equals';
 
-import * as reselect from 'reselect';
+import {createSelectorCreator, defaultMemoize} from 'mattermost-redux/selectors/create_selector';
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 export function memoizeResult<F extends Function>(func: F, measure: Function | undefined = undefined): F {
@@ -32,10 +32,10 @@ export function memoizeResult<F extends Function>(func: F, measure: Function | u
 
 // Use this selector when you want a shallow comparison of the arguments and you want to memoize the result
 // try and use this only when your selector returns an array of ids
-export const createIdsSelector = reselect.createSelectorCreator(memoizeResult);
+export const createIdsSelector = createSelectorCreator(memoizeResult);
 
 // Use this selector when you want a shallow comparison of the arguments and you don't need to memoize the result
-export const createShallowSelector = reselect.createSelectorCreator(reselect.defaultMemoize, shallowEqual as any);
+export const createShallowSelector = createSelectorCreator(defaultMemoize, shallowEqual as any);
 
 // isMinimumServerVersion will return true if currentVersion is equal to higher or than the
 // the provided minimum version. A non-equal major version will ignore minor and dot

webapp/channels/src/packages/mattermost-redux/src/utils/post_list.ts

@@ -3,10 +3,9 @@
 
 import moment from 'moment-timezone';
 
-import * as reselect from 'reselect';
-
 import {Posts, Preferences} from 'mattermost-redux/constants';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetPostsForIds, UserActivityPost} from 'mattermost-redux/selectors/entities/posts';
 import {getBool} from 'mattermost-redux/selectors/entities/preferences';
 import {isTimezoneEnabled} from 'mattermost-redux/selectors/entities/timezone';
@@ -275,7 +274,7 @@ export function makeGenerateCombinedPost(): (state: GlobalState, combinedId: str
     const getPostsForIds = makeGetPostsForIds();
     const getPostIds = memoizeResult(getPostIdsForCombinedUserActivityPost);
 
-    return reselect.createSelector(
+    return createSelector(
         'makeGenerateCombinedPost',
         (state: GlobalState, combinedId: string) => combinedId,
         (state: GlobalState, combinedId: string) => getPostsForIds(state, getPostIds(combinedId)),

webapp/channels/src/selectors/admin_console.jsx

@@ -3,8 +3,7 @@
 
 import {cloneDeep} from 'lodash';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getMySystemPermissions} from 'mattermost-redux/selectors/entities/roles_helpers';
 import {ResourceToSysConsolePermissionsTable, RESOURCE_KEYS} from 'mattermost-redux/constants/permissions_sysconsole';
 

webapp/channels/src/selectors/cloud.ts

@@ -4,7 +4,7 @@
 import {Invoice, Subscription} from '@mattermost/types/cloud';
 
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {createSelector} from 'reselect';
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 
 import {GlobalState} from 'types/store';
 

webapp/channels/src/selectors/drafts.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getMyActiveChannelIds} from 'mattermost-redux/selectors/entities/channels';
 import {get, onboardingTourTipsEnabled} from 'mattermost-redux/selectors/entities/preferences';
 

webapp/channels/src/selectors/emojis.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';

webapp/channels/src/selectors/lhs.ts

@@ -1,9 +1,10 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
 import {GlobalState} from 'types/store';
 import {StaticPage} from 'types/store/lhs';
+
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetDraftsCount} from 'selectors/drafts';
 import {
     insightsAreEnabled,

webapp/channels/src/selectors/onboarding.ts

@@ -3,8 +3,7 @@
 
 import {isMobile} from 'utils/utils';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetCategory, getBool} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentUser, isFirstAdmin} from 'mattermost-redux/selectors/entities/users';
 

webapp/channels/src/selectors/plugins.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {appBarEnabled, getAppBarAppBindings} from 'mattermost-redux/selectors/entities/apps';
 import {createShallowSelector} from 'mattermost-redux/utils/helpers';
 

webapp/channels/src/selectors/posts.ts

@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
 import {Post} from '@mattermost/types/posts';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getPost} from 'mattermost-redux/selectors/entities/posts';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 

webapp/channels/src/selectors/rhs.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
 import {Post, PostType} from '@mattermost/types/posts';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';

webapp/channels/src/selectors/views/channel_sidebar.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {
     getAllChannels,
     getCurrentChannelId,

webapp/channels/src/selectors/views/custom_status.ts

@@ -3,8 +3,7 @@
 
 import moment from 'moment-timezone';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentTimezone} from 'mattermost-redux/selectors/entities/timezone';
 import {getCurrentUser, getUser} from 'mattermost-redux/selectors/entities/users';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';

webapp/channels/src/selectors/views/marketplace.ts

@@ -1,11 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
-import {isPlugin} from 'mattermost-redux/utils/marketplace';
 import type {MarketplaceApp, MarketplacePlugin} from '@mattermost/types/marketplace';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
+import {isPlugin} from 'mattermost-redux/utils/marketplace';
+
 import {GlobalState} from 'types/store';
 
 export const getPlugins = (state: GlobalState): MarketplacePlugin[] => state.views.marketplace.plugins;

webapp/channels/src/selectors/views/threads.ts

@@ -3,8 +3,7 @@
 
 import moment from 'moment';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetPostsForIds} from 'mattermost-redux/selectors/entities/posts';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getThreads} from 'mattermost-redux/selectors/entities/threads';

webapp/channels/src/selectors/work_template.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getFeatureFlagValue, getLicense} from 'mattermost-redux/selectors/entities/general';
 import {GlobalState} from 'types/store';
 import {haveICurrentTeamPermission} from 'mattermost-redux/selectors/entities/roles';

webapp/channels/src/stores/hooks.ts

@@ -4,8 +4,7 @@
 import {useCallback} from 'react';
 import {useSelector, useDispatch, shallowEqual} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 

webapp/channels/src/utils/post_utils.ts

@@ -2,17 +2,14 @@
 // See LICENSE.txt for license information.
 
 import {IntlShape, useIntl} from 'react-intl';
-
 import {useMemo} from 'react';
-
 import {useSelector} from 'react-redux';
 
-import {createSelector} from 'reselect';
-
 import {Client4} from 'mattermost-redux/client';
 
 import {Permissions, Posts} from 'mattermost-redux/constants';
 
+import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {makeGetReactionsForPost} from 'mattermost-redux/selectors/entities/posts';

webapp/channels/tsconfig.json

@@ -25,7 +25,6 @@
     "composite": true,
     "paths": {
         "mattermost-redux/*": ["packages/mattermost-redux/src/*"],
-        "reselect": ["packages/reselect/src"],
         "@mui/styled-engine": ["./node_modules/@mui/styled-engine-sc"],
     }
   },

webapp/channels/webpack.config.js

@@ -134,7 +134,6 @@ var config = {
         alias: {
             'mattermost-redux/test': 'packages/mattermost-redux/test',
             'mattermost-redux': 'packages/mattermost-redux/src',
-            reselect: 'packages/reselect/src',
             '@mui/styled-engine': '@mui/styled-engine-sc',
         },
         extensions: ['.ts', '.tsx', '.js', '.jsx'],