diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-01-27 00:17:22 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-02-08 21:43:17 +0100 |
commit | 9546dc2aa39ab096ccc723786e718a739d0bdaf9 (patch) | |
tree | 9c3afc6155cc59f6dd1235397230aaa15a5f8cec /packages/renderer | |
parent | refactor: Apply shared store patches in batches (diff) | |
download | sophie-9546dc2aa39ab096ccc723786e718a739d0bdaf9.tar.gz sophie-9546dc2aa39ab096ccc723786e718a739d0bdaf9.tar.zst sophie-9546dc2aa39ab096ccc723786e718a739d0bdaf9.zip |
refactor: Coding conventions
Make sure that files have a default import with the same name as the
file whenever possible to reduce surprise.
Also shuffles around some file names for better legibility.
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages/renderer')
-rw-r--r-- | packages/renderer/src/components/StoreProvider.tsx | 3 | ||||
-rw-r--r-- | packages/renderer/src/stores/RendererStore.ts | 24 | ||||
-rw-r--r-- | packages/renderer/vite.config.js | 3 |
3 files changed, 16 insertions, 14 deletions
diff --git a/packages/renderer/src/components/StoreProvider.tsx b/packages/renderer/src/components/StoreProvider.tsx index 3360a43..de63083 100644 --- a/packages/renderer/src/components/StoreProvider.tsx +++ b/packages/renderer/src/components/StoreProvider.tsx | |||
@@ -20,9 +20,8 @@ | |||
20 | 20 | ||
21 | import React, { createContext, useContext } from 'react'; | 21 | import React, { createContext, useContext } from 'react'; |
22 | 22 | ||
23 | import type { RendererStore } from '../stores/RendererStore'; | 23 | import type RendererStore from '../stores/RendererStore'; |
24 | 24 | ||
25 | // eslint-disable-next-line unicorn/no-useless-undefined -- `createContext` expects 1 parameter. | ||
26 | const StoreContext = createContext<RendererStore | undefined>(undefined); | 25 | const StoreContext = createContext<RendererStore | undefined>(undefined); |
27 | 26 | ||
28 | export function useStore(): RendererStore { | 27 | export function useStore(): RendererStore { |
diff --git a/packages/renderer/src/stores/RendererStore.ts b/packages/renderer/src/stores/RendererStore.ts index 4cbf6aa..c5a94df 100644 --- a/packages/renderer/src/stores/RendererStore.ts +++ b/packages/renderer/src/stores/RendererStore.ts | |||
@@ -20,18 +20,12 @@ | |||
20 | 20 | ||
21 | import { | 21 | import { |
22 | BrowserViewBounds, | 22 | BrowserViewBounds, |
23 | sharedStore, | 23 | SharedStore, |
24 | Service, | 24 | Service, |
25 | SophieRenderer, | 25 | SophieRenderer, |
26 | ThemeSource, | 26 | ThemeSource, |
27 | } from '@sophie/shared'; | 27 | } from '@sophie/shared'; |
28 | import { | 28 | import { applySnapshot, applyPatch, Instance, types } from 'mobx-state-tree'; |
29 | applySnapshot, | ||
30 | applyPatch, | ||
31 | Instance, | ||
32 | types, | ||
33 | IJsonPatch, | ||
34 | } from 'mobx-state-tree'; | ||
35 | 29 | ||
36 | import RendererEnv from '../env/RendererEnv'; | 30 | import RendererEnv from '../env/RendererEnv'; |
37 | import getEnv from '../env/getEnv'; | 31 | import getEnv from '../env/getEnv'; |
@@ -39,9 +33,9 @@ import { getLogger } from '../utils/log'; | |||
39 | 33 | ||
40 | const log = getLogger('RendererStore'); | 34 | const log = getLogger('RendererStore'); |
41 | 35 | ||
42 | export const rendererStore = types | 36 | const RendererStore = types |
43 | .model('RendererStore', { | 37 | .model('RendererStore', { |
44 | shared: types.optional(sharedStore, {}), | 38 | shared: types.optional(SharedStore, {}), |
45 | }) | 39 | }) |
46 | .views((self) => ({ | 40 | .views((self) => ({ |
47 | get services(): Service[] { | 41 | get services(): Service[] { |
@@ -79,7 +73,13 @@ export const rendererStore = types | |||
79 | }, | 73 | }, |
80 | })); | 74 | })); |
81 | 75 | ||
82 | export interface RendererStore extends Instance<typeof rendererStore> {} | 76 | /* |
77 | eslint-disable-next-line @typescript-eslint/no-redeclare -- | ||
78 | Intentionally naming the type the same as the store definition. | ||
79 | */ | ||
80 | interface RendererStore extends Instance<typeof RendererStore> {} | ||
81 | |||
82 | export default RendererStore; | ||
83 | 83 | ||
84 | /** | 84 | /** |
85 | * Creates a new `RootStore` with a new environment and connects it to `ipc`. | 85 | * Creates a new `RootStore` with a new environment and connects it to `ipc`. |
@@ -95,7 +95,7 @@ export function createAndConnectRendererStore( | |||
95 | const env: RendererEnv = { | 95 | const env: RendererEnv = { |
96 | dispatchMainAction: ipc.dispatchAction, | 96 | dispatchMainAction: ipc.dispatchAction, |
97 | }; | 97 | }; |
98 | const store = rendererStore.create({}, env); | 98 | const store = RendererStore.create({}, env); |
99 | 99 | ||
100 | ipc | 100 | ipc |
101 | .onSharedStoreChange({ | 101 | .onSharedStoreChange({ |
diff --git a/packages/renderer/vite.config.js b/packages/renderer/vite.config.js index cb0203c..63c4f77 100644 --- a/packages/renderer/vite.config.js +++ b/packages/renderer/vite.config.js | |||
@@ -48,6 +48,9 @@ export default { | |||
48 | optimizeDeps: { | 48 | optimizeDeps: { |
49 | exclude: ['@sophie/shared'], | 49 | exclude: ['@sophie/shared'], |
50 | }, | 50 | }, |
51 | define: { | ||
52 | __DEV__: JSON.stringify(isDevelopment), // For mobx | ||
53 | }, | ||
51 | build: { | 54 | build: { |
52 | target: chrome, | 55 | target: chrome, |
53 | assetsDir: '.', | 56 | assetsDir: '.', |