From be4eeb5e07f79988ef540bc4373ec8ca2d692698 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 19 Dec 2019 18:54:36 -0700 Subject: [PATCH 1/2] Fix js-sdk imports for new module --- src/MatrixClientPeg.js | 6 +++--- src/RoomNotifs.js | 2 +- src/settings/controllers/NotificationControllers.js | 2 +- src/utils/StorageManager.js | 2 +- src/utils/permalinks/Permalinks.js | 2 +- src/utils/pillify.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index 974c5b6f51..f1713ca51f 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -19,9 +19,9 @@ limitations under the License. import {MatrixClient, MemoryStore} from 'matrix-js-sdk'; -import utils from 'matrix-js-sdk/lib/utils'; -import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline'; -import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set'; +import * as utils from 'matrix-js-sdk/lib/utils'; +import {EventTimeline} from 'matrix-js-sdk/lib/models/event-timeline'; +import {EventTimelineSet} from 'matrix-js-sdk/lib/models/event-timeline-set'; import * as sdk from './index'; import createMatrixClient from './utils/createMatrixClient'; import SettingsStore from './settings/SettingsStore'; diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js index 5bef4afd25..9fe8bd75e4 100644 --- a/src/RoomNotifs.js +++ b/src/RoomNotifs.js @@ -16,7 +16,7 @@ limitations under the License. */ import MatrixClientPeg from './MatrixClientPeg'; -import PushProcessor from 'matrix-js-sdk/lib/pushprocessor'; +import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor'; export const ALL_MESSAGES_LOUD = 'all_messages_loud'; export const ALL_MESSAGES = 'all_messages'; diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js index e78b67e847..0e24b4baac 100644 --- a/src/settings/controllers/NotificationControllers.js +++ b/src/settings/controllers/NotificationControllers.js @@ -18,7 +18,7 @@ import SettingController from "./SettingController"; import MatrixClientPeg from '../../MatrixClientPeg'; // XXX: This feels wrong. -import PushProcessor from "matrix-js-sdk/lib/pushprocessor"; +import {PushProcessor} from "matrix-js-sdk/lib/pushprocessor"; function isMasterRuleEnabled() { // Return the value of the master push rule as a default diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js index 49a120a470..39466d66ce 100644 --- a/src/utils/StorageManager.js +++ b/src/utils/StorageManager.js @@ -15,7 +15,7 @@ limitations under the License. */ import Matrix from 'matrix-js-sdk'; -import LocalStorageCryptoStore from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store'; +import {LocalStorageCryptoStore} from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store'; import Analytics from '../Analytics'; const localStorage = window.localStorage; diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js index aec7243236..25845f93a0 100644 --- a/src/utils/permalinks/Permalinks.js +++ b/src/utils/permalinks/Permalinks.js @@ -16,7 +16,7 @@ limitations under the License. import MatrixClientPeg from "../../MatrixClientPeg"; import isIp from "is-ip"; -import utils from 'matrix-js-sdk/lib/utils'; +import * as utils from 'matrix-js-sdk/lib/utils'; import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor"; import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor"; import RiotPermalinkConstructor from "./RiotPermalinkConstructor"; diff --git a/src/utils/pillify.js b/src/utils/pillify.js index 524b0f75bb..d0675e4097 100644 --- a/src/utils/pillify.js +++ b/src/utils/pillify.js @@ -17,7 +17,7 @@ limitations under the License. import ReactDOM from 'react-dom'; import MatrixClientPeg from '../MatrixClientPeg'; import SettingsStore from "../settings/SettingsStore"; -import PushProcessor from 'matrix-js-sdk/lib/pushprocessor'; +import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor'; import * as sdk from '../index'; export function pillifyLinks(nodes, mxEvent) { From 806d728d597c2d68a4f3d3307bd00b05b570146a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 19 Dec 2019 19:08:43 -0700 Subject: [PATCH 2/2] Import from the js-sdk's src/ directory Because ES6 and such. --- src/CrossSigningManager.js | 4 ++-- src/MatrixClientPeg.js | 8 ++++---- src/RoomNotifs.js | 2 +- src/components/views/auth/ServerConfig.js | 2 +- src/components/views/dialogs/DeviceVerifyDialog.js | 2 +- src/components/views/messages/MKeyVerificationRequest.js | 2 +- src/components/views/rooms/MessageComposerInput.js | 2 +- src/components/views/settings/KeyBackupPanel.js | 2 +- src/components/views/toasts/VerificationRequestToast.js | 2 +- src/settings/controllers/NotificationControllers.js | 2 +- src/utils/StorageManager.js | 2 +- src/utils/permalinks/Permalinks.js | 2 +- src/utils/pillify.js | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js index 9f7b9e97ce..a0919ddb28 100644 --- a/src/CrossSigningManager.js +++ b/src/CrossSigningManager.js @@ -17,8 +17,8 @@ limitations under the License. import Modal from './Modal'; import * as sdk from './index'; import MatrixClientPeg from './MatrixClientPeg'; -import { deriveKey } from 'matrix-js-sdk/lib/crypto/key_passphrase'; -import { decodeRecoveryKey } from 'matrix-js-sdk/lib/crypto/recoverykey'; +import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase'; +import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey'; import { _t } from './languageHandler'; // This stores the secret storage private keys in memory for the JS SDK. This is diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index f1713ca51f..44a05c2d6e 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -19,15 +19,15 @@ limitations under the License. import {MatrixClient, MemoryStore} from 'matrix-js-sdk'; -import * as utils from 'matrix-js-sdk/lib/utils'; -import {EventTimeline} from 'matrix-js-sdk/lib/models/event-timeline'; -import {EventTimelineSet} from 'matrix-js-sdk/lib/models/event-timeline-set'; +import * as utils from 'matrix-js-sdk/src/utils'; +import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline'; +import {EventTimelineSet} from 'matrix-js-sdk/src/models/event-timeline-set'; import * as sdk from './index'; import createMatrixClient from './utils/createMatrixClient'; import SettingsStore from './settings/SettingsStore'; import MatrixActionCreators from './actions/MatrixActionCreators'; import Modal from './Modal'; -import {verificationMethods} from 'matrix-js-sdk/lib/crypto'; +import {verificationMethods} from 'matrix-js-sdk/src/crypto'; import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientBackedSettingsHandler"; import * as StorageManager from './utils/StorageManager'; import IdentityAuthClient from './IdentityAuthClient'; diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js index 9fe8bd75e4..efc647436b 100644 --- a/src/RoomNotifs.js +++ b/src/RoomNotifs.js @@ -16,7 +16,7 @@ limitations under the License. */ import MatrixClientPeg from './MatrixClientPeg'; -import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor'; +import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor'; export const ALL_MESSAGES_LOUD = 'all_messages_loud'; export const ALL_MESSAGES = 'all_messages'; diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js index a86e27b6c2..5e17d50b55 100644 --- a/src/components/views/auth/ServerConfig.js +++ b/src/components/views/auth/ServerConfig.js @@ -24,7 +24,7 @@ import { _t } from '../../../languageHandler'; import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils"; import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils"; import SdkConfig from "../../../SdkConfig"; -import { createClient } from 'matrix-js-sdk/lib/matrix'; +import { createClient } from 'matrix-js-sdk/src/matrix'; import classNames from 'classnames'; /* diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js index 708dfb1dd6..8cf5a8536e 100644 --- a/src/components/views/dialogs/DeviceVerifyDialog.js +++ b/src/components/views/dialogs/DeviceVerifyDialog.js @@ -23,7 +23,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg'; import * as sdk from '../../../index'; import * as FormattingUtils from '../../../utils/FormattingUtils'; import { _t } from '../../../languageHandler'; -import {verificationMethods} from 'matrix-js-sdk/lib/crypto'; +import {verificationMethods} from 'matrix-js-sdk/src/crypto'; import DMRoomMap from '../../../utils/DMRoomMap'; import createRoom from "../../../createRoom"; import dis from "../../../dispatcher"; diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js index 6b71193b37..ca5b858f2f 100644 --- a/src/components/views/messages/MKeyVerificationRequest.js +++ b/src/components/views/messages/MKeyVerificationRequest.js @@ -17,7 +17,7 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import MatrixClientPeg from '../../../MatrixClientPeg'; -import {verificationMethods} from 'matrix-js-sdk/lib/crypto'; +import {verificationMethods} from 'matrix-js-sdk/src/crypto'; import * as sdk from '../../../index'; import Modal from "../../../Modal"; import { _t } from '../../../languageHandler'; diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 2510adde9f..c58fe677f5 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -31,7 +31,7 @@ import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerial import classNames from 'classnames'; import MatrixClientPeg from '../../../MatrixClientPeg'; -import type {MatrixClient} from 'matrix-js-sdk/lib/matrix'; +import type {MatrixClient} from 'matrix-js-sdk/src/matrix'; import {processCommandInput} from '../../../SlashCommands'; import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard'; import Modal from '../../../Modal'; diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index 13fc9850b7..3eb9d5ac72 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -21,7 +21,7 @@ import * as sdk from '../../../index'; import MatrixClientPeg from '../../../MatrixClientPeg'; import { _t } from '../../../languageHandler'; import Modal from '../../../Modal'; -import SettingsStore from '../../../../lib/settings/SettingsStore'; +import SettingsStore from '../../../../src/settings/SettingsStore'; import { accessSecretStorage } from '../../../CrossSigningManager'; export default class KeyBackupPanel extends React.PureComponent { diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js index bf64de665a..abc79c38d0 100644 --- a/src/components/views/toasts/VerificationRequestToast.js +++ b/src/components/views/toasts/VerificationRequestToast.js @@ -20,7 +20,7 @@ import * as sdk from "../../../index"; import { _t } from '../../../languageHandler'; import Modal from "../../../Modal"; import MatrixClientPeg from '../../../MatrixClientPeg'; -import {verificationMethods} from 'matrix-js-sdk/lib/crypto'; +import {verificationMethods} from 'matrix-js-sdk/src/crypto'; import KeyVerificationStateObserver, {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver"; import dis from "../../../dispatcher"; diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js index 0e24b4baac..37d318eb1d 100644 --- a/src/settings/controllers/NotificationControllers.js +++ b/src/settings/controllers/NotificationControllers.js @@ -18,7 +18,7 @@ import SettingController from "./SettingController"; import MatrixClientPeg from '../../MatrixClientPeg'; // XXX: This feels wrong. -import {PushProcessor} from "matrix-js-sdk/lib/pushprocessor"; +import {PushProcessor} from "matrix-js-sdk/src/pushprocessor"; function isMasterRuleEnabled() { // Return the value of the master push rule as a default diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js index 39466d66ce..c5a9f7aeed 100644 --- a/src/utils/StorageManager.js +++ b/src/utils/StorageManager.js @@ -15,7 +15,7 @@ limitations under the License. */ import Matrix from 'matrix-js-sdk'; -import {LocalStorageCryptoStore} from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store'; +import {LocalStorageCryptoStore} from 'matrix-js-sdk/src/crypto/store/localStorage-crypto-store'; import Analytics from '../Analytics'; const localStorage = window.localStorage; diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js index 25845f93a0..4b97d1664f 100644 --- a/src/utils/permalinks/Permalinks.js +++ b/src/utils/permalinks/Permalinks.js @@ -16,7 +16,7 @@ limitations under the License. import MatrixClientPeg from "../../MatrixClientPeg"; import isIp from "is-ip"; -import * as utils from 'matrix-js-sdk/lib/utils'; +import * as utils from 'matrix-js-sdk/src/utils'; import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor"; import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor"; import RiotPermalinkConstructor from "./RiotPermalinkConstructor"; diff --git a/src/utils/pillify.js b/src/utils/pillify.js index d0675e4097..044b04181e 100644 --- a/src/utils/pillify.js +++ b/src/utils/pillify.js @@ -17,7 +17,7 @@ limitations under the License. import ReactDOM from 'react-dom'; import MatrixClientPeg from '../MatrixClientPeg'; import SettingsStore from "../settings/SettingsStore"; -import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor'; +import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor'; import * as sdk from '../index'; export function pillifyLinks(nodes, mxEvent) {