Mandate use of js-sdk/src/matrix import over js-sdk/src (#7933)

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

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { Room } from 'matrix-js-sdk';
+import { Room } from 'matrix-js-sdk/src/matrix';
 import { mocked } from 'jest-mock';
 import { act } from 'react-dom/test-utils';
 

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

@@ -18,7 +18,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
 import { act } from "react-dom/test-utils";
-import { Room } from 'matrix-js-sdk';
+import { Room } from 'matrix-js-sdk/src/matrix';
 
 import '../../../skinned-sdk';
 import ExportDialog from '../../../../src/components/views/dialogs/ExportDialog';

test/components/views/groups/GroupMemberList-test.js

@@ -18,7 +18,7 @@ import React from "react";
 import ReactDOM from "react-dom";
 import ReactTestUtils from "react-dom/test-utils";
 import MockHttpBackend from "matrix-mock-request";
-import Matrix from "matrix-js-sdk";
+import * as Matrix from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import sdk from "../../../skinned-sdk";

test/components/views/messages/MKeyVerificationConclusion-test.js

@@ -2,7 +2,7 @@ import '../../../skinned-sdk'; // Must be first for skinning to work
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
 import { EventEmitter } from 'events';
-import { MatrixEvent } from 'matrix-js-sdk';
+import { MatrixEvent } from 'matrix-js-sdk/src/matrix';
 
 import * as TestUtils from '../../../test-utils';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';

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

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { mount, ReactWrapper } from "enzyme";
-import { Callback, IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk";
+import { Callback, IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import { ISendEventResponse } from "matrix-js-sdk/src/@types/requests";
 import { Relations } from "matrix-js-sdk/src/models/relations";
 import { RelatedRelations } from "matrix-js-sdk/src/models/related-relations";

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

@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import { mount } from 'enzyme';
 import { act } from "react-dom/test-utils";
-import { Room, User } from 'matrix-js-sdk';
+import { Room, User } from 'matrix-js-sdk/src/matrix';
 import { Phase, VerificationRequest } from 'matrix-js-sdk/src/crypto/verification/request/VerificationRequest';
 
 import "../../../skinned-sdk";

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk';
+import { Room, PendingEventOrdering, MatrixEvent, MatrixClient } from 'matrix-js-sdk/src/matrix';
 
 import "../../../skinned-sdk";
 import * as TestUtils from '../../../test-utils';

test/components/views/rooms/RoomList-test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
-import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
+import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk/src/matrix';
 
 import * as TestUtils from '../../../test-utils';
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';

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

@@ -21,7 +21,7 @@ import {
     findRenderedDOMComponentWithClass,
     act,
 } from 'react-dom/test-utils';
-import { Room, RoomMember, MatrixError, IContent } from 'matrix-js-sdk';
+import { Room, RoomMember, MatrixError, IContent } from 'matrix-js-sdk/src/matrix';
 
 import "../../../skinned-sdk";
 import { stubClient } from '../../../test-utils';

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

@@ -2,7 +2,7 @@ import '../../../skinned-sdk';
 
 import React, { ReactElement } from 'react';
 import ReactDOM from 'react-dom';
-import { MatrixClient } from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/matrix';
 
 import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import * as TestUtils from '../../../test-utils';

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

@@ -15,7 +15,7 @@ limitations under the License.
 import React from 'react';
 import { mount } from 'enzyme';
 import '../../../skinned-sdk';
-import { IPushRule, IPushRules, RuleId } from 'matrix-js-sdk';
+import { IPushRule, IPushRules, RuleId } from 'matrix-js-sdk/src/matrix';
 import { ThreepidMedium } from 'matrix-js-sdk/src/@types/threepids';
 import { act } from 'react-dom/test-utils';
 

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

@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import { mount } from 'enzyme';
 import { mocked } from 'jest-mock';
-import { MatrixClient } from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/matrix';
 import { act } from "react-dom/test-utils";
 
 import '../../../skinned-sdk';

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

@@ -6,7 +6,7 @@ import {
     Simulate,
 } from 'react-dom/test-utils';
 import { act } from "react-dom/test-utils";
-import { EventType, MatrixClient, Room } from 'matrix-js-sdk';
+import { EventType, MatrixClient, Room } from 'matrix-js-sdk/src/matrix';
 import { GuestAccess, HistoryVisibility, JoinRule } from 'matrix-js-sdk/src/@types/partials';
 
 import _SpaceSettingsVisibilityTab from "../../../../src/components/views/spaces/SpaceSettingsVisibilityTab";