Update matrix-org/react (enzyme deprecation) (#9116)

package.json

@@ -178,9 +178,10 @@
     "enzyme-to-json": "^3.6.2",
     "eslint": "8.9.0",
     "eslint-config-google": "^0.14.0",
+    "eslint-plugin-deprecate": "^0.7.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-matrix-org": "^0.5.2",
+    "eslint-plugin-matrix-org": "^0.6.1",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "fs-extra": "^10.0.1",

test/HtmlUtils-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 

test/accessibility/RovingTabIndex-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 
 import {

test/components/structures/RightPanel-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { jest } from "@jest/globals";
 import { mocked, MockedObject } from "jest-mock";

test/components/structures/RoomView-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { act } from "react-dom/test-utils";
 import { mocked, MockedObject } from "jest-mock";

test/components/structures/ThreadPanel-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { shallow, mount } from "enzyme";
 import 'focus-visible'; // to fix context menus
 

test/components/structures/TimelinePanel-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { MessageEvent } from 'matrix-events-sdk';
 import { EventTimelineSet, MatrixEvent, PendingEventOrdering, Room } from 'matrix-js-sdk/src/matrix';

test/components/structures/VideoRoomView-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { act } from "react-dom/test-utils";
 import { mocked } from "jest-mock";

test/components/views/audio_messages/RecordingPlayback-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { logger } from 'matrix-js-sdk/src/logger';

test/components/views/beacon/BeaconListItem-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import {
     Beacon,

test/components/views/beacon/BeaconMarker-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import maplibregl from 'maplibre-gl';
 import { act } from 'react-dom/test-utils';

test/components/views/beacon/BeaconStatus-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { Beacon } from 'matrix-js-sdk/src/matrix';
 

test/components/views/beacon/BeaconViewDialog-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import {

test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import { mocked } from 'jest-mock';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { Beacon, BeaconIdentifier } from 'matrix-js-sdk/src/matrix';

test/components/views/beacon/OwnBeaconStatus-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { mocked } from 'jest-mock';

test/components/views/beacon/RoomLiveShareWarning-test.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { Room, Beacon, BeaconEvent, getBeaconInfoIdentifier } from 'matrix-js-sdk/src/matrix';
 import { logger } from 'matrix-js-sdk/src/logger';

test/components/views/beacon/ShareLatestLocation-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 

test/components/views/beacon/StyledLiveBeaconIcon-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 
 import StyledLiveBeaconIcon from '../../../../src/components/views/beacon/StyledLiveBeaconIcon';

test/components/views/context_menus/ContextMenu-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 
 import ContextMenu, { ChevronFace } from "../../../../src/components/structures/ContextMenu";

test/components/views/context_menus/MessageContextMenu-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { Room } from 'matrix-js-sdk/src/models/room';

test/components/views/context_menus/SpaceContextMenu-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { Room } from 'matrix-js-sdk/src/matrix';
 import { mocked } from 'jest-mock';

test/components/views/dialogs/AccessSecretStorageDialog-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { IPassphraseInfo } from 'matrix-js-sdk/src/crypto/api';

test/components/views/dialogs/ExportDialog-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { act } from "react-dom/test-utils";

test/components/views/dialogs/ForwardDialog-test.tsx

@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 import React from "react";
-import { mount } from "enzyme";
+// eslint-disable-next-line deprecate/import
+import { mount, ReactWrapper } from "enzyme";
 import { act } from "react-dom/test-utils";
 import { MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
-import { ReactWrapper } from "enzyme";
 import { LocationAssetType, M_ASSET, M_LOCATION, M_TIMESTAMP } from "matrix-js-sdk/src/@types/location";
 import { TEXT_NODE_TYPE } from "matrix-js-sdk/src/@types/extensible_events";
 

test/components/views/dialogs/InteractiveAuthDialog-test.tsx

@@ -17,6 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 
 import InteractiveAuthDialog from "../../../../src/components/views/dialogs/InteractiveAuthDialog";

test/components/views/dialogs/SpotlightDialog-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { mocked } from "jest-mock";
 import { IProtocol, IPublicRoomsChunkRoom, MatrixClient, Room, RoomMember } from "matrix-js-sdk/src/matrix";

test/components/views/elements/AccessibleButton-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 

test/components/views/elements/AppTile-test.tsx

@@ -19,6 +19,7 @@ import TestRenderer from "react-test-renderer";
 import { jest } from "@jest/globals";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { ClientWidgetApi, MatrixWidgetType } from "matrix-widget-api";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { Optional } from "matrix-events-sdk";
 

test/components/views/elements/EventListSummary-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { MatrixEvent, RoomMember } from 'matrix-js-sdk/src/matrix';
 

test/components/views/elements/LabelledCheckbox-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from "react-dom/test-utils";
 

test/components/views/elements/Linkify-test.tsx

@@ -13,6 +13,7 @@ limitations under the License.
 */
 
 import React, { useState } from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 
 import { Linkify } from "../../../../src/components/views/elements/Linkify";

test/components/views/elements/PollCreateDialog-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { Room } from "matrix-js-sdk/src/models/room";
 import {

test/components/views/elements/StyledRadioGroup-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from "react-dom/test-utils";
 

test/components/views/location/LiveDurationDropdown-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 

test/components/views/location/LocationPicker-test.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import maplibregl from "maplibre-gl";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { act } from 'react-dom/test-utils';
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";

test/components/views/location/LocationShareMenu-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { RoomMember } from 'matrix-js-sdk/src/models/room-member';

test/components/views/location/LocationViewDialog-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { RoomMember } from 'matrix-js-sdk/src/matrix';
 import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';

test/components/views/location/Map-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import maplibregl from 'maplibre-gl';

test/components/views/location/Marker-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { RoomMember } from 'matrix-js-sdk/src/matrix';
 

test/components/views/location/SmartMarker-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import maplibregl from 'maplibre-gl';

test/components/views/location/ZoomButtons-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import maplibregl from 'maplibre-gl';
 import { act } from 'react-dom/test-utils';

test/components/views/messages/DateSeparator-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { mocked } from "jest-mock";
 

test/components/views/messages/MBeaconBody-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import maplibregl from 'maplibre-gl';

test/components/views/messages/MLocationBody-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { LocationAssetType } from "matrix-js-sdk/src/@types/location";
 import { ClientEvent, RoomMember } from 'matrix-js-sdk/src/matrix';

test/components/views/messages/MPollBody-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { Relations } from "matrix-js-sdk/src/models/relations";

test/components/views/messages/MVideoBody-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { MatrixEvent } from 'matrix-js-sdk/src/matrix';
 

test/components/views/messages/TextualBody-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { MockedObject } from "jest-mock";

test/components/views/right_panel/PinnedMessagesCard-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React, { ComponentProps } from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { mocked } from "jest-mock";
 import { act } from "react-dom/test-utils";

test/components/views/right_panel/UserInfo-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { act } from "react-dom/test-utils";

test/components/views/rooms/BasicMessageComposer-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { MatrixClient, Room } from 'matrix-js-sdk/src/matrix';
 

test/components/views/rooms/MessageComposer-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";

test/components/views/rooms/MessageComposerButtons-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";

test/components/views/rooms/RoomHeader-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk/src/matrix';
 

test/components/views/rooms/RoomListHeader-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { act } from "react-dom/test-utils";

test/components/views/rooms/RoomTile-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { act } from "react-dom/test-utils";
 import { mocked } from "jest-mock";

test/components/views/rooms/SearchBar-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 
 import SearchWarning from "../../../../src/components/views/elements/SearchWarning";

test/components/views/rooms/SearchResultTile-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { SearchResult } from "matrix-js-sdk/src/models/search-result";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";

test/components/views/rooms/SendMessageComposer-test.tsx

@@ -18,6 +18,7 @@ import React from "react";
 import { act } from "react-dom/test-utils";
 import { sleep } from "matrix-js-sdk/src/utils";
 import { ISendEventResponse, MatrixClient, MsgType } from "matrix-js-sdk/src/matrix";
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from "jest-mock";
 

test/components/views/rooms/VoiceRecordComposerTile-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 import { ISendEventResponse, MatrixClient, MsgType, Room } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";

test/components/views/settings/FontScalingPanel-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 
 import * as TestUtils from "../../../test-utils";

test/components/views/settings/KeyboardShortcut-test.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 
 import { Key } from "../../../../src/Keyboard";

test/components/views/settings/Notifications-test.tsx

@@ -13,6 +13,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from 'enzyme';
 import { IPushRule, IPushRules, RuleId, IPusher } from 'matrix-js-sdk/src/matrix';
 import { IThreepid, ThreepidMedium } from 'matrix-js-sdk/src/@types/threepids';

test/components/views/settings/ThemeChoicePanel-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 
 import * as TestUtils from "../../../test-utils";

test/components/views/settings/UiFeatureSettingWrapper-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 
 import SettingsStore from '../../../../src/settings/SettingsStore';

test/components/views/settings/tabs/user/KeyboardUserSettingsTab-test.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
 
 import { Key } from "../../../../../../src/Keyboard";

test/components/views/spaces/QuickThemeSwitcher-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { act } from 'react-dom/test-utils';

test/components/views/spaces/SpacePanel-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { MatrixClient } from 'matrix-js-sdk/src/matrix';

test/components/views/spaces/SpaceTreeLevel-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 
 import { stubClient, mkRoom } from "../../../test-utils";

test/components/views/voip/VideoLobby-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { act } from "react-dom/test-utils";
 import { mocked } from "jest-mock";

test/hooks/useDebouncedCallback-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { sleep } from "matrix-js-sdk/src/utils";
 import React from "react";

test/hooks/useLatestResult-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { sleep } from "matrix-js-sdk/src/utils";
 import React, { useEffect, useState } from "react";

test/hooks/useProfileInfo-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { sleep } from "matrix-js-sdk/src/utils";
 import React from "react";

test/hooks/usePublicRoomDirectory-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { sleep } from "matrix-js-sdk/src/utils";
 import React from "react";

test/hooks/useUserDirectory-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { sleep } from "matrix-js-sdk/src/utils";
 import React from "react";

test/modules/ModuleComponents-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { TextInputField } from "@matrix-org/react-sdk-module-api/lib/components/TextInputField";
 import { Spinner as ModuleSpinner } from "@matrix-org/react-sdk-module-api/lib/components/Spinner";

test/setupTests.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
+// eslint-disable-next-line deprecate/import
 import { configure } from "enzyme";
 import "blob-polyfill"; // https://github.com/jsdom/jsdom/issues/2555
 

test/test-utils/utilities.ts

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// eslint-disable-next-line deprecate/import
 import { ReactWrapper } from "enzyme";
 import EventEmitter from "events";
 

test/useTopic-test.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
+// eslint-disable-next-line deprecate/import
 import { mount } from "enzyme";
 import { act } from "react-dom/test-utils";
 

test/utils/tooltipify-test.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+// eslint-disable-next-line deprecate/import
 import { mount } from 'enzyme';
 
 import { tooltipifyLinks } from '../../src/utils/tooltipify';

yarn.lock

@@ -4171,6 +4171,11 @@ eslint-module-utils@^2.7.3:
     debug "^3.2.7"
     find-up "^2.1.0"
 
+eslint-plugin-deprecate@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecate/-/eslint-plugin-deprecate-0.7.0.tgz#04805d2f2884800c580d59933b9c895f31b02437"
+  integrity sha512-MylhCqoH/SJ2MwzVgX0we6oE+lKPVwhOu9hAJ98vMCmbz3FNwqJ8XipdI23bCF7NHxUbhd6mdxFjywKE52pt7A==
+
 eslint-plugin-import@^2.25.4:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
@@ -4209,10 +4214,10 @@ eslint-plugin-jsx-a11y@^6.5.1:
     minimatch "^3.1.2"
     semver "^6.3.0"
 
-eslint-plugin-matrix-org@^0.5.2:
+eslint-plugin-matrix-org@^0.6.1:
-  version "0.5.2"
+  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-0.5.2.tgz#eb355b1a81906ea814235d0b224e8162db7cbbf4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-0.6.1.tgz#deab0636a1fe999d9c2a42929c2b486334ec8ead"
-  integrity sha512-qJbyxp9cOi35Qpn3WCBqohCJaMSVp3ntOJ3WbjpREbCQdyrFze6MJAayl7GNidbNsdP7ejHTi0PtZzyKLcfLzQ==
+  integrity sha512-kq7fCbOdj6OvPF50gJtTVSgg6TbQCOxwwZktyIGQJfZyGNWhew77ptTnmaxgxq+RIQ+rzNcWrcMGO5eQC9fZAg==
 
 eslint-plugin-react-hooks@^4.3.0:
   version "4.6.0"