Manual fixes

Signed-off-by: Aaron Raimist <aaron@raim.ist>

.eslintrc.js

@@ -44,8 +44,6 @@ module.exports = {
             },
         ],
         "import/first": "error",
-        "import/newline-after-import": "error",
-        "import/no-duplicates": "error",
     },
     overrides: [{
         files: [

src/CallHandler.tsx

@@ -56,7 +56,15 @@ limitations under the License.
 
 import React from 'react';
 import { base32 } from "rfc4648";
-import { MatrixCall, CallErrorCode, CallState, CallEvent, CallParty, CallType, CallError } from "matrix-js-sdk/src/webrtc/call";
+import {
+    MatrixCall,
+    CallErrorCode,
+    CallState,
+    CallEvent,
+    CallParty,
+    CallType,
+    CallError,
+} from "matrix-js-sdk/src/webrtc/call";
 import { logger } from 'matrix-js-sdk/src/logger';
 import { randomUppercaseString, randomLowercaseString } from "matrix-js-sdk/src/randomstring";
 import EventEmitter from 'events';

src/components/structures/MatrixChat.tsx

@@ -20,6 +20,7 @@ import { InvalidStoreError } from "matrix-js-sdk/src/errors";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { sleep, defer, IDeferred, QueryDict } from "matrix-js-sdk/src/utils";
+import { logger } from "matrix-js-sdk/src/logger";
 
 // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
 import 'focus-visible';
@@ -106,9 +107,6 @@ import { makeRoomPermalink } from "../../utils/permalinks/Permalinks";
 import { copyPlaintext } from "../../utils/strings";
 import { PosthogAnalytics } from '../../PosthogAnalytics';
 import { initSentry } from "../../sentry";
-
-import { logger } from "matrix-js-sdk/src/logger";
-
 import { showSpaceInvite } from "../../utils/space";
 
 /** constants for MatrixChat.state.view */

src/components/views/right_panel/EncryptionPanel.tsx

@@ -15,7 +15,11 @@ limitations under the License.
 */
 
 import React, { useCallback, useEffect, useState } from "react";
-import { VerificationRequest, PHASE_REQUESTED, PHASE_UNSENT } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {
+    VerificationRequest,
+    PHASE_REQUESTED,
+    PHASE_UNSENT,
+} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { User } from "matrix-js-sdk/src/models/user";
 

src/languageHandler.tsx

@@ -24,7 +24,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import SettingsStore from "./settings/SettingsStore";
 import PlatformPeg from "./PlatformPeg";
-
 // @ts-ignore - $webapp is a webpack resolve alias pointing to the output directory, see webpack config
 import { SettingLevel } from "./settings/SettingLevel";
 import { retry } from "./utils/promise";

src/stores/SetupEncryptionStore.ts

@@ -15,7 +15,10 @@ limitations under the License.
 */
 
 import EventEmitter from 'events';
-import { VerificationRequest, PHASE_DONE as VERIF_PHASE_DONE } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {
+    VerificationRequest,
+    PHASE_DONE as VERIF_PHASE_DONE,
+} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
 import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
 import { logger } from "matrix-js-sdk/src/logger";

src/stores/UIStore.ts

@@ -21,7 +21,7 @@ import ResizeObserverEntry from 'resize-observer-polyfill/src/ResizeObserverEntr
 // own DOM types: https://github.com/que-etc/resize-observer-polyfill/issues/80
 // Using require here rather than import is a horrenous workaround. We should
 // be able to remove the polyfill once Safari 14 is released.
-const ResizeObserverPolyfill = require('resize-observer-polyfill');
+const ResizeObserverPolyfill = require('resize-observer-polyfill'); // eslint-disable-line @typescript-eslint/no-var-requires
 
 export enum UI_EVENTS {
     Resize = "resize"

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

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

test/utils/export-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { renderToString } from "react-dom/server";
 import { IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
@@ -24,8 +25,6 @@ import HTMLExporter from "../../src/utils/exportUtils/HtmlExport";
 import * as TestUtilsMatrix from '../test-utils';
 import { stubClient } from '../test-utils';
 
-import { renderToString } from "react-dom/server";
-
 let client: MatrixClient;
 
 const MY_USER_ID = "@me:here";