From 406138d38ec3fe5139c25e5edaec268ecc95e826 Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Sat, 7 Jun 2025 09:58:28 +0700 Subject: [PATCH] fix(plugins/developer-settings): clean up a few things --- src/plugins/init/developer-settings/index.ts | 18 +++++------ .../init/developer-settings/register.ts | 30 +++++++++---------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/plugins/init/developer-settings/index.ts b/src/plugins/init/developer-settings/index.ts index 4324b93..15afb86 100644 --- a/src/plugins/init/developer-settings/index.ts +++ b/src/plugins/init/developer-settings/index.ts @@ -33,18 +33,18 @@ registerPlugin( load: true, default: defaultStorage, }, - start(api_) { + async start(api_) { api = api_ - if (isSettingsModulesLoaded()) require('./register').register() - else onSettingsModulesLoaded(() => require('./register').register()) + if (isSettingsModulesLoaded()) require('./register') + else onSettingsModulesLoaded(() => require('./register')) - api.storage.get().then(settings => { - if (settings.devtools.autoConnect) - ( - require('./react-devtools') as typeof import('./react-devtools') - ).connectToDevTools() - }) + const [rdt, settings] = await Promise.all([ + import('./react-devtools'), + api.storage.get(), + ]) + + if (settings.devtools.autoConnect) rdt.connectToDevTools() }, }, PluginFlags.Enabled, diff --git a/src/plugins/init/developer-settings/register.ts b/src/plugins/init/developer-settings/register.ts index 624399a..17a1be1 100644 --- a/src/plugins/init/developer-settings/register.ts +++ b/src/plugins/init/developer-settings/register.ts @@ -12,19 +12,17 @@ import ReactDevToolsDisconnectSetting from './definitions/ReactDevToolsDisconnec import ReactDevToolsVersionSetting from './definitions/ReactDevToolsVersionSetting' import RevengeDeveloperSetting from './definitions/RevengeDeveloperSetting' -export function register() { - api.cleanup( - registerSettingsItems({ - [MobileSetting.REVENGE_DEVELOPER]: RevengeDeveloperSetting, - [MobileSetting.REACT_DEVTOOLS_VERSION]: ReactDevToolsVersionSetting, - [MobileSetting.REACT_DEVTOOLS_AUTO_CONNECT]: - ReactDevToolsAutoConnectSetting, - [MobileSetting.REACT_DEVTOOLS_CONNECT]: ReactDevToolsConnectSetting, - [MobileSetting.REACT_DEVTOOLS_DISCONNECT]: - ReactDevToolsDisconnectSetting, - [MobileSetting.EVALUATE_JAVASCRIPT]: EvaluateJavaScriptSetting, - [MobileSetting.ASSET_BROWSER]: AssetBrowserSetting, - }), - addSettingsItemToSection('REVENGE', MobileSetting.REVENGE_DEVELOPER), - ) -} +api.cleanup( + registerSettingsItems({ + [MobileSetting.REVENGE_DEVELOPER]: RevengeDeveloperSetting, + [MobileSetting.REACT_DEVTOOLS_VERSION]: ReactDevToolsVersionSetting, + [MobileSetting.REACT_DEVTOOLS_AUTO_CONNECT]: + ReactDevToolsAutoConnectSetting, + [MobileSetting.REACT_DEVTOOLS_CONNECT]: ReactDevToolsConnectSetting, + [MobileSetting.REACT_DEVTOOLS_DISCONNECT]: + ReactDevToolsDisconnectSetting, + [MobileSetting.EVALUATE_JAVASCRIPT]: EvaluateJavaScriptSetting, + [MobileSetting.ASSET_BROWSER]: AssetBrowserSetting, + }), + addSettingsItemToSection('REVENGE', MobileSetting.REVENGE_DEVELOPER), +)