nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Switch to importing models/Room from main js-sdk export (#11361)

Browse Source 
* Switch to importing TypedEventEmitter from main js-sdk export

* Switch to importing js-sdk/matrix in cypress

* Remove duplicated imports

* Fix lint:js-fix to run prettier last otherwise ESLint --fix may cause a mess

* Add lint rule

* Switch to importing models/Room from main js-sdk export

* Fix cypress-axe import

* Fix more imports

* Fix cypress-axe import

* Fix duplicated lint rule
This commit is contained in:
Michael Telatynski
2023-08-04 08:36:16 +01:00
committed by GitHub
parent 5ee8e61bf5
commit e67ca33c4a
233 changed files with 282 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/autocomplete/Autocompleter.ts
View File

@@ -16,7 +16,7 @@ limitations under the License.
*/
import { ReactElement } from "react";
import { Room } from "matrix-js-sdk/src/models/room";
import { Room } from "matrix-js-sdk/src/matrix";
import CommandProvider from "./CommandProvider";
import RoomProvider from "./RoomProvider";

2
src/autocomplete/CommandProvider.tsx
View File

@@ -18,7 +18,7 @@ limitations under the License.
*/
import React from "react";
import { Room } from "matrix-js-sdk/src/models/room";
import { Room } from "matrix-js-sdk/src/matrix";
import { _t } from "../languageHandler";
import AutocompleteProvider from "./AutocompleteProvider";

2
src/autocomplete/EmojiProvider.tsx
View File

@@ -21,7 +21,7 @@ limitations under the License.
import React from "react";
import { uniq, sortBy, uniqBy, ListIteratee } from "lodash";
import EMOTICON_REGEX from "emojibase-regex/emoticon";
import { Room } from "matrix-js-sdk/src/models/room";
import { Room } from "matrix-js-sdk/src/matrix";
import { _t } from "../languageHandler";
import AutocompleteProvider from "./AutocompleteProvider";

2
src/autocomplete/NotifProvider.tsx
View File

@@ -15,7 +15,7 @@ limitations under the License.
*/
import React from "react";
import { Room } from "matrix-js-sdk/src/models/room";
import { Room } from "matrix-js-sdk/src/matrix";
import AutocompleteProvider from "./AutocompleteProvider";
import { _t } from "../languageHandler";

2
src/autocomplete/RoomProvider.tsx
View File

@@ -18,7 +18,7 @@ limitations under the License.
import React from "react";
import { sortBy, uniqBy } from "lodash";
import { Room } from "matrix-js-sdk/src/models/room";
import { Room } from "matrix-js-sdk/src/matrix";
import { _t } from "../languageHandler";
import AutocompleteProvider from "./AutocompleteProvider";

2
src/autocomplete/SpaceProvider.tsx
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Room } from "matrix-js-sdk/src/models/room";
import { Room } from "matrix-js-sdk/src/matrix";
import React from "react";
import { _t } from "../languageHandler";

2
src/autocomplete/UserProvider.tsx
View File

@@ -20,7 +20,7 @@ limitations under the License.
import React from "react";
import { sortBy } from "lodash";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
import { Room, RoomEvent } from "matrix-js-sdk/src/matrix";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { RoomState, RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
import { IRoomTimelineData } from "matrix-js-sdk/src/models/event-timeline-set";