diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-12-31 02:39:24 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-12-31 02:45:04 +0100 |
commit | cd7833ce2400c9bb9e4b49c51c326783bfb03b75 (patch) | |
tree | de598c72f121bd375dad6e3c6a288fbf57b0f278 /packages/main/src | |
parent | build: Upgrade to chalk 5.0.0 anyways (diff) | |
download | sophie-cd7833ce2400c9bb9e4b49c51c326783bfb03b75.tar.gz sophie-cd7833ce2400c9bb9e4b49c51c326783bfb03b75.tar.zst sophie-cd7833ce2400c9bb9e4b49c51c326783bfb03b75.zip |
chore: Add import extensions preparing for ts 4.6 nodenext
Diffstat (limited to 'packages/main/src')
-rw-r--r-- | packages/main/src/compositionRoot.ts | 10 | ||||
-rw-r--r-- | packages/main/src/controllers/__tests__/config.spec.ts | 7 | ||||
-rw-r--r-- | packages/main/src/controllers/__tests__/nativeTheme.spec.ts | 4 | ||||
-rw-r--r-- | packages/main/src/controllers/config.ts | 7 | ||||
-rw-r--r-- | packages/main/src/controllers/nativeTheme.ts | 5 | ||||
-rw-r--r-- | packages/main/src/index.ts | 6 | ||||
-rw-r--r-- | packages/main/src/services/ConfigPersistenceService.ts | 4 | ||||
-rw-r--r-- | packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts | 7 | ||||
-rw-r--r-- | packages/main/src/stores/MainStore.ts | 4 | ||||
-rw-r--r-- | packages/main/src/stores/SharedStore.ts | 2 | ||||
-rw-r--r-- | packages/main/src/utils/disposer.ts (renamed from packages/main/src/utils/index.ts) | 2 |
11 files changed, 30 insertions, 28 deletions
diff --git a/packages/main/src/compositionRoot.ts b/packages/main/src/compositionRoot.ts index d420bd6..bf0f92e 100644 --- a/packages/main/src/compositionRoot.ts +++ b/packages/main/src/compositionRoot.ts | |||
@@ -20,11 +20,11 @@ | |||
20 | 20 | ||
21 | import { app } from 'electron'; | 21 | import { app } from 'electron'; |
22 | 22 | ||
23 | import { initConfig } from './controllers/config'; | 23 | import { initConfig } from './controllers/config.js'; |
24 | import { initNativeTheme } from './controllers/nativeTheme'; | 24 | import { initNativeTheme } from './controllers/nativeTheme.js'; |
25 | import { ConfigPersistenceServiceImpl } from './services/impl/ConfigPersistenceServiceImpl'; | 25 | import { ConfigPersistenceServiceImpl } from './services/impl/ConfigPersistenceServiceImpl.js'; |
26 | import { MainStore } from './stores/MainStore'; | 26 | import { MainStore } from './stores/MainStore.js'; |
27 | import { Disposer } from './utils'; | 27 | import { Disposer } from './utils/disposer.js'; |
28 | 28 | ||
29 | export async function init(store: MainStore): Promise<Disposer> { | 29 | export async function init(store: MainStore): Promise<Disposer> { |
30 | const configPersistenceService = new ConfigPersistenceServiceImpl(app.getPath('userData')); | 30 | 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 9471ca9..eea7f1e 100644 --- a/packages/main/src/controllers/__tests__/config.spec.ts +++ b/packages/main/src/controllers/__tests__/config.spec.ts | |||
@@ -23,9 +23,10 @@ import { mocked } from 'jest-mock'; | |||
23 | import ms from 'ms'; | 23 | import ms from 'ms'; |
24 | 24 | ||
25 | import { initConfig } from '../config'; | 25 | import { initConfig } from '../config'; |
26 | import type { ConfigPersistenceService } from '../../services/ConfigPersistenceService'; | 26 | import type { ConfigPersistenceService } from '../../services/ConfigPersistenceService.js'; |
27 | import { Config, config as configModel } from '../../stores/Config'; | 27 | import { Config, config as configModel } from '../../stores/Config.js'; |
28 | import { Disposer, silenceLogger } from '../../utils'; | 28 | import { Disposer } from '../../utils/disposer.js'; |
29 | import { silenceLogger } from '../../utils/logging.js'; | ||
29 | 30 | ||
30 | let config: Config; | 31 | let config: Config; |
31 | let persistenceService: ConfigPersistenceService = { | 32 | let persistenceService: ConfigPersistenceService = { |
diff --git a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts b/packages/main/src/controllers/__tests__/nativeTheme.spec.ts index cfb557c..cffeace 100644 --- a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts +++ b/packages/main/src/controllers/__tests__/nativeTheme.spec.ts | |||
@@ -21,8 +21,8 @@ | |||
21 | import { jest } from '@jest/globals'; | 21 | import { jest } from '@jest/globals'; |
22 | import { mocked } from 'jest-mock'; | 22 | import { mocked } from 'jest-mock'; |
23 | 23 | ||
24 | import { createMainStore, MainStore } from '../../stores/MainStore'; | 24 | import { createMainStore, MainStore } from '../../stores/MainStore.js'; |
25 | import { Disposer } from '../../utils'; | 25 | import { Disposer } from '../../utils/disposer.js'; |
26 | 26 | ||
27 | let shouldUseDarkColors = false; | 27 | let shouldUseDarkColors = false; |
28 | 28 | ||
diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/config.ts index d3559c8..ec23e8f 100644 --- a/packages/main/src/controllers/config.ts +++ b/packages/main/src/controllers/config.ts | |||
@@ -22,9 +22,10 @@ import debounce from 'lodash-es/debounce'; | |||
22 | import ms from 'ms'; | 22 | import ms from 'ms'; |
23 | import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree'; | 23 | import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree'; |
24 | 24 | ||
25 | import type { ConfigPersistenceService } from '../services/ConfigPersistenceService'; | 25 | import type { ConfigPersistenceService } from '../services/ConfigPersistenceService.js'; |
26 | import type { Config, ConfigSnapshotOut } from '../stores/Config'; | 26 | import type { Config, ConfigSnapshotOut } from '../stores/Config.js'; |
27 | import { Disposer, getLogger } from '../utils'; | 27 | import { Disposer } from '../utils/disposer.js'; |
28 | import { getLogger } from '../utils/logging.js'; | ||
28 | 29 | ||
29 | const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s'); | 30 | const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s'); |
30 | 31 | ||
diff --git a/packages/main/src/controllers/nativeTheme.ts b/packages/main/src/controllers/nativeTheme.ts index 9edb4e8..c291a16 100644 --- a/packages/main/src/controllers/nativeTheme.ts +++ b/packages/main/src/controllers/nativeTheme.ts | |||
@@ -21,8 +21,9 @@ | |||
21 | import { nativeTheme } from 'electron'; | 21 | import { nativeTheme } from 'electron'; |
22 | import { autorun } from 'mobx'; | 22 | import { autorun } from 'mobx'; |
23 | 23 | ||
24 | import type { MainStore } from '../stores/MainStore'; | 24 | import type { MainStore } from '../stores/MainStore.js'; |
25 | import { Disposer, getLogger } from '../utils'; | 25 | import { Disposer } from '../utils/disposer.js'; |
26 | import { getLogger } from '../utils/logging.js'; | ||
26 | 27 | ||
27 | const log = getLogger('nativeTheme'); | 28 | const log = getLogger('nativeTheme'); |
28 | 29 | ||
diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts index c258481..70ee88b 100644 --- a/packages/main/src/index.ts +++ b/packages/main/src/index.ts | |||
@@ -41,12 +41,12 @@ import { | |||
41 | } from '@sophie/shared'; | 41 | } from '@sophie/shared'; |
42 | import { URL } from 'url'; | 42 | import { URL } from 'url'; |
43 | 43 | ||
44 | import { init } from './compositionRoot'; | 44 | import { init } from './compositionRoot.js'; |
45 | import { | 45 | import { |
46 | installDevToolsExtensions, | 46 | installDevToolsExtensions, |
47 | openDevToolsWhenReady, | 47 | openDevToolsWhenReady, |
48 | } from './devTools'; | 48 | } from './devTools.js'; |
49 | import { createMainStore } from './stores/MainStore'; | 49 | import { createMainStore } from './stores/MainStore.js'; |
50 | 50 | ||
51 | const isDevelopment = import.meta.env.MODE === 'development'; | 51 | const isDevelopment = import.meta.env.MODE === 'development'; |
52 | 52 | ||
diff --git a/packages/main/src/services/ConfigPersistenceService.ts b/packages/main/src/services/ConfigPersistenceService.ts index b3ad162..0033cca 100644 --- a/packages/main/src/services/ConfigPersistenceService.ts +++ b/packages/main/src/services/ConfigPersistenceService.ts | |||
@@ -18,8 +18,8 @@ | |||
18 | * SPDX-License-Identifier: AGPL-3.0-only | 18 | * SPDX-License-Identifier: AGPL-3.0-only |
19 | */ | 19 | */ |
20 | 20 | ||
21 | import type { ConfigSnapshotOut } from '../stores/Config'; | 21 | import type { ConfigSnapshotOut } from '../stores/Config.js'; |
22 | import { Disposer } from '../utils'; | 22 | import { Disposer } from '../utils/disposer.js'; |
23 | 23 | ||
24 | export type ReadConfigResult = { found: true; data: unknown; } | { found: false; }; | 24 | export type ReadConfigResult = { found: true; data: unknown; } | { found: false; }; |
25 | 25 | ||
diff --git a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts index bffc38c..22b7d65 100644 --- a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts +++ b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts | |||
@@ -24,9 +24,10 @@ import JSON5 from 'json5'; | |||
24 | import throttle from 'lodash-es/throttle'; | 24 | import throttle from 'lodash-es/throttle'; |
25 | import { join } from 'path'; | 25 | import { join } from 'path'; |
26 | 26 | ||
27 | import type { ConfigPersistenceService, ReadConfigResult } from '../ConfigPersistenceService'; | 27 | import type { ConfigPersistenceService, ReadConfigResult } from '../ConfigPersistenceService.js'; |
28 | import type { ConfigSnapshotOut } from '../../stores/Config'; | 28 | import type { ConfigSnapshotOut } from '../../stores/Config.js'; |
29 | import { Disposer, getLogger } from '../../utils'; | 29 | import { Disposer } from '../../utils/disposer.js'; |
30 | import { getLogger } from '../../utils/logging.js'; | ||
30 | 31 | ||
31 | const log = getLogger('configPersistence'); | 32 | const log = getLogger('configPersistence'); |
32 | 33 | ||
diff --git a/packages/main/src/stores/MainStore.ts b/packages/main/src/stores/MainStore.ts index bab03c2..5a60585 100644 --- a/packages/main/src/stores/MainStore.ts +++ b/packages/main/src/stores/MainStore.ts | |||
@@ -21,8 +21,8 @@ | |||
21 | import { applySnapshot, Instance, types } from 'mobx-state-tree'; | 21 | import { applySnapshot, Instance, types } from 'mobx-state-tree'; |
22 | import { BrowserViewBounds } from '@sophie/shared'; | 22 | import { BrowserViewBounds } from '@sophie/shared'; |
23 | 23 | ||
24 | import type { Config } from './Config'; | 24 | import type { Config } from './Config.js'; |
25 | import { sharedStore } from './SharedStore'; | 25 | import { sharedStore } from './SharedStore.js'; |
26 | 26 | ||
27 | export const mainStore = types.model('MainStore', { | 27 | export const mainStore = types.model('MainStore', { |
28 | browserViewBounds: types.optional(types.model('BrowserViewBounds', { | 28 | browserViewBounds: types.optional(types.model('BrowserViewBounds', { |
diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts index e20150d..31b8551 100644 --- a/packages/main/src/stores/SharedStore.ts +++ b/packages/main/src/stores/SharedStore.ts | |||
@@ -21,7 +21,7 @@ | |||
21 | import { Instance, types } from 'mobx-state-tree'; | 21 | import { Instance, types } from 'mobx-state-tree'; |
22 | import { sharedStore as originalSharedStore } from '@sophie/shared'; | 22 | import { sharedStore as originalSharedStore } from '@sophie/shared'; |
23 | 23 | ||
24 | import { config } from './Config'; | 24 | import { config } from './Config.js'; |
25 | 25 | ||
26 | export type { SharedStoreSnapshotIn, SharedStoreSnapshotOut } from '@sophie/shared'; | 26 | export type { SharedStoreSnapshotIn, SharedStoreSnapshotOut } from '@sophie/shared'; |
27 | 27 | ||
diff --git a/packages/main/src/utils/index.ts b/packages/main/src/utils/disposer.ts index 2b85989..0d469dd 100644 --- a/packages/main/src/utils/index.ts +++ b/packages/main/src/utils/disposer.ts | |||
@@ -21,5 +21,3 @@ | |||
21 | import { IDisposer } from 'mobx-state-tree'; | 21 | import { IDisposer } from 'mobx-state-tree'; |
22 | 22 | ||
23 | export type Disposer = IDisposer; | 23 | export type Disposer = IDisposer; |
24 | |||
25 | export { getLogger, silenceLogger } from './logging'; | ||