From 649c1ed37ac74765fb7572fa3f703c94827042f4 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 4 Jan 2022 22:16:09 +0530 Subject: New configurations based on review comments (WIP) Signed-off-by: Vijay A --- packages/main/src/compositionRoot.ts | 10 +++++----- packages/main/src/controllers/__tests__/config.spec.ts | 8 ++++---- packages/main/src/controllers/__tests__/nativeTheme.spec.ts | 4 ++-- packages/main/src/controllers/config.ts | 4 ++-- packages/main/src/controllers/nativeTheme.ts | 4 ++-- packages/main/src/index.ts | 6 +++--- packages/main/src/services/ConfigPersistenceService.ts | 4 ++-- .../main/src/services/impl/ConfigPersistenceServiceImpl.ts | 5 ++--- packages/main/src/stores/MainStore.ts | 2 +- packages/main/src/stores/SharedStore.ts | 2 +- 10 files changed, 24 insertions(+), 25 deletions(-) (limited to 'packages/main/src') diff --git a/packages/main/src/compositionRoot.ts b/packages/main/src/compositionRoot.ts index bf0f92e..76835a1 100644 --- a/packages/main/src/compositionRoot.ts +++ b/packages/main/src/compositionRoot.ts @@ -20,11 +20,11 @@ import { app } from 'electron'; -import { initConfig } from './controllers/config.js'; -import { initNativeTheme } from './controllers/nativeTheme.js'; -import { ConfigPersistenceServiceImpl } from './services/impl/ConfigPersistenceServiceImpl.js'; -import { MainStore } from './stores/MainStore.js'; -import { Disposer } from './utils/disposer.js'; +import { initConfig } from './controllers/config'; +import { initNativeTheme } from './controllers/nativeTheme'; +import { ConfigPersistenceServiceImpl } from './services/impl/ConfigPersistenceServiceImpl'; +import { MainStore } from './stores/MainStore'; +import { Disposer } from './utils/disposer'; export async function init(store: MainStore): Promise { const configPersistenceService = new ConfigPersistenceServiceImpl(app.getPath('userData')); diff --git a/packages/main/src/controllers/__tests__/config.spec.ts b/packages/main/src/controllers/__tests__/config.spec.ts index eea7f1e..eb67df0 100644 --- a/packages/main/src/controllers/__tests__/config.spec.ts +++ b/packages/main/src/controllers/__tests__/config.spec.ts @@ -23,10 +23,10 @@ import { mocked } from 'jest-mock'; import ms from 'ms'; import { initConfig } from '../config'; -import type { ConfigPersistenceService } from '../../services/ConfigPersistenceService.js'; -import { Config, config as configModel } from '../../stores/Config.js'; -import { Disposer } from '../../utils/disposer.js'; -import { silenceLogger } from '../../utils/logging.js'; +import type { ConfigPersistenceService } from '../../services/ConfigPersistenceService'; +import { Config, config as configModel } from '../../stores/Config'; +import { Disposer } from '../../utils/disposer'; +import { silenceLogger } from '../../utils/logging'; let config: Config; let persistenceService: ConfigPersistenceService = { diff --git a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts b/packages/main/src/controllers/__tests__/nativeTheme.spec.ts index cffeace..85d6dd2 100644 --- a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts +++ b/packages/main/src/controllers/__tests__/nativeTheme.spec.ts @@ -21,8 +21,8 @@ import { jest } from '@jest/globals'; import { mocked } from 'jest-mock'; -import { createMainStore, MainStore } from '../../stores/MainStore.js'; -import { Disposer } from '../../utils/disposer.js'; +import { createMainStore, MainStore } from '../../stores/MainStore'; +import { Disposer } from '../../utils/disposer'; let shouldUseDarkColors = false; diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/config.ts index 971f151..deaeac2 100644 --- a/packages/main/src/controllers/config.ts +++ b/packages/main/src/controllers/config.ts @@ -24,8 +24,8 @@ import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree'; import type { ConfigPersistenceService } from '../services/ConfigPersistenceService.js'; import type { Config, ConfigSnapshotOut } from '../stores/Config.js'; -import { Disposer } from '../utils/disposer.js'; -import { getLogger } from '../utils/logging.js'; +import { Disposer } from '../utils/disposer'; +import { getLogger } from '../utils/logging'; const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s'); diff --git a/packages/main/src/controllers/nativeTheme.ts b/packages/main/src/controllers/nativeTheme.ts index c291a16..ccd12d8 100644 --- a/packages/main/src/controllers/nativeTheme.ts +++ b/packages/main/src/controllers/nativeTheme.ts @@ -22,8 +22,8 @@ import { nativeTheme } from 'electron'; import { autorun } from 'mobx'; import type { MainStore } from '../stores/MainStore.js'; -import { Disposer } from '../utils/disposer.js'; -import { getLogger } from '../utils/logging.js'; +import { Disposer } from '../utils/disposer'; +import { getLogger } from '../utils/logging'; const log = getLogger('nativeTheme'); diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts index 2bdefb8..d0191b7 100644 --- a/packages/main/src/index.ts +++ b/packages/main/src/index.ts @@ -43,13 +43,13 @@ import { } from '@sophie/shared'; import { URL } from 'url'; -import { init } from './compositionRoot.js'; +import { init } from './compositionRoot'; import { DEVMODE_ALLOWED_URL_PREFIXES, installDevToolsExtensions, openDevToolsWhenReady, -} from './devTools.js'; -import { createMainStore } from './stores/MainStore.js'; +} from './devTools'; +import { createMainStore } from './stores/MainStore'; const isDevelopment = import.meta.env.MODE === 'development'; diff --git a/packages/main/src/services/ConfigPersistenceService.ts b/packages/main/src/services/ConfigPersistenceService.ts index 0033cca..aed0ba3 100644 --- a/packages/main/src/services/ConfigPersistenceService.ts +++ b/packages/main/src/services/ConfigPersistenceService.ts @@ -18,8 +18,8 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import type { ConfigSnapshotOut } from '../stores/Config.js'; -import { Disposer } from '../utils/disposer.js'; +import type { ConfigSnapshotOut } from '../stores/Config'; +import { Disposer } from '../utils/disposer'; export type ReadConfigResult = { found: true; data: unknown; } | { found: false; }; diff --git a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts index eba291c..2d19632 100644 --- a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts +++ b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts @@ -1,4 +1,3 @@ - /* * Copyright (C) 2021-2022 Kristóf Marussy * @@ -26,8 +25,8 @@ import { join } from 'path'; import type { ConfigPersistenceService, ReadConfigResult } from '../ConfigPersistenceService.js'; import type { ConfigSnapshotOut } from '../../stores/Config.js'; -import { Disposer } from '../../utils/disposer.js'; -import { getLogger } from '../../utils/logging.js'; +import { Disposer } from '../../utils/disposer'; +import { getLogger } from '../../utils/logging'; const log = getLogger('configPersistence'); diff --git a/packages/main/src/stores/MainStore.ts b/packages/main/src/stores/MainStore.ts index 9368b4d..f8a09d6 100644 --- a/packages/main/src/stores/MainStore.ts +++ b/packages/main/src/stores/MainStore.ts @@ -22,7 +22,7 @@ import { applySnapshot, Instance, types } from 'mobx-state-tree'; import { BrowserViewBounds } from '@sophie/shared'; import type { Config } from './Config.js'; -import { sharedStore } from './SharedStore.js'; +import { sharedStore } from './SharedStore'; export const mainStore = types.model('MainStore', { browserViewBounds: types.optional(types.model('BrowserViewBounds', { diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts index 31b8551..e20150d 100644 --- a/packages/main/src/stores/SharedStore.ts +++ b/packages/main/src/stores/SharedStore.ts @@ -21,7 +21,7 @@ import { Instance, types } from 'mobx-state-tree'; import { sharedStore as originalSharedStore } from '@sophie/shared'; -import { config } from './Config.js'; +import { config } from './Config'; export type { SharedStoreSnapshotIn, SharedStoreSnapshotOut } from '@sophie/shared'; -- cgit v1.2.3-54-g00ecf