From 7242f9bfd0f6fc129b4f50c9462f460c506c2cb3 Mon Sep 17 00:00:00 2001 From: Su-Yong Date: Sat, 11 Nov 2023 22:08:44 +0900 Subject: [PATCH] fix(plugin): fix `onChangeConfig` hook --- src/config/index.ts | 5 ++--- src/index.ts | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/config/index.ts b/src/config/index.ts index a618d0ae..f8bdff14 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -12,11 +12,10 @@ const set = (key: string, value: unknown) => { }; const setPartial = (key: string, value: object) => { const newValue = deepmerge(store.get(key) ?? {}, value); - console.log('sival', key, value, newValue); - store.set(newValue); + store.set(key, newValue); }; -function setMenuOption(key: string, value: unknown) { +function setMenuOption(key: string, value: unknown) { set(key, value); if (store.get('options.restartOnConfigChanges')) { restart(); diff --git a/src/index.ts b/src/index.ts index a109d396..837bc4d1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -111,10 +111,10 @@ const initHook = (win: BrowserWindow) => { Object.entries(newPluginConfigList).forEach(([id, newPluginConfig]) => { const isEqual = deepEqual(oldPluginConfigList[id], newPluginConfig); - console.log('check', id, isEqual, ';', oldPluginConfigList[id], newPluginConfig); if (!isEqual) { - win.webContents.send('config-changed', id, newPluginConfig); - console.log('config-changed', id, newPluginConfig); + const config = deepmerge(pluginBuilders[id as keyof PluginBuilderList].config, newPluginConfig); + + win.webContents.send('config-changed', id, config); } }); });