From 87b23d062c54f3c9f138447be27faa9e39047ab7 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 20 Apr 2020 19:47:45 +0200 Subject: [PATCH] fix imports after reshuffleling --- src/domain/BrawlViewModel.js | 2 +- src/main.js | 6 +++--- src/matrix/Sync.js | 4 ++-- src/matrix/net/ExponentialRetryDelay.js | 2 +- src/matrix/net/HomeServerApi.js | 2 +- src/matrix/net/Reconnector.js | 2 +- src/matrix/net/request/fetch.js | 2 +- src/matrix/net/request/replay.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/domain/BrawlViewModel.js b/src/domain/BrawlViewModel.js index c9d1b775..e4ccd0ac 100644 --- a/src/domain/BrawlViewModel.js +++ b/src/domain/BrawlViewModel.js @@ -1,5 +1,5 @@ import Session from "../matrix/Session.js"; -import Sync from "../matrix/Sync.js"; +import {Sync} from "../matrix/Sync.js"; import SessionViewModel from "./session/SessionViewModel.js"; import LoginViewModel from "./LoginViewModel.js"; import SessionPickerViewModel from "./SessionPickerViewModel.js"; diff --git a/src/main.js b/src/main.js index ed208f31..ef1b8c9c 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ import HomeServerApi from "./matrix/net/HomeServerApi.js"; -// import {RecordRequester, ReplayRequester} from "./matrix/net/replay.js"; -import fetchRequest from "./matrix/net/fetch.js"; -import {Reconnector} from "./matrix/net/connection/Reconnector.js"; +// import {RecordRequester, ReplayRequester} from "./matrix/net/request/replay.js"; +import fetchRequest from "./matrix/net/request/fetch.js"; +import {Reconnector} from "./matrix/net/Reconnector.js"; import StorageFactory from "./matrix/storage/idb/create.js"; import SessionInfoStorage from "./matrix/sessioninfo/localstorage/SessionInfoStorage.js"; import BrawlViewModel from "./domain/BrawlViewModel.js"; diff --git a/src/matrix/Sync.js b/src/matrix/Sync.js index ae2dd264..8b79c6da 100644 --- a/src/matrix/Sync.js +++ b/src/matrix/Sync.js @@ -1,6 +1,6 @@ import {AbortError} from "./error.js"; import ObservableValue from "../observable/ObservableValue.js"; -import {createEnum} from "../utils/enum.js"; +import createEnum from "../utils/enum.js"; const INCREMENTAL_TIMEOUT = 30000; const SYNC_EVENT_LIMIT = 10; @@ -27,7 +27,7 @@ function parseRooms(roomsSection, roomCallback) { return []; } -export default class Sync { +export class Sync { constructor({hsApi, session, storage}) { this._hsApi = hsApi; this._session = session; diff --git a/src/matrix/net/ExponentialRetryDelay.js b/src/matrix/net/ExponentialRetryDelay.js index 056f0a1b..42ef364e 100644 --- a/src/matrix/net/ExponentialRetryDelay.js +++ b/src/matrix/net/ExponentialRetryDelay.js @@ -43,7 +43,7 @@ export default class ExponentialRetryDelay { } -import MockClock from "../../../mocks/Clock.js"; +import MockClock from "../../mocks/Clock.js"; export function tests() { return { diff --git a/src/matrix/net/HomeServerApi.js b/src/matrix/net/HomeServerApi.js index cba5e591..53c4cca4 100644 --- a/src/matrix/net/HomeServerApi.js +++ b/src/matrix/net/HomeServerApi.js @@ -1,7 +1,7 @@ import { HomeServerError, ConnectionError, -} from "./error.js"; +} from "../error.js"; class RequestWrapper { constructor(method, url, requestResult) { diff --git a/src/matrix/net/Reconnector.js b/src/matrix/net/Reconnector.js index fb83704e..48af075e 100644 --- a/src/matrix/net/Reconnector.js +++ b/src/matrix/net/Reconnector.js @@ -111,7 +111,7 @@ export class Reconnector { } -import MockClock from "../../../mocks/Clock.js"; +import MockClock from "../../mocks/Clock.js"; import ExponentialRetryDelay from "./ExponentialRetryDelay.js"; export function tests() { diff --git a/src/matrix/net/request/fetch.js b/src/matrix/net/request/fetch.js index dff1c527..1947d165 100644 --- a/src/matrix/net/request/fetch.js +++ b/src/matrix/net/request/fetch.js @@ -1,7 +1,7 @@ import { AbortError, ConnectionError -} from "../error.js"; +} from "../../error.js"; class RequestResult { constructor(promise, controller) { diff --git a/src/matrix/net/request/replay.js b/src/matrix/net/request/replay.js index 916de9d6..c6f12269 100644 --- a/src/matrix/net/request/replay.js +++ b/src/matrix/net/request/replay.js @@ -1,7 +1,7 @@ import { AbortError, ConnectionError -} from "../error.js"; +} from "../../error.js"; class RequestLogItem { constructor(url, options) {