From 44adc6679f892df599883071c0de32b750114eae Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Mon, 21 Jul 2025 22:42:37 +0700 Subject: [PATCH] chore(plugins/settings): start plugin at start stage, add as dependency to `developer-kit` to prevent race condition --- .../start/developer-kit/definitions/RDTVersionSetting.tsx | 2 +- src/plugins/start/developer-kit/index.ts | 6 ++++-- .../settings/components/FilterAndSortActionSheet.tsx | 0 .../settings/components/NavigatorHeaderWithIcon.tsx | 0 .../{init => start}/settings/components/PluginCard.tsx | 0 .../settings/components/PluginStateProvider.tsx | 0 .../{init => start}/settings/components/TooltipProvider.tsx | 0 src/plugins/{init => start}/settings/constants.ts | 0 .../settings/definitions/HermesVersionSetting.tsx | 0 .../settings/definitions/ReactNativeVersionSetting.tsx | 0 .../settings/definitions/ReactVersionSetting.tsx | 0 .../{init => start}/settings/definitions/ReloadSetting.tsx | 0 .../settings/definitions/RevengeDiscordSetting.tsx | 0 .../settings/definitions/RevengeLicenseSetting.tsx | 0 .../settings/definitions/RevengePluginsSetting.tsx | 0 .../{init => start}/settings/definitions/RevengeSetting.tsx | 0 .../settings/definitions/RevengeSourceRepositorySetting.tsx | 0 .../settings/definitions/RevengeVersionSetting.tsx | 0 src/plugins/{init => start}/settings/definitions/shared.ts | 0 src/plugins/{init => start}/settings/index.ts | 0 src/plugins/{init => start}/settings/register-routes.tsx | 0 src/plugins/{init => start}/settings/register.tsx | 0 .../settings/screens/RevengePluginsSettingScreen.tsx | 0 .../settings/screens/RevengeSettingScreen.tsx | 0 src/plugins/{init => start}/settings/types.ts | 0 25 files changed, 5 insertions(+), 3 deletions(-) rename src/plugins/{init => start}/settings/components/FilterAndSortActionSheet.tsx (100%) rename src/plugins/{init => start}/settings/components/NavigatorHeaderWithIcon.tsx (100%) rename src/plugins/{init => start}/settings/components/PluginCard.tsx (100%) rename src/plugins/{init => start}/settings/components/PluginStateProvider.tsx (100%) rename src/plugins/{init => start}/settings/components/TooltipProvider.tsx (100%) rename src/plugins/{init => start}/settings/constants.ts (100%) rename src/plugins/{init => start}/settings/definitions/HermesVersionSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/ReactNativeVersionSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/ReactVersionSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/ReloadSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/RevengeDiscordSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/RevengeLicenseSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/RevengePluginsSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/RevengeSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/RevengeSourceRepositorySetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/RevengeVersionSetting.tsx (100%) rename src/plugins/{init => start}/settings/definitions/shared.ts (100%) rename src/plugins/{init => start}/settings/index.ts (100%) rename src/plugins/{init => start}/settings/register-routes.tsx (100%) rename src/plugins/{init => start}/settings/register.tsx (100%) rename src/plugins/{init => start}/settings/screens/RevengePluginsSettingScreen.tsx (100%) rename src/plugins/{init => start}/settings/screens/RevengeSettingScreen.tsx (100%) rename src/plugins/{init => start}/settings/types.ts (100%) diff --git a/src/plugins/start/developer-kit/definitions/RDTVersionSetting.tsx b/src/plugins/start/developer-kit/definitions/RDTVersionSetting.tsx index 31b9b26..5c759b9 100644 --- a/src/plugins/start/developer-kit/definitions/RDTVersionSetting.tsx +++ b/src/plugins/start/developer-kit/definitions/RDTVersionSetting.tsx @@ -1,5 +1,5 @@ import TableRowAssetIcon from '@revenge-mod/components/TableRowAssetIcon' -import { CopyableSetting } from '~/plugins/init/settings/definitions/shared' +import { CopyableSetting } from '~/plugins/start/settings/definitions/shared' import { Setting } from '../constants' import { RDTContext } from '../react-devtools' import type { SettingsItem } from '@revenge-mod/discord/modules/settings' diff --git a/src/plugins/start/developer-kit/index.ts b/src/plugins/start/developer-kit/index.ts index adc4bf9..b977210 100644 --- a/src/plugins/start/developer-kit/index.ts +++ b/src/plugins/start/developer-kit/index.ts @@ -4,6 +4,7 @@ import { } from '@revenge-mod/discord/modules/settings' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' import { PluginFlags } from '@revenge-mod/plugins/constants' +import pluginSettings from '../settings' import type { PluginApi } from '@revenge-mod/plugins/types' interface Storage { @@ -28,6 +29,7 @@ registerPlugin<{ storage: Storage }>( description: 'Tools assisting Revenge developers.', author: 'Revenge', icon: 'WrenchIcon', + dependencies: [pluginSettings], }, { storage: { @@ -50,8 +52,8 @@ registerPlugin<{ storage: Storage }>( }, ) }, - stop() { - refreshSettingsOverviewScreen() + stop({ cleanup }) { + cleanup(refreshSettingsOverviewScreen) }, }, PluginFlags.Enabled, diff --git a/src/plugins/init/settings/components/FilterAndSortActionSheet.tsx b/src/plugins/start/settings/components/FilterAndSortActionSheet.tsx similarity index 100% rename from src/plugins/init/settings/components/FilterAndSortActionSheet.tsx rename to src/plugins/start/settings/components/FilterAndSortActionSheet.tsx diff --git a/src/plugins/init/settings/components/NavigatorHeaderWithIcon.tsx b/src/plugins/start/settings/components/NavigatorHeaderWithIcon.tsx similarity index 100% rename from src/plugins/init/settings/components/NavigatorHeaderWithIcon.tsx rename to src/plugins/start/settings/components/NavigatorHeaderWithIcon.tsx diff --git a/src/plugins/init/settings/components/PluginCard.tsx b/src/plugins/start/settings/components/PluginCard.tsx similarity index 100% rename from src/plugins/init/settings/components/PluginCard.tsx rename to src/plugins/start/settings/components/PluginCard.tsx diff --git a/src/plugins/init/settings/components/PluginStateProvider.tsx b/src/plugins/start/settings/components/PluginStateProvider.tsx similarity index 100% rename from src/plugins/init/settings/components/PluginStateProvider.tsx rename to src/plugins/start/settings/components/PluginStateProvider.tsx diff --git a/src/plugins/init/settings/components/TooltipProvider.tsx b/src/plugins/start/settings/components/TooltipProvider.tsx similarity index 100% rename from src/plugins/init/settings/components/TooltipProvider.tsx rename to src/plugins/start/settings/components/TooltipProvider.tsx diff --git a/src/plugins/init/settings/constants.ts b/src/plugins/start/settings/constants.ts similarity index 100% rename from src/plugins/init/settings/constants.ts rename to src/plugins/start/settings/constants.ts diff --git a/src/plugins/init/settings/definitions/HermesVersionSetting.tsx b/src/plugins/start/settings/definitions/HermesVersionSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/HermesVersionSetting.tsx rename to src/plugins/start/settings/definitions/HermesVersionSetting.tsx diff --git a/src/plugins/init/settings/definitions/ReactNativeVersionSetting.tsx b/src/plugins/start/settings/definitions/ReactNativeVersionSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/ReactNativeVersionSetting.tsx rename to src/plugins/start/settings/definitions/ReactNativeVersionSetting.tsx diff --git a/src/plugins/init/settings/definitions/ReactVersionSetting.tsx b/src/plugins/start/settings/definitions/ReactVersionSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/ReactVersionSetting.tsx rename to src/plugins/start/settings/definitions/ReactVersionSetting.tsx diff --git a/src/plugins/init/settings/definitions/ReloadSetting.tsx b/src/plugins/start/settings/definitions/ReloadSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/ReloadSetting.tsx rename to src/plugins/start/settings/definitions/ReloadSetting.tsx diff --git a/src/plugins/init/settings/definitions/RevengeDiscordSetting.tsx b/src/plugins/start/settings/definitions/RevengeDiscordSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/RevengeDiscordSetting.tsx rename to src/plugins/start/settings/definitions/RevengeDiscordSetting.tsx diff --git a/src/plugins/init/settings/definitions/RevengeLicenseSetting.tsx b/src/plugins/start/settings/definitions/RevengeLicenseSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/RevengeLicenseSetting.tsx rename to src/plugins/start/settings/definitions/RevengeLicenseSetting.tsx diff --git a/src/plugins/init/settings/definitions/RevengePluginsSetting.tsx b/src/plugins/start/settings/definitions/RevengePluginsSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/RevengePluginsSetting.tsx rename to src/plugins/start/settings/definitions/RevengePluginsSetting.tsx diff --git a/src/plugins/init/settings/definitions/RevengeSetting.tsx b/src/plugins/start/settings/definitions/RevengeSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/RevengeSetting.tsx rename to src/plugins/start/settings/definitions/RevengeSetting.tsx diff --git a/src/plugins/init/settings/definitions/RevengeSourceRepositorySetting.tsx b/src/plugins/start/settings/definitions/RevengeSourceRepositorySetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/RevengeSourceRepositorySetting.tsx rename to src/plugins/start/settings/definitions/RevengeSourceRepositorySetting.tsx diff --git a/src/plugins/init/settings/definitions/RevengeVersionSetting.tsx b/src/plugins/start/settings/definitions/RevengeVersionSetting.tsx similarity index 100% rename from src/plugins/init/settings/definitions/RevengeVersionSetting.tsx rename to src/plugins/start/settings/definitions/RevengeVersionSetting.tsx diff --git a/src/plugins/init/settings/definitions/shared.ts b/src/plugins/start/settings/definitions/shared.ts similarity index 100% rename from src/plugins/init/settings/definitions/shared.ts rename to src/plugins/start/settings/definitions/shared.ts diff --git a/src/plugins/init/settings/index.ts b/src/plugins/start/settings/index.ts similarity index 100% rename from src/plugins/init/settings/index.ts rename to src/plugins/start/settings/index.ts diff --git a/src/plugins/init/settings/register-routes.tsx b/src/plugins/start/settings/register-routes.tsx similarity index 100% rename from src/plugins/init/settings/register-routes.tsx rename to src/plugins/start/settings/register-routes.tsx diff --git a/src/plugins/init/settings/register.tsx b/src/plugins/start/settings/register.tsx similarity index 100% rename from src/plugins/init/settings/register.tsx rename to src/plugins/start/settings/register.tsx diff --git a/src/plugins/init/settings/screens/RevengePluginsSettingScreen.tsx b/src/plugins/start/settings/screens/RevengePluginsSettingScreen.tsx similarity index 100% rename from src/plugins/init/settings/screens/RevengePluginsSettingScreen.tsx rename to src/plugins/start/settings/screens/RevengePluginsSettingScreen.tsx diff --git a/src/plugins/init/settings/screens/RevengeSettingScreen.tsx b/src/plugins/start/settings/screens/RevengeSettingScreen.tsx similarity index 100% rename from src/plugins/init/settings/screens/RevengeSettingScreen.tsx rename to src/plugins/start/settings/screens/RevengeSettingScreen.tsx diff --git a/src/plugins/init/settings/types.ts b/src/plugins/start/settings/types.ts similarity index 100% rename from src/plugins/init/settings/types.ts rename to src/plugins/start/settings/types.ts