Convert imports to ES6 from CommonJS

This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
This commit is contained in:
Travis Ralston 2019-12-20 14:41:07 -07:00
parent 042bd35d79
commit f1ac3d2f64
38 changed files with 67 additions and 92 deletions

View file

@ -16,17 +16,15 @@ limitations under the License.
*/
import Field from "../elements/Field";
import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import {MatrixClientPeg} from "../../../MatrixClientPeg";
const Modal = require("../../../Modal");
const sdk = require("../../../index");
import dis from "../../../dispatcher";
import AccessibleButton from '../elements/AccessibleButton';
import { _t } from '../../../languageHandler';
import * as sdk from "../../../index";
import Modal from "../../../Modal";
import sessionStore from '../../../stores/SessionStore';

View file

@ -19,7 +19,7 @@ import {_t} from "../../../../../languageHandler";
import PropTypes from "prop-types";
import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
const sdk = require("../../../../..");
import * as sdk from "../../../../../index";
export class LabsSettingToggle extends React.Component {
static propTypes = {

View file

@ -21,8 +21,7 @@ import {ListRule} from "../../../../../mjolnir/ListRule";
import {BanList, RULE_SERVER, RULE_USER} from "../../../../../mjolnir/BanList";
import Modal from "../../../../../Modal";
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
const sdk = require("../../../../..");
import * as sdk from "../../../../../index";
export default class MjolnirUserSettingsTab extends React.Component {
constructor() {

View file

@ -16,7 +16,7 @@ limitations under the License.
import React from 'react';
import {_t} from "../../../../../languageHandler";
const sdk = require("../../../../..");
import * as sdk from "../../../../../index";
export default class NotificationUserSettingsTab extends React.Component {
constructor() {

View file

@ -21,8 +21,8 @@ import Field from "../../../elements/Field";
import AccessibleButton from "../../../elements/AccessibleButton";
import {SettingLevel} from "../../../../../settings/SettingsStore";
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
const Modal = require("../../../../../Modal");
const sdk = require("../../../../..");
import * as sdk from "../../../../../index";
import Modal from "../../../../../Modal";
export default class VoiceUserSettingsTab extends React.Component {
constructor() {