aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2022-04-24 20:11:21 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2022-05-16 00:55:02 +0200
commit5725cebec015b90a33c17a8f684bd345dc239934 (patch)
tree7d248757bc43c25240c59c9cdb0da7bf527e3990
parentrefactor: reduce service switcher tearing (diff)
downloadsophie-5725cebec015b90a33c17a8f684bd345dc239934.tar.gz
sophie-5725cebec015b90a33c17a8f684bd345dc239934.tar.zst
sophie-5725cebec015b90a33c17a8f684bd345dc239934.zip
chore(deps): remove ms to reduce dependency count
We can trivially do what it does, and removing it reduces the amount of external dependencies running in the security-sensitive context of the main process. Signed-off-by: Kristóf Marussy <kristof@marussy.com>
-rw-r--r--packages/main/package.json2
-rw-r--r--packages/main/src/i18n/RepositoryBasedI18nBackend.ts5
-rw-r--r--packages/main/src/reactions/__tests__/synchronizeConfig.spec.ts5
-rw-r--r--packages/main/src/reactions/synchronizeConfig.ts5
-rw-r--r--yarn.lock6
5 files changed, 8 insertions, 15 deletions
diff --git a/packages/main/package.json b/packages/main/package.json
index dd67047..112c358 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -21,7 +21,6 @@
21 "loglevel-plugin-prefix": "^0.8.4", 21 "loglevel-plugin-prefix": "^0.8.4",
22 "mobx": "^6.5.0", 22 "mobx": "^6.5.0",
23 "mobx-state-tree": "^5.1.3", 23 "mobx-state-tree": "^5.1.3",
24 "ms": "^2.1.3",
25 "nanoid": "^3.3.3", 24 "nanoid": "^3.3.3",
26 "os-name": "^5.0.1", 25 "os-name": "^5.0.1",
27 "slug": "^5.3.0" 26 "slug": "^5.3.0"
@@ -32,7 +31,6 @@
32 "@types/deep-equal": "^1.0.1", 31 "@types/deep-equal": "^1.0.1",
33 "@types/electron-devtools-installer": "^2.2.2", 32 "@types/electron-devtools-installer": "^2.2.2",
34 "@types/lodash-es": "^4.17.6", 33 "@types/lodash-es": "^4.17.6",
35 "@types/ms": "^0.7.31",
36 "@types/node": "^17.0.25", 34 "@types/node": "^17.0.25",
37 "@types/slug": "^5.0.3", 35 "@types/slug": "^5.0.3",
38 "@types/source-map-support": "^0.5.4", 36 "@types/source-map-support": "^0.5.4",
diff --git a/packages/main/src/i18n/RepositoryBasedI18nBackend.ts b/packages/main/src/i18n/RepositoryBasedI18nBackend.ts
index 4d87ce9..1f7bf5d 100644
--- a/packages/main/src/i18n/RepositoryBasedI18nBackend.ts
+++ b/packages/main/src/i18n/RepositoryBasedI18nBackend.ts
@@ -25,13 +25,12 @@ import type {
25 Services, 25 Services,
26} from 'i18next'; 26} from 'i18next';
27import { debounce } from 'lodash-es'; 27import { debounce } from 'lodash-es';
28import ms from 'ms';
29 28
30import { getLogger } from '../utils/log'; 29import { getLogger } from '../utils/log';
31 30
32import type LocatlizationRepository from './LocalizationRepository'; 31import type LocatlizationRepository from './LocalizationRepository';
33 32
34const MISSING_ENTRIES_DEBOUNCE_TIME = ms('1s'); 33const MISSING_ENTRIES_DEBOUNCE_TIME_MS = 1000;
35 34
36const log = getLogger('RepositoryBasedI18nBackend'); 35const log = getLogger('RepositoryBasedI18nBackend');
37 36
@@ -72,7 +71,7 @@ export default class RepositoryBasedI18nBackend
72 71
73 private readonly flushWriteQueue = debounce( 72 private readonly flushWriteQueue = debounce(
74 this.flushWriteQueueImmediately, 73 this.flushWriteQueueImmediately,
75 MISSING_ENTRIES_DEBOUNCE_TIME, 74 MISSING_ENTRIES_DEBOUNCE_TIME_MS,
76 ); 75 );
77 76
78 constructor( 77 constructor(
diff --git a/packages/main/src/reactions/__tests__/synchronizeConfig.spec.ts b/packages/main/src/reactions/__tests__/synchronizeConfig.spec.ts
index c145bf3..b5013ea 100644
--- a/packages/main/src/reactions/__tests__/synchronizeConfig.spec.ts
+++ b/packages/main/src/reactions/__tests__/synchronizeConfig.spec.ts
@@ -20,7 +20,6 @@
20 20
21import { jest } from '@jest/globals'; 21import { jest } from '@jest/globals';
22import { mocked } from 'jest-mock'; 22import { mocked } from 'jest-mock';
23import ms from 'ms';
24 23
25import type ConfigRepository from '../../infrastructure/config/ConfigRepository'; 24import type ConfigRepository from '../../infrastructure/config/ConfigRepository';
26import SharedStore from '../../stores/SharedStore'; 25import SharedStore from '../../stores/SharedStore';
@@ -34,8 +33,8 @@ const repository: ConfigRepository = {
34 writeConfig: jest.fn(), 33 writeConfig: jest.fn(),
35 watchConfig: jest.fn(), 34 watchConfig: jest.fn(),
36}; 35};
37const lessThanThrottleMs = ms('0.1s'); 36const lessThanThrottleMs = 100;
38const throttleMs = ms('1s'); 37const throttleMs = 1000;
39 38
40beforeAll(() => { 39beforeAll(() => {
41 jest.useFakeTimers(); 40 jest.useFakeTimers();
diff --git a/packages/main/src/reactions/synchronizeConfig.ts b/packages/main/src/reactions/synchronizeConfig.ts
index 9436c16..adbe712 100644
--- a/packages/main/src/reactions/synchronizeConfig.ts
+++ b/packages/main/src/reactions/synchronizeConfig.ts
@@ -21,7 +21,6 @@
21import deepEqual from 'deep-equal'; 21import deepEqual from 'deep-equal';
22import { debounce } from 'lodash-es'; 22import { debounce } from 'lodash-es';
23import { reaction } from 'mobx'; 23import { reaction } from 'mobx';
24import ms from 'ms';
25 24
26import type ConfigRepository from '../infrastructure/config/ConfigRepository'; 25import type ConfigRepository from '../infrastructure/config/ConfigRepository';
27import type SharedStore from '../stores/SharedStore'; 26import type SharedStore from '../stores/SharedStore';
@@ -29,14 +28,14 @@ import type Config from '../stores/config/Config';
29import type Disposer from '../utils/Disposer'; 28import type Disposer from '../utils/Disposer';
30import { getLogger } from '../utils/log'; 29import { getLogger } from '../utils/log';
31 30
32const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s'); 31const DEFAULT_CONFIG_DEBOUNCE_TIME_MS = 1000;
33 32
34const log = getLogger('synchronizeConfig'); 33const log = getLogger('synchronizeConfig');
35 34
36export default async function synchronizeConfig( 35export default async function synchronizeConfig(
37 sharedStore: SharedStore, 36 sharedStore: SharedStore,
38 repository: ConfigRepository, 37 repository: ConfigRepository,
39 debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME, 38 debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME_MS,
40): Promise<Disposer> { 39): Promise<Disposer> {
41 let lastConfigOnDisk: Config | undefined; 40 let lastConfigOnDisk: Config | undefined;
42 41
diff --git a/yarn.lock b/yarn.lock
index eb766fa..b934e68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1267,7 +1267,6 @@ __metadata:
1267 "@types/deep-equal": ^1.0.1 1267 "@types/deep-equal": ^1.0.1
1268 "@types/electron-devtools-installer": ^2.2.2 1268 "@types/electron-devtools-installer": ^2.2.2
1269 "@types/lodash-es": ^4.17.6 1269 "@types/lodash-es": ^4.17.6
1270 "@types/ms": ^0.7.31
1271 "@types/node": ^17.0.25 1270 "@types/node": ^17.0.25
1272 "@types/slug": ^5.0.3 1271 "@types/slug": ^5.0.3
1273 "@types/source-map-support": ^0.5.4 1272 "@types/source-map-support": ^0.5.4
@@ -1287,7 +1286,6 @@ __metadata:
1287 loglevel-plugin-prefix: ^0.8.4 1286 loglevel-plugin-prefix: ^0.8.4
1288 mobx: ^6.5.0 1287 mobx: ^6.5.0
1289 mobx-state-tree: ^5.1.3 1288 mobx-state-tree: ^5.1.3
1290 ms: ^2.1.3
1291 nanoid: ^3.3.3 1289 nanoid: ^3.3.3
1292 os-name: ^5.0.1 1290 os-name: ^5.0.1
1293 slug: ^5.3.0 1291 slug: ^5.3.0
@@ -1613,7 +1611,7 @@ __metadata:
1613 languageName: node 1611 languageName: node
1614 linkType: hard 1612 linkType: hard
1615 1613
1616"@types/ms@npm:*, @types/ms@npm:^0.7.31": 1614"@types/ms@npm:*":
1617 version: 0.7.31 1615 version: 0.7.31
1618 resolution: "@types/ms@npm:0.7.31" 1616 resolution: "@types/ms@npm:0.7.31"
1619 checksum: daadd354aedde024cce6f5aa873fefe7b71b22cd0e28632a69e8b677aeb48ae8caa1c60e5919bb781df040d116b01cb4316335167a3fc0ef6a63fa3614c0f6da 1617 checksum: daadd354aedde024cce6f5aa873fefe7b71b22cd0e28632a69e8b677aeb48ae8caa1c60e5919bb781df040d116b01cb4316335167a3fc0ef6a63fa3614c0f6da
@@ -6841,7 +6839,7 @@ __metadata:
6841 languageName: node 6839 languageName: node
6842 linkType: hard 6840 linkType: hard
6843 6841
6844"ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.3": 6842"ms@npm:^2.0.0, ms@npm:^2.1.1":
6845 version: 2.1.3 6843 version: 2.1.3
6846 resolution: "ms@npm:2.1.3" 6844 resolution: "ms@npm:2.1.3"
6847 checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d 6845 checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d